arm: dts: mt7623: add mt7530 switch to mt7623a.dtsi

The MT7530 switch is included as a part of the multi-chip module on the
MT7623AI SoC. Add it to mt7623a.dtsi and adjust DTs that call mt7623a.dtsi.

Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Link: https://lore.kernel.org/r/20230210182505.24597-3-arinc.unal@arinc9.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
index a64d68b6e16597d75a1796cbccfa9e7e9a224571..5654284bab0186675ffe85453eb7aaaa68a29480 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
@@ -112,74 +112,31 @@ &crypto {
        status = "okay";
 };
 
-&gmac0 {
-       status = "okay";
-       phy-mode = "trgmii";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan0";
+               };
 
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-               pause;
-       };
-};
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
 
-&eth {
-       status = "okay";
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan3";
+               };
 
-       mdio-bus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               switch@0 {
-                       compatible = "mediatek,mt7530";
-                       reg = <0>;
-                       mediatek,mcm;
-                       resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
-                       reset-names = "mcm";
-                       core-supply = <&mt6323_vpa_reg>;
-                       io-supply = <&mt6323_vemc3v3_reg>;
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       label = "lan0";
-                               };
-
-                               port@1 {
-                                       reg = <1>;
-                                       label = "lan1";
-                               };
-
-                               port@2 {
-                                       reg = <2>;
-                                       label = "lan2";
-                               };
-
-                               port@3 {
-                                       reg = <3>;
-                                       label = "lan3";
-                               };
-
-                               port@4 {
-                                       reg = <4>;
-                                       label = "wan";
-                               };
-
-                               port@6 {
-                                       reg = <6>;
-                                       label = "cpu";
-                                       ethernet = <&gmac0>;
-                                       phy-mode = "trgmii";
-
-                                       fixed-link {
-                                               speed = <1000>;
-                                               full-duplex;
-                                       };
-                               };
-                       };
+               port@4 {
+                       status = "okay";
+                       label = "wan";
                };
        };
 };

diff --git a/arch/arm/boot/dts/mt7623a-rfb-nand.dts b/arch/arm/boot/dts/mt7623a-rfb-nand.dts
index fac3ca0322c8de85cde9f5a029ae69f6e47abfa2..afd177b3b5165ccabd3a5bffda9d3c87b8259ae1 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts
@@ -116,74 +116,31 @@ &crypto {
        status = "okay";
 };
 
-&gmac0 {
-       status = "okay";
-       phy-mode = "trgmii";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan0";
+               };
 
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-               pause;
-       };
-};
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
 
-&eth {
-       status = "okay";
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
 
-       mdio-bus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               switch@0 {
-                       compatible = "mediatek,mt7530";
-                       reg = <0>;
-                       mediatek,mcm;
-                       resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
-                       reset-names = "mcm";
-                       core-supply = <&mt6323_vpa_reg>;
-                       io-supply = <&mt6323_vemc3v3_reg>;
-
-                       ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       label = "lan0";
-                               };
-
-                               port@1 {
-                                       reg = <1>;
-                                       label = "lan1";
-                               };
-
-                               port@2 {
-                                       reg = <2>;
-                                       label = "lan2";
-                               };
-
-                               port@3 {
-                                       reg = <3>;
-                                       label = "lan3";
-                               };
-
-                               port@4 {
-                                       reg = <4>;
-                                       label = "wan";
-                               };
-
-                               port@6 {
-                                       reg = <6>;
-                                       label = "cpu";
-                                       ethernet = <&gmac0>;
-                                       phy-mode = "trgmii";
-
-                                       fixed-link {
-                                               speed = <1000>;
-                                               full-duplex;
-                                       };
-                               };
-                       };
+               port@3 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
                };
        };
 };

diff --git a/arch/arm/boot/dts/mt7623a.dtsi b/arch/arm/boot/dts/mt7623a.dtsi
index d304b62d24b58df37e5bc656d64a0deb3aea35de..fbb5731a3a53556cbcea86d187d6021e07e3f191 100644 (file)
--- a/arch/arm/boot/dts/mt7623a.dtsi
+++ b/arch/arm/boot/dts/mt7623a.dtsi
@@ -17,8 +17,82 @@ &crypto {
        power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
 };
 
+&gmac0 {
+       status = "okay";
+       phy-mode = "trgmii";
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
+       };
+};
+
 &eth {
+       status = "okay";
        power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
+
+       mdio: mdio-bus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               switch0: switch@0 {
+                       compatible = "mediatek,mt7530";
+                       reg = <0>;
+                       mediatek,mcm;
+                       resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
+                       reset-names = "mcm";
+                       core-supply = <&mt6323_vpa_reg>;
+                       io-supply = <&mt6323_vemc3v3_reg>;
+
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               port@0 {
+                                       status = "disabled";
+                                       reg = <0>;
+                                       label = "swp0";
+                               };
+
+                               port@1 {
+                                       status = "disabled";
+                                       reg = <1>;
+                                       label = "swp1";
+                               };
+
+                               port@2 {
+                                       status = "disabled";
+                                       reg = <2>;
+                                       label = "swp2";
+                               };
+
+                               port@3 {
+                                       status = "disabled";
+                                       reg = <3>;
+                                       label = "swp3";
+                               };
+
+                               port@4 {
+                                       status = "disabled";
+                                       reg = <4>;
+                                       label = "swp4";
+                               };
+
+                               port@6 {
+                                       reg = <6>;
+                                       label = "cpu";
+                                       ethernet = <&gmac0>;
+                                       phy-mode = "trgmii";
+
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                       };
+                               };
+                       };
+               };
+       };
 };
 
 &nandc {