ARM: dts: BCM53573: Describe BCM53125 switch ports in the main DTS

BCM53125 always has 5 ports with GPHYs (for LAN/WAN ports) and 2 IMP
ports. It seems the best place to describe that in the main .dtsi.
Device specific bits can go to device .dts files. This will help
avoiding some code duplication.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Link: https://lore.kernel.org/r/20230723195416.7831-2-zajec5@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts b/arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts
index 06b1a582809ca4663a4058ae4e44e2b1f34acf05..3ac6cac541cacf28e6527e289ec626378bf0abaf 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts
@@ -111,34 +111,27 @@
 
        ports {
                port@0 {
-                       reg = <0>;
                        label = "wan";
                };
 
                port@1 {
-                       reg = <1>;
                        label = "lan1";
                };
 
                port@2 {
-                       reg = <2>;
                        label = "lan2";
                };
 
                port@3 {
-                       reg = <3>;
                        label = "lan3";
                };
 
                port@4 {
-                       reg = <4>;
                        label = "lan4";
                };
 
                port@8 {
-                       reg = <8>;
                        label = "cpu";
-                       ethernet = <&gmac0>;
                };
        };
 };

diff --git a/arch/arm/boot/dts/broadcom/bcm53573.dtsi b/arch/arm/boot/dts/broadcom/bcm53573.dtsi
index eed1a6147f0bff2fdc70fa95c7bea0730f34d5d1..083304736fb384ea383808c5cb89e0fea7c349b8 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm53573.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm53573.dtsi
@@ -192,10 +192,34 @@
 
                                        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@8 {
+                                                       reg = <8>;
+                                                       ethernet = <&gmac0>;
+                                               };
                                        };
                                };
                        };