mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-12 00:15:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This pull request contains Broadcom ARM-based SoCs Device Tree updates
for 7.1, please pull the following:

- Rafal provides a complete description of the PCIe Root Complex nodes
  in order to silence a number of dtc warnings

- Rosen provides the necessary NVMEM properties to allow describing the
  WAN device MAC address from NVRAM, also adds better LEDs, USB GPIOs
  and Wi-Fi buttons for the Linksys EA9200 router

- Linus completes the BCA devices description by adding the I2C block
  and fixing interrupts for the DMA block on 63138 and 6878

* tag 'arm-soc/for-7.1/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: EA9200: specify partitions
  ARM: dts: BCM5301X: EA9200: add LEDs
  ARM: dts: BCM5301X: EA9200: add USB GPIOs
  ARM: dts: BCM5301X: EA9200: add WiFi button
  ARM: dts: broadcom: bcm2835-rpi: Move non simple-bus nodes to root level
  ARM: dts: bcm63148: Add I2C block
  ARM: dts: bcm63138: Add I2C block
  ARM: dts: bcm6878: Add I2C bus block
  ARM: dts: bcm6855: Add I2C bus blocks
  ARM: dts: bcm6846: Add I2C bus block
  ARM: dts: bcm63138: Fix DMA IRQ
  ARM: dts: bcm6878: Fix PL081 DMA block IRQ
  ARM: dts: BCM5301X: AC5300: set WAN MAC from nvram
  ARM: dts: BCM5301X: AC3100: set WAN MAC from nvram
  ARM: dts: BCM5301X: panamera: set WAN MAC from nvram
  ARM: dts: BCM5301X: EA9200: set WAN MAC from nvram
  ARM: dts: BCM5301X: add root pcie bridges
  ARM: dts: BCM5301X: Drop extra NAND controller compatible
  ARM: dts: BCM5301X: Describe PCIe controllers fully

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2026-04-01 16:33:13 +02:00
parent 5ac16e6593 220bdfcb4b
commit 185fb14050
15 changed files with 289 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
arch/arm/boot/dts/broadcom/bcm-ns.dtsi
View File

@@ -95,7 +95,10 @@ L2: cache-controller@22000 {
axi@18000000 {
compatible = "brcm,bus-axi";
reg = <0x18000000 0x1000>;
ranges = <0x00000000 0x18000000 0x00100000>;
ranges = <0x00000000 0x18000000 0x00100000>,
<0x08000000 0x08000000 0x08000000>,
<0x20000000 0x20000000 0x08000000>,
<0x28000000 0x28000000 0x08000000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -182,24 +185,75 @@ chipcommon: chipcommon@0 {
};
pcie0: pcie@12000 {
compatible = "brcm,iproc-pcie";
reg = <0x00012000 0x1000>;
ranges = <0x82000000 0 0x08000000 0x08000000 0 0x08000000>;
interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
bus-range = <0x00 0xff>;
device_type = "pci";
#interrupt-cells = <1>;
#address-cells = <3>;
#size-cells = <2>;
pcie_bridge0: pcie@0 {
device_type = "pci";
reg = <0x0000 0 0 0 0>;
bus-range = <0x00 0xff>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
};
};
pcie1: pcie@13000 {
compatible = "brcm,iproc-pcie";
reg = <0x00013000 0x1000>;
ranges = <0x82000000 0 0x20000000 0x20000000 0 0x08000000>;
interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
bus-range = <0x00 0xff>;
device_type = "pci";
#interrupt-cells = <1>;
#address-cells = <3>;
#size-cells = <2>;
pcie_bridge1: pcie@0 {
device_type = "pci";
reg = <0x0000 0 0 0 0>;
bus-range = <0x00 0xff>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
};
};
pcie2: pcie@14000 {
compatible = "brcm,iproc-pcie";
reg = <0x00014000 0x1000>;
ranges = <0x82000000 0 0x28000000 0x28000000 0 0x08000000>;
interrupt-map-mask = <0 0 0 0>;
interrupt-map = <0 0 0 0 &gic GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
bus-range = <0x00 0xff>;
device_type = "pci";
#interrupt-cells = <1>;
#address-cells = <3>;
#size-cells = <2>;
pcie_bridge2: pcie@0 {
device_type = "pci";
reg = <0x0000 0 0 0 0>;
bus-range = <0x00 0xff>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
};
};
usb2: usb2@21000 {
@@ -479,7 +533,7 @@ thermal: thermal@2c0 {
};
nand_controller: nand-controller@18028000 {
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand";
compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>;
reg-names = "nand", "iproc-idm", "iproc-ext";
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

7
arch/arm/boot/dts/broadcom/bcm2835-common.dtsi
View File

@@ -141,9 +141,10 @@ v3d: v3d@7ec00000 {
interrupts = <1 10>;
};
vc4: gpu {
compatible = "brcm,bcm2835-vc4";
};
};
vc4: gpu {
compatible = "brcm,bcm2835-vc4";
};
};

16
arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
View File

@@ -1,8 +1,8 @@
#include <dt-bindings/power/raspberrypi-power.h>
/ {
soc {
firmware: firmware {
firmware {
firmware: rpi-firmware {
compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
mboxes = <&mailbox>;
@@ -10,14 +10,16 @@ firmware_clocks: clocks {
compatible = "raspberrypi,firmware-clocks";
#clock-cells = <1>;
};
};
power: power {
compatible = "raspberrypi,bcm2835-power";
firmware = <&firmware>;
#power-domain-cells = <1>;
power: power {
compatible = "raspberrypi,bcm2835-power";
firmware = <&firmware>;
#power-domain-cells = <1>;
};
};
};
soc {
vchiq: mailbox@7e00b840 {
compatible = "brcm,bcm2835-vchiq";
reg = <0x7e00b840 0x3c>;

100
arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
View File

@@ -5,6 +5,8 @@
/dts-v1/;
#include <dt-bindings/leds/common.h>
#include "bcm4709.dtsi"
#include "bcm5301x-nand-cs0-bch8.dtsi"
@@ -25,6 +27,10 @@ memory@0 {
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x180000>;
et2macaddr: et2macaddr {
#nvmem-cell-cells = <1>;
};
};
gpio-keys {
@@ -36,18 +42,69 @@ button-wps {
gpios = <&chipcommon 3 GPIO_ACTIVE_LOW>;
};
button-rfkill {
label = "WiFi";
linux,code = <KEY_RFKILL>;
gpios = <&chipcommon 4 GPIO_ACTIVE_LOW>;
};
button-restart {
label = "Reset";
linux,code = <KEY_RESTART>;
gpios = <&chipcommon 17 GPIO_ACTIVE_LOW>;
};
};
leds {
compatible = "gpio-leds";
led-0 {
color = <LED_COLOR_ID_AMBER>;
function = LED_FUNCTION_WLAN;
gpios = <&chipcommon 0 GPIO_ACTIVE_LOW>;
linux,default-trigger = "rfkill-none";
};
led-1 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
function-enumerator = <2>;
gpios = <&chipcommon 6 GPIO_ACTIVE_LOW>;
linux,default-trigger = "usbport";
trigger-sources = <&ohci_port2>, <&ehci_port2>;
};
led-2 {
color = <LED_COLOR_ID_GREEN>;
function = LED_FUNCTION_USB;
function-enumerator = <3>;
gpios = <&chipcommon 7 GPIO_ACTIVE_LOW>;
linux,default-trigger = "usbport";
trigger-sources = <&ohci_port1>, <&ehci_port1>,
<&xhci_port1>;
};
led-3 {
color = <LED_COLOR_ID_WHITE>;
function = LED_FUNCTION_POWER;
gpios = <&chipcommon 8 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "default-on";
};
};
};
&usb3_phy {
status = "okay";
};
&usb2 {
vcc-gpios = <&chipcommon 13 GPIO_ACTIVE_HIGH>;
};
&usb3 {
vcc-gpios = <&chipcommon 14 GPIO_ACTIVE_HIGH>;
};
&srab {
status = "okay";
@@ -70,6 +127,9 @@ port@3 {
port@4 {
label = "wan";
nvmem-cells = <&et2macaddr 1>;
nvmem-cell-names = "mac-address";
};
port@5 {
@@ -85,3 +145,43 @@ port@8 {
};
};
};
&nandcs {
partitions {
compatible = "linksys,ns-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "boot";
reg = <0x0000000 0x0080000>;
read-only;
};
partition@80000 {
label = "nvram";
reg = <0x080000 0x0100000>;
};
partition@180000 {
label = "devinfo";
reg = <0x0180000 0x080000>;
read-only;
};
partition@200000 {
reg = <0x0200000 0x02800000>;
compatible = "linksys,ns-firmware", "brcm,trx";
};
partition@2a00000 {
reg = <0x02a00000 0x02800000>;
compatible = "linksys,ns-firmware", "brcm,trx";
};
partition@5200000 {
label = "system";
reg = <0x05200000 0x02e00000>;
};
};
};

73
arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
View File

@@ -126,66 +126,53 @@ button-brightness {
};
};
&pcie0 {
#address-cells = <3>;
#size-cells = <2>;
bridge@0,0,0 {
&pcie_bridge0 {
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,1,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5735000 5835000>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
ieee80211-freq-limit = <5735000 5835000>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
};
&pcie1 {
#address-cells = <3>;
#size-cells = <2>;
bridge@1,0,0 {
&pcie_bridge1 {
pcie@0,0 {
device_type = "pci";
reg = <0x0000 0 0 0 0>;
bus-range = <0x01 0xff>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
bridge@1,1,0 {
reg = <0x0000 0 0 0 0>;
pcie@1,0 {
device_type = "pci";
reg = <0x800 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
bridge@1,0 {
reg = <0x800 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
};
bridge@1,2,2 {
reg = <0x1000 0 0 0 0>;
pcie@2,0 {
device_type = "pci";
reg = <0x1000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
#address-cells = <3>;
#size-cells = <2>;
ranges;
wifi@1,4,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5170000 5730000>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
ieee80211-freq-limit = <5170000 5730000>;
brcm,ccode-map = "JP-JP-78", "US-Q2-86";
};
};
};

7
arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi
View File

@@ -18,6 +18,10 @@ memory@0 {
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x00180000>;
et0macaddr: et0macaddr {
#nvmem-cell-cells = <1>;
};
};
gpio-keys {
@@ -143,6 +147,9 @@ port@3 {
port@4 {
label = "wan";
nvmem-cells = <&et0macaddr 1>;
nvmem-cell-names = "mac-address";
};
port@5 {

3
arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts
View File

@@ -127,6 +127,9 @@ &srab {
ports {
port@0 {
label = "wan";
nvmem-cells = <&et1macaddr 1>;
nvmem-cell-names = "mac-address";
};
port@1 {

7
arch/arm/boot/dts/broadcom/bcm47094-linksys-panamera.dts
View File

@@ -25,6 +25,10 @@ memory@0 {
nvram@1c080000 {
compatible = "brcm,nvram";
reg = <0x1c080000 0x100000>;
et2macaddr: et2macaddr {
#nvmem-cell-cells = <1>;
};
};
gpio-keys {
@@ -230,6 +234,9 @@ port@3 {
port@4 {
label = "wan";
nvmem-cells = <&et2macaddr 1>;
nvmem-cell-names = "mac-address";
};
port@5 {

36
arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
View File

@@ -65,39 +65,19 @@ &gmac0 {
};
&pcie0 {
#address-cells = <3>;
#size-cells = <2>;
bridge@0,0 {
&pcie_bridge0 {
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
};
brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
};
};
&pcie1 {
#address-cells = <3>;
#size-cells = <2>;
bridge@0,0 {
&pcie_bridge1 {
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
};
brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
};
};

36
arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
View File

@@ -81,39 +81,19 @@ &gmac0 {
nvmem-cell-names = "mac-address";
};
&pcie0 {
#address-cells = <3>;
#size-cells = <2>;
bridge@0,0 {
&pcie_bridge0 {
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
};
brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
};
};
&pcie1 {
#address-cells = <3>;
#size-cells = <2>;
bridge@0,0 {
&pcie_bridge1 {
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
#address-cells = <3>;
#size-cells = <2>;
wifi@0,0 {
compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
reg = <0x0000 0 0 0 0>;
brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
};
brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
};
};

11
arch/arm/boot/dts/broadcom/bcm63138.dtsi
View File

@@ -312,12 +312,21 @@ bootlut: bootlut@8000 {
reg = <0x8000 0x50>;
};
i2c0: i2c@3e00 {
compatible = "brcm,brcmper-i2c";
reg = <0x3e00 0x60>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
pl081_dma: dma-controller@d000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0xd000 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;

11
arch/arm/boot/dts/broadcom/bcm63148.dtsi
View File

@@ -97,7 +97,7 @@ bus@ff800000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0xfffe8000 0x8000>;
ranges = <0 0xfffe8000 0x20000>;
/* GPIOs 0 .. 31 */
gpio0: gpio@100 {
@@ -197,5 +197,14 @@ nandcs: nand@0 {
reg = <0>;
};
};
i2c0: i2c@3e00 {
compatible = "brcm,brcmper-i2c";
reg = <0x3e00 0x60>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
};
};

9
arch/arm/boot/dts/broadcom/bcm6846.dtsi
View File

@@ -242,6 +242,15 @@ mdio: mdio@2060 {
status = "disabled";
};
i2c0: i2c@2100 {
compatible = "brcm,brcmper-i2c";
reg = <0x2100 0x60>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
pl081_dma: dma-controller@59000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing

18
arch/arm/boot/dts/broadcom/bcm6855.dtsi
View File

@@ -240,6 +240,15 @@ nandcs: nand@0 {
};
};
i2c0: i2c@2100 {
compatible = "brcm,brcmper-i2c";
reg = <0x2100 0x60>;
interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
leds: led-controller@3000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -278,5 +287,14 @@ uart1: serial@13000 {
clock-names = "uartclk", "apb_pclk";
status = "disabled";
};
i2c1: i2c@5a800 {
compatible = "brcm,brcmper-i2c";
reg = <0x5a800 0x60>;
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
};
};

11
arch/arm/boot/dts/broadcom/bcm6878.dtsi
View File

@@ -239,12 +239,21 @@ nandcs: nand@0 {
};
};
i2c0: i2c@2100 {
compatible = "brcm,brcmper-i2c";
reg = <0x2100 0x60>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
pl081_dma: dma-controller@11000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0x11000 0x1000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;