Skip to content

Commit

Permalink
Merge tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom…
Browse files Browse the repository at this point in the history
…/stblinux into soc/dt

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

- Rafal makes a number of updates to the BCM5301X (Northstar) SoCs DTS
  to set MAC addresses for D-LInk DIR-885L, Asus, RT-AC87U, he
  relicenses parts of the DTSI to GPL 2.0+ / MIT, and finally fixes a
  number of Ethernet switch ports properties to enable/disable ports
  adequately.

* tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM5301X: Set switch ports for Linksys EA9200
  ARM: dts: BCM5301X: Set fixed-link for extra Netgear R8000 CPU ports
  ARM: dts: BCM5301X: Explicitly disable unused switch CPU ports
  ARM: dts: BCM5301X: Relicense Vivek's code to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Relicense Felix's code to the GPL 2.0+ / MIT
  ARM: dts: BCM5301X: Set MAC address for Asus RT-AC87U
  ARM: dts: BCM5301X: Set MACs for D-Link DIR-885L

Link: https://lore.kernel.org/r/20231024155927.977263-1-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Oct 25, 2023
2 parents e209b02 + 253358f commit a26dffc
Show file tree
Hide file tree
Showing 24 changed files with 269 additions and 34 deletions.
34 changes: 34 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm-ns.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
#address-cells = <1>;
#size-cells = <1>;

pmu {
compatible = "arm,cortex-a9-pmu";
interrupts =
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
};

chipcommon-a-bus@18000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x18000000 0x00001000>;
Expand Down Expand Up @@ -320,6 +327,29 @@
#address-cells = <1>;
};

mdio-mux@18003000 {
compatible = "mdio-mux-mmioreg", "mdio-mux";
mdio-parent-bus = <&mdio>;
#address-cells = <1>;
#size-cells = <0>;
reg = <0x18003000 0x4>;
mux-mask = <0x200>;

mdio@0 {
reg = <0x0>;
#address-cells = <1>;
#size-cells = <0>;

usb3_phy: usb3-phy@10 {
compatible = "brcm,ns-ax-usb3-phy";
reg = <0x10>;
usb3-dmp-syscon = <&usb3_dmp>;
#phy-cells = <0>;
status = "disabled";
};
};
};

rng: rng@18004000 {
compatible = "brcm,bcm5301x-rng";
reg = <0x18004000 0x14>;
Expand Down Expand Up @@ -460,6 +490,10 @@
brcm,nand-has-wp;
};

usb3_dmp: syscon@18105000 {
reg = <0x18105000 0x1000>;
};

thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <0>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,5 +181,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
Original file line number Diff line number Diff line change
Expand Up @@ -122,5 +122,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,14 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};

Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
Original file line number Diff line number Diff line change
Expand Up @@ -148,5 +148,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
11 changes: 11 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<0x88000000 0x08000000>;
};

nvram@1c080000 {
et1macaddr: et1macaddr {
#nvmem-cell-cells = <1>;
};
};

leds {
compatible = "gpio-leds";

Expand Down Expand Up @@ -62,6 +68,11 @@
};
};

&gmac0 {
nvmem-cells = <&et1macaddr 0>;
nvmem-cell-names = "mac-address";
};

&usb3_phy {
status = "okay";
};
Expand Down
38 changes: 38 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,41 @@
&usb3_phy {
status = "okay";
};

&srab {
status = "okay";

ports {
port@0 {
label = "lan1";
};

port@1 {
label = "lan2";
};

port@2 {
label = "lan3";
};

port@3 {
label = "lan4";
};

port@4 {
label = "wan";
};

port@5 {
status = "disabled";
};

port@7 {
status = "disabled";
};

port@8 {
label = "cpu";
};
};
};
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,24 @@
label = "wan";
};

port@5 {
status = "disabled";

fixed-link {
speed = <1000>;
full-duplex;
};
};

port@7 {
status = "disabled";

fixed-link {
speed = <1000>;
full-duplex;
};
};

port@8 {
label = "cpu";
};
Expand Down
24 changes: 24 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@
<0x88000000 0x08000000>;
};

nvram@1e3f0000 {
compatible = "brcm,nvram";
reg = <0x1e3f0000 0x10000>;

et2macaddr: et2macaddr {
#nvmem-cell-cells = <1>;
};
};

nand_controller: nand-controller@18028000 {
nand@0 {
partitions {
Expand Down Expand Up @@ -112,6 +121,11 @@
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
};

&gmac0 {
nvmem-cells = <&et2macaddr 0>;
nvmem-cell-names = "mac-address";
};

&spi_nor {
status = "okay";
};
Expand Down Expand Up @@ -142,6 +156,16 @@

port@4 {
label = "wan";
nvmem-cells = <&et2macaddr 3>;
nvmem-cell-names = "mac-address";
};

port@5 {
status = "disabled";
};

port@7 {
status = "disabled";
};

port@8 {
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,14 @@
label = "wan";
};

port@5 {
status = "disabled";
};

port@7 {
status = "disabled";
};

port@8 {
label = "cpu";
phy-mode = "rgmii";
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,13 @@
port@5 {
label = "cpu";
};

port@7 {
status = "disabled";
};

port@8 {
status = "disabled";
};
};
};
Loading

0 comments on commit a26dffc

Please sign in to comment.