Skip to contentSkip to conversation

ARM: dts: BCM5301X: Describe switch ports in the main DTS

PATCH Applied Rafał Miłecki 3 participants 3 messages Jun 5, 2023 – Jun 8, 2023 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: BCM5301X: Describe switch ports in the main DTS

From: Rafał Miłecki <[email protected]>

All Northstar SoCs have BCM5301x switches (BCM53011, BCM53012) with 8 ports (0-8 without 6). By design 3 switch ports (5, 7 and 8) are hardwired to 3 on-SoC Ethernet interfaces. Switch port 8 requires forcing link state.

It seems that global Northstar .dtsi file is the best place to describe those hw details. Only device specific bits (like labels) should go to device .dts files.

This seems to fit well with a tiny exception of Asus RT-AC88U which somehow was designed to have switch 5 connected to an extra switch. This case was simply handled with a /delete-property/.

---
 arch/arm/boot/dts/bcm-ns.dtsi                 | 41 ++++++++++++++++++-
 .../bcm4708-buffalo-wzr-1166dhp-common.dtsi   |  7 ----
 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts  |  4 --
 arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts  |  3 --
 arch/arm/boot/dts/bcm4708-netgear-r6250.dts   |  7 ----
 arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts |  7 ----
 .../boot/dts/bcm47081-buffalo-wzr-600dhp2.dts |  7 ----
 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts |  3 --
 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts |  7 ----
 arch/arm/boot/dts/bcm4709-netgear-r8000.dts   | 12 ------
 arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts  | 17 +-------
 arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 12 ------
 arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts | 12 ------
 .../boot/dts/bcm47094-linksys-panamera.dts    | 34 ++++-----------
 arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts |  7 ----
 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts |  4 --
 arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts |  7 ----
 arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts |  3 --
 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts |  7 ----
 .../boot/dts/bcm47094-luxul-xwr-3150-v1.dts   |  7 ----
 arch/arm/boot/dts/bcm53015-meraki-mr26.dts    |  3 --
 arch/arm/boot/dts/bcm53016-meraki-mr32.dts    |  3 --
 22 files changed, 51 insertions(+), 163 deletions(-)
arch/arm/boot/dts/bcm-ns.dtsi +40 -1
index 43d670746f05..dae9c47ace76 100644
@@ -313,10 +313,49 @@ srab: ethernet-switch@18007000 {
 
 		status = "disabled";
 
-		/* ports are defined in board DTS */
 		ports {
 			#address-cells = <1>;
 			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+			};
+
+			port@1 {
+				reg = <1>;
+			};
+
+			port@2 {
+				reg = <2>;
+			};
+
+			port@3 {
+				reg = <3>;
+			};
+
+			port@4 {
+				reg = <4>;
+			};
+
+			port@5 {
+				reg = <5>;
+				ethernet = <&gmac0>;
+			};
+
+			port@7 {
+				reg = <7>;
+				ethernet = <&gmac1>;
+			};
+
+			port@8 {
+				reg = <8>;
+				ethernet = <&gmac2>;
+
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
 		};
 	};
 
arch/arm/boot/dts/bcm4708-buffalo-wzr-1166dhp-common.dtsi +0 -7
index 0846887ba144..42bcbf10957c 100644
@@ -159,34 +159,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan1";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan2";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan4";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +0 -4
index 5d0549855978..e04d2e5ea51a 100644
@@ -75,19 +75,15 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "poe";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "lan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +0 -3
index 4ca348c06b51..a399800139d9 100644
@@ -82,14 +82,11 @@ &srab {
 
 	ports {
 		port@4 {
-			reg = <4>;
 			label = "lan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm4708-netgear-r6250.dts +0 -7
index 8661ec94ca67..fad3473810a2 100644
@@ -100,34 +100,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +0 -7
index 26cdeb5cc337..5b2b7b8b3b12 100644
@@ -123,34 +123,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts +0 -7
index a2b7644eaf39..d0a26b643b82 100644
@@ -123,34 +123,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan1";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan2";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan4";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +0 -3
index 7e042928fd40..9f21d6d6d35b 100644
@@ -75,14 +75,11 @@ &srab {
 
 	ports {
 		port@4 {
-			reg = <4>;
 			label = "poe";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +0 -7
index 231d437408d8..256107291702 100644
@@ -124,36 +124,29 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 			nvmem-cells = <&et0macaddr 5>;
 			nvmem-cell-names = "mac-address";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm4709-netgear-r8000.dts +0 -12
index 3552b6deffc2..707c561703ed 100644
@@ -208,39 +208,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan1";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan2";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan4";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@8 {
-			reg = <8>;
 			label = "cpu";
-			ethernet = <&gmac2>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-asus-rt-ac88u.dts +2 -15
index a50ff686b557..4d5747aa5dc8 100644
@@ -181,32 +181,28 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		sw0_p5: port@5 {
-			reg = <5>;
+			/delete-property/ethernet;
+
 			label = "extsw";
 			phy-mode = "rgmii";
 
@@ -218,8 +214,6 @@ fixed-link {
 		};
 
 		port@7 {
-			reg = <7>;
-			ethernet = <&gmac1>;
 			label = "cpu";
 
 			fixed-link {
@@ -229,14 +223,7 @@ fixed-link {
 		};
 
 		port@8 {
-			reg = <8>;
-			ethernet = <&gmac2>;
 			label = "cpu";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +0 -12
index 555fbe41dd8f..51ce510b3e3a 100644
@@ -124,39 +124,27 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@8 {
-			reg = <8>;
 			label = "cpu";
-			ethernet = <&gmac2>;
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-dlink-dir-890l.dts +0 -12
index d945a20b06e0..60744f82c2b7 100644
@@ -172,40 +172,28 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan1";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan2";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan4";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@8 {
-			reg = <8>;
 			label = "cpu";
-			ethernet = <&gmac2>;
 			phy-mode = "rgmii";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-linksys-panamera.dts +9 -25
index d9a16a820e7f..8036c04d81cb 100644
@@ -207,29 +207,32 @@ &srab {
 	dsa,member = <0 0>;
 
 	ports {
+		sw0_p0: port@0 {
+			label = "extsw";
+
+			fixed-link {
+				speed = <1000>;
+				full-duplex;
+			};
+		};
+
 		port@1 {
-			reg = <1>;
 			label = "lan7";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan4";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan8";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 		};
 
 		port@5 {
-			reg = <5>;
-			ethernet = <&gmac0>;
 			label = "cpu";
 			status = "disabled";
 
@@ -240,8 +243,6 @@ fixed-link {
 		};
 
 		port@7 {
-			reg = <7>;
-			ethernet = <&gmac1>;
 			label = "cpu";
 			status = "disabled";
 
@@ -252,24 +253,7 @@ fixed-link {
 		};
 
 		port@8 {
-			reg = <8>;
-			ethernet = <&gmac2>;
 			label = "cpu";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		sw0_p0: port@0 {
-			reg = <0>;
-			label = "extsw";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts +0 -7
index ae5523870854..e8991d4e248c 100644
@@ -83,36 +83,29 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "wan";
 			nvmem-cells = <&et0macaddr 1>;
 			nvmem-cell-names = "mac-address";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan4";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan2";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "lan1";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +0 -4
index 9220f193499e..6875625869d9 100644
@@ -73,19 +73,15 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "poe";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts +0 -7
index 2bd64dcd4353..7cfa4607ef31 100644
@@ -83,36 +83,29 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "wan";
 			nvmem-cells = <&et0macaddr 1>;
 			nvmem-cell-names = "mac-address";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan4";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan3";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan2";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "lan1";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +0 -3
index 8a6d19f985c1..d55e10095eae 100644
@@ -69,14 +69,11 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +0 -7
index 52783a4b6f99..ccf031c0e276 100644
@@ -123,36 +123,29 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 			nvmem-cells = <&et0macaddr 5>;
 			nvmem-cell-names = "mac-address";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +0 -7
index 2dd05f4dce92..789dd2a3d226 100644
@@ -98,36 +98,29 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "lan4";
 		};
 
 		port@1 {
-			reg = <1>;
 			label = "lan3";
 		};
 
 		port@2 {
-			reg = <2>;
 			label = "lan2";
 		};
 
 		port@3 {
-			reg = <3>;
 			label = "lan1";
 		};
 
 		port@4 {
-			reg = <4>;
 			label = "wan";
 			nvmem-cells = <&et0macaddr 5>;
 			nvmem-cell-names = "mac-address";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 		};
 	};
 };
arch/arm/boot/dts/bcm53015-meraki-mr26.dts +0 -3
index 071f2cb97251..24ba467c67b9 100644
@@ -115,14 +115,11 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "poe";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 
 			fixed-link {
 				speed = <1000>;
arch/arm/boot/dts/bcm53016-meraki-mr32.dts +0 -3
index 46c2c93b01d8..559d6c371d67 100644
@@ -176,14 +176,11 @@ &srab {
 
 	ports {
 		port@0 {
-			reg = <0>;
 			label = "poe";
 		};
 
 		port@5 {
-			reg = <5>;
 			label = "cpu";
-			ethernet = <&gmac0>;
 
 			fixed-link {
 				speed = <1000>;
Signature · 1 line
2.35.3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

All Northstar SoCs have BCM5301x switches (BCM53011, BCM53012) with 8 ports (0-8 without 6). By design 3 switch ports (5, 7 and 8) are hardwired to 3 on-SoC Ethernet interfaces. Switch port 8 requires forcing link state.

It seems that global Northstar .dtsi file is the best place to describe those hw details. Only device specific bits (like labels) should go to device .dts files.

Quoted 5 lines

This seems to fit well with a tiny exception of Asus RT-AC88U which somehow was designed to have switch 5 connected to an extra switch. This case was simply handled with a /delete-property/.

No, I was wrong. Both the MR26 and MR32 use the Gbit PHY integrated into the SoCs. There is no extra PHY chip to be found anywhere on the PCBs. phytool does confirm this.

# mr26 + mr32 outputs are indentical.
| $ phytool poe/0
| ieee-phy: id:0x600d8760
| ieee-phy: reg:BMCR(0x00) val:0x1140
|  flags:          -reset -loopback +aneg-enable -power-down -isolate -aneg-restart -collision-test
|  speed:          1000-full
|
| ieee-phy: reg:BMSR(0x01) val:0x79ed
|  capabilities:   -100-b4 +100-f +100-h +10-f +10-h -100-t2-f -100-t2-h
|  flags:          +ext-status +aneg-complete -remote-fault +aneg-capable +link -jabber +ext-register

Thank you!

Quoted 99 lines

---

  arch/arm/boot/dts/bcm53015-meraki-mr26.dts    |  3 --
  arch/arm/boot/dts/bcm53016-meraki-mr32.dts    |  3 --
  22 files changed, 51 insertions(+), 163 deletions(-)
arch/arm/boot/dts/bcm-ns.dtsi +40 -1
index 43d670746f05..dae9c47ace76 100644
@@ -313,10 +313,49 @@ srab: ethernet-switch@18007000 {
 
  		status = "disabled";
 
-		/* ports are defined in board DTS */
  		ports {
  			#address-cells = <1>;
  			#size-cells = <0>;
+
+			port@0 {
+				reg = <0>;
+			};
+
+			port@1 {
+				reg = <1>;
+			};
+
+			port@2 {
+				reg = <2>;
+			};
+
+			port@3 {
+				reg = <3>;
+			};
+
+			port@4 {
+				reg = <4>;
+			};
+
+			port@5 {
+				reg = <5>;
+				ethernet = <&gmac0>;
+			};
+
+			port@7 {
+				reg = <7>;
+				ethernet = <&gmac1>;
+			};
+
+			port@8 {
+				reg = <8>;
+				ethernet = <&gmac2>;
+
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
  		};
  	};
 
arch/arm/boot/dts/bcm53015-meraki-mr26.dts +0 -3
index 071f2cb97251..24ba467c67b9 100644
@@ -115,14 +115,11 @@ &srab {
 
  	ports {
  		port@0 {
-			reg = <0>;
  			label = "poe";
  		};
 
  		port@5 {
-			reg = <5>;
  			label = "cpu";
-			ethernet = <&gmac0>;
 
  			fixed-link {
  				speed = <1000>;
arch/arm/boot/dts/bcm53016-meraki-mr32.dts +0 -3
index 46c2c93b01d8..559d6c371d67 100644
@@ -176,14 +176,11 @@ &srab {
 
  	ports {
  		port@0 {
-			reg = <0>;
  			label = "poe";
  		};
 
  		port@5 {
-			reg = <5>;
  			label = "cpu";
-			ethernet = <&gmac0>;
 
  			fixed-link {
  				speed = <1000>;
#2 lore raw
In reply to Rafał Miłecki

From: Florian Fainelli <[email protected]>

Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

All Northstar SoCs have BCM5301x switches (BCM53011, BCM53012) with 8 ports (0-8 without 6). By design 3 switch ports (5, 7 and 8) are hardwired to 3 on-SoC Ethernet interfaces. Switch port 8 requires forcing link state.

It seems that global Northstar .dtsi file is the best place to describe those hw details. Only device specific bits (like labels) should go to device .dts files.

Quoted 6 lines

This seems to fit well with a tiny exception of Asus RT-AC88U which somehow was designed to have switch 5 connected to an extra switch. This case was simply handled with a /delete-property/.

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian