Skip to content

L
linux
Commit 498adc86 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'arm-soc/for-5.13/devicetree' of https://github.com/Broadcom/stblinux into arm/dt 

This pull request contains Broadcom ARM-based SoCs Device Tree changes
for 5.13, please pull the following:

- Rafal fixes YAML warnings for the memory nodes of BCM5301X nodes and
  adds support for the NVMEM NVRAM node on Linksys and Luxul WLAN
  routers. He also fixes up the partitions for the Linksys EA9400 to
  use the newly introduced parser compatible and sets the power LED to
  its default state.

* tag 'arm-soc/for-5.13/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Set Linksys EA9500 power LED
  ARM: dts: BCM5301X: Fix Linksys EA9500 partitions
  ARM: dts: BCM5301X: Describe NVMEM NVRAM on Linksys & Luxul routers
  ARM: dts: BCM5301X: fix "reg" formatting in /memory node

Link: https://lore.kernel.org/r/20210330184006.1451315-1-f.fainelli@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 61de0971 dcb56d61
Show whitespace changes
Inline Side-by-side
Showing with 94 additions and 55 deletions
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
}; };
spi { spi {
......
arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
View file @ 498adc86
...@@ -21,6 +21,11 @@ memory@0 { ...@@ -21,6 +21,11 @@ memory@0 {
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x180000>;
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
arch/arm/boot/dts/bcm4708-netgear-r6250.dts
View file @ 498adc86
...@@ -22,8 +22,8 @@ chosen { ...@@ -22,8 +22,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
spi { spi {
......
arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
spi { spi {
......
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
View file @ 498adc86
...@@ -21,6 +21,11 @@ memory@0 { ...@@ -21,6 +21,11 @@ memory@0 {
reg = <0x00000000 0x08000000>; reg = <0x00000000 0x08000000>;
}; };
nvram@1eff0000 {
compatible = "brcm,nvram";
reg = <0x1eff0000 0x10000>;
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
......
arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
};
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x180000>;
}; };
gpio-keys { gpio-keys {
......
arch/arm/boot/dts/bcm4709-netgear-r7000.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm4709-netgear-r8000.dts
View file @ 498adc86
...@@ -32,8 +32,8 @@ chosen { ...@@ -32,8 +32,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts
View file @ 498adc86
...@@ -21,8 +21,8 @@ chosen { ...@@ -21,8 +21,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
}; };
nand: nand@18028000 { nand: nand@18028000 {
......
arch/arm/boot/dts/bcm47094-linksys-panamera.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
};
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x100000>;
}; };
gpio-keys { gpio-keys {
...@@ -70,6 +75,7 @@ usb3 { ...@@ -70,6 +75,7 @@ usb3 {
power { power {
label = "bcm53xx:white:power"; label = "bcm53xx:white:power";
gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>; gpios = <&chipcommon 4 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
}; };
wifi-disabled { wifi-disabled {
...@@ -274,7 +280,7 @@ &usb3_phy { ...@@ -274,7 +280,7 @@ &usb3_phy {
&nandcs { &nandcs {
partitions { partitions {
compatible = "fixed-partitions"; compatible = "linksys,ns-partitions";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -295,20 +301,18 @@ partition@180000{ ...@@ -295,20 +301,18 @@ partition@180000{
}; };
partition@200000 { partition@200000 {
label = "firmware"; reg = <0x0200000 0x01d00000>;
reg = <0x0200000 0x01D00000>; compatible = "linksys,ns-firmware", "brcm,trx";
compatible = "brcm,trx";
}; };
partition@1F00000 { partition@1f00000 {
label = "failsafe"; reg = <0x01f00000 0x01d00000>;
reg = <0x01F00000 0x01D00000>; compatible = "linksys,ns-firmware", "brcm,trx";
read-only;
}; };
partition@5200000 { partition@5200000 {
label = "system"; label = "system";
reg = <0x05200000 0x02E00000>; reg = <0x05200000 0x02e00000>;
}; };
}; };
}; };
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
};
nvram@1eff0000 {
compatible = "brcm,nvram";
reg = <0x1eff0000 0x10000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
};
nvram@1eff0000 {
compatible = "brcm,nvram";
reg = <0x1eff0000 0x10000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts
View file @ 498adc86
...@@ -18,8 +18,8 @@ chosen { ...@@ -18,8 +18,8 @@ chosen {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x08000000>; <0x88000000 0x08000000>;
};
nvram@1eff0000 {
compatible = "brcm,nvram";
reg = <0x1eff0000 0x10000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts
View file @ 498adc86
...@@ -18,8 +18,13 @@ chosen { ...@@ -18,8 +18,13 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
};
nvram@1eff0000 {
compatible = "brcm,nvram";
reg = <0x1eff0000 0x10000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-netgear-r8500.dts
View file @ 498adc86
...@@ -18,8 +18,8 @@ chosen { ...@@ -18,8 +18,8 @@ chosen {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
}; };
leds { leds {
......
arch/arm/boot/dts/bcm47094-phicomm-k3.dts
View file @ 498adc86
...@@ -15,8 +15,8 @@ / { ...@@ -15,8 +15,8 @@ / {
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000>,
0x88000000 0x18000000>; <0x88000000 0x18000000>;
}; };
gpio-keys { gpio-keys {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7