github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 14:42:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This pull request contains Broadcom ARM-based SoCs changes for 6.7,

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmU36NQACgkQh9CWnEQH
 BwSd4w/+OQNoNJng8vwU3qwnBZ598xMsNriMKGBNORyeSeF7gNJHCRgj5Kq+yzdb
 KM43o09zuu1fiz4xU2l7w3IHm67klXmHF3DzHYWHcZB+V2fbv0CGfRl3KSxrLA0L
 cejRei4IjxpOSxRetDZuEAHQFFF6Mlm/8fjQzjOWpSD4HbOydc2+ThQ6fmS9ovHX
 uwuHJ5Hrlyt/3xXITR8S0zvZ6rx0enb8U0jP1PvR2YDHdmddpRvxCI27XPJa1kiP
 Vw58r8K6Gld9Cw9e6laPqAJVzssQf2hdgp2qONZZo/KU/bdo2mpO1wmToy0FkCMi
 CA0idCaKsZyRXh7q6o1066e0p3PT13VhxdoXM5sQjy2TQalrxk7DxP90/f66b9+L
 uiQSCHpJld3h39MnMJzd1sHAYE39BDpp83V8oMybquL6vItqrQpMp2Po+AN9Ll+y
 /VFts/3XWEERb0NDY+8coLmFWDwlxcy07RpawsmfYx6NP4mXPGGWEt2YnSPYRJ+Z
 b8bchpF0s6BENbmWZ2QygkRigKncX53WHPQYpb4I0aahZaro3JX8X8otfiYJLPc2
 Er9BfzSpvVD04rMevMMe9ZDZov7WuZf0eqgqleJGQZh5xUdPkZjLEXlcuJ0mVBoA
 qHMazXH84J6LlGQYrLbpgVlwbetIBmkvwPXEi0e7qC1HY5MzBXQ=
 =nBI1
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmU5hAYACgkQYKtH/8kJ
 UicWnA/+Pvkg1SvnJMJANqNSovNPnL97Mo9Zkx9d00vwrFygPnlXpz0w8n5mpGjf
 B2N1i4UU0yAGhTBwu94vtk+f/kScr9QLRRxg+nKfeK5InwOMKBO2PeuFDxlqHZEV
 RshVcxY+WkYGjjnnCbJr2F9qSHIDwaijaQQIi05gVmMrN6/quQ/6sOiubgQsRPDS
 hAI/WIM7az3VNKrLsuPr/iTc6YsSMA1SADRGppZm7UjcrwH7du5D7xXPuxjDUD1J
 eNUd6ryvxpeG/9rCclxM0uxGIvmKNaqGEfjy79W6CVricPevtMMp9LheymIomr7l
 SS2CTWvuAe6e8B0KlTk0AvXOfTmD0SWO4lX5CWyS5q2j2Gy8KMft2l3eFeb1Elii
 uzS+k9dXloX/toMuFH3vCiPHLLSNKqCGhhC1O6Cm5JArKTRClsvssfoDv45QI0n3
 6kNMxG6gW7hADFb4qS2w5rqXE9/aWNFmZkO53OSDG0Ab7OkPMYUqB1RFlnaOCDMp
 nA+Jdd64jGRa+TBC00IrKUg1TOvyYVli66GMaZKWjo4tYFlhM7KOCSanZBjSO3SL
 KjjECUVpGfj7E+6UmyGNkd2vUu3r6GEY2wDLYX5JPbUpOVhsbibEETnutQVC2Jcx
 B4R8lgUVaNCHPMhBDSERP+xVRgy+qWMr0SDM9+wDNzV2egXuL50=
 =rDdE
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-6.7/devicetree' of https://github.com/Broadcom/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>
This commit is contained in:
Arnd Bergmann 2023-10-25 23:09:25 +02:00
commit a26dffc163
24 changed files with 269 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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>;
@ -320,6 +327,29 @@ mdio: mdio@18003000 {
#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>;
@ -460,6 +490,10 @@ nand_controller: nand-controller@18028000 {
brcm,nand-has-wp;
};
usb3_dmp: syscon@18105000 {
reg = <0x18105000 0x1000>;
};
thermal-zones {
cpu_thermal: cpu-thermal {
polling-delay-passive = <0>;

8
arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi
View File

@ -181,5 +181,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts
View File

@ -85,5 +85,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm4708-luxul-xwc-1000.dts
View File

@ -88,5 +88,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm4708-netgear-r6250.dts
View File

@ -122,5 +122,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts
View File

@ -145,6 +145,14 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47081-buffalo-wzr-600dhp2.dts
View File

@ -145,5 +145,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47081-luxul-xap-1410.dts
View File

@ -81,5 +81,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47081-luxul-xwr-1200.dts
View File

@ -148,5 +148,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

11
arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts
View File

@ -25,6 +25,12 @@ memory@0 {
<0x88000000 0x08000000>;
};
nvram@1c080000 {
et1macaddr: et1macaddr {
#nvmem-cell-cells = <1>;
};
};
leds {
compatible = "gpio-leds";
@ -62,6 +68,11 @@ button-restart {
};
};
&gmac0 {
nvmem-cells = <&et1macaddr 0>;
nvmem-cell-names = "mac-address";
};
&usb3_phy {
status = "okay";
};

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

@ -47,3 +47,41 @@ button-restart {
&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
arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
View File

@ -227,6 +227,24 @@ port@4 {
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";
};

24
arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-885l.dts
View File

@ -25,6 +25,15 @@ memory@0 {
<0x88000000 0x08000000>;
};
nvram@1e3f0000 {
compatible = "brcm,nvram";
reg = <0x1e3f0000 0x10000>;
et2macaddr: et2macaddr {
#nvmem-cell-cells = <1>;
};
};
nand_controller: nand-controller@18028000 {
nand@0 {
partitions {
@ -112,6 +121,11 @@ &usb3 {
vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
};
&gmac0 {
nvmem-cells = <&et2macaddr 0>;
nvmem-cell-names = "mac-address";
};
&spi_nor {
status = "okay";
};
@ -142,6 +156,16 @@ port@3 {
port@4 {
label = "wan";
nvmem-cells = <&et2macaddr 3>;
nvmem-cell-names = "mac-address";
};
port@5 {
status = "disabled";
};
port@7 {
status = "disabled";
};
port@8 {

8
arch/arm/boot/dts/broadcom/bcm47094-dlink-dir-890l.dts
View File

@ -192,6 +192,14 @@ port@4 {
label = "wan";
};
port@5 {
status = "disabled";
};
port@7 {
status = "disabled";
};
port@8 {
label = "cpu";
phy-mode = "rgmii";

8
arch/arm/boot/dts/broadcom/bcm47094-luxul-abr-4500.dts
View File

@ -107,5 +107,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

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

@ -120,5 +120,13 @@ port@1 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47094-luxul-xbr-4500.dts
View File

@ -107,5 +107,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47094-luxul-xwc-2000.dts
View File

@ -75,5 +75,13 @@ port@0 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3100.dts
View File

@ -147,5 +147,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

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

@ -158,5 +158,13 @@ port@4 {
port@5 {
label = "cpu";
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts
View File

@ -124,6 +124,14 @@ fixed-link {
full-duplex;
};
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

8
arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
View File

@ -185,6 +185,14 @@ fixed-link {
full-duplex;
};
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};

34
arch/arm/boot/dts/broadcom/bcm5301x.dtsi
View File

@ -26,13 +26,6 @@ watchdog@20620 {
};
};
pmu {
compatible = "arm,cortex-a9-pmu";
interrupts =
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
@ -69,33 +62,6 @@ periph_clk: periph_clk {
};
};
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";
};
};
};
usb3_dmp: syscon@18105000 {
reg = <0x18105000 0x1000>;
};
i2c0: i2c@18009000 {
compatible = "brcm,iproc-i2c";
reg = <0x18009000 0x50>;

8
arch/arm/boot/dts/broadcom/bcm953012er.dts
View File

@ -84,6 +84,14 @@ port@5 {
label = "cpu";
ethernet = <&gmac0>;
};
port@7 {
status = "disabled";
};
port@8 {
status = "disabled";
};
};
};