Merge tag 'v6.4-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthi...

MT7530 (e.g. BPI R2):
- several DT clean-ups
- add port5 as CPU port

* tag 'v6.4-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: dts: mt7623: add port@5 as CPU port
  arm: dts: mt7623: enable flow control on port@6
  arm: dts: mt7623: change mt7530 switch address
  arm: dts: mt7623: add mt7530 switch to mt7623a.dtsi
  arm: dts: mt7623: add gmacs to mt7623.dtsi

Link: https://lore.kernel.org/r/98e21acb-d792-6a8c-2de6-12d5af8a8111@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index 11379c3..f0b4a09 100644 (file)
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi
@@ -980,6 +980,18 @@
                #address-cells = <1>;
                #size-cells = <0>;
                status = "disabled";
+
+               gmac0: mac@0 {
+                       compatible = "mediatek,eth-mac";
+                       reg = <0>;
+                       status = "disabled";
+               };
+
+               gmac1: mac@1 {
+                       compatible = "mediatek,eth-mac";
+                       reg = <1>;
+                       status = "disabled";
+               };
        };
 
        crypto: crypto@1b240000 {

diff --git a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
index e8b4b6d..5654284 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-emmc.dts
@@ -112,75 +112,31 @@
        status = "okay";
 };
 
-&eth {
-       status = "okay";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan0";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
 
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
+               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 61f5da6..afd177b 100644 (file)
--- a/arch/arm/boot/dts/mt7623a-rfb-nand.dts
+++ b/arch/arm/boot/dts/mt7623a-rfb-nand.dts
@@ -116,75 +116,31 @@
        status = "okay";
 };
 
-&eth {
-       status = "okay";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan0";
+               };
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
 
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
+               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 d304b62..bcf909d 100644 (file)
--- a/arch/arm/boot/dts/mt7623a.dtsi
+++ b/arch/arm/boot/dts/mt7623a.dtsi
@@ -17,8 +17,107 @@
        power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
 };
 
+&gmac0 {
+       status = "okay";
+       phy-mode = "trgmii";
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
+       };
+};
+
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+
+       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@1f {
+                       compatible = "mediatek,mt7530";
+                       reg = <0x1f>;
+                       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@5 {
+                                       reg = <5>;
+                                       label = "cpu";
+                                       ethernet = <&gmac1>;
+                                       phy-mode = "rgmii";
+
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                               pause;
+                                       };
+                               };
+
+                               port@6 {
+                                       reg = <6>;
+                                       label = "cpu";
+                                       ethernet = <&gmac0>;
+                                       phy-mode = "trgmii";
+
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                               pause;
+                                       };
+                               };
+                       };
+               };
+       };
 };
 
 &nandc {

diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
index ece61a6..a37f3fa 100644 (file)
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
@@ -171,28 +171,38 @@
        };
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
+       };
+};
 
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
+
+&eth {
+       status = "okay";
 
-       mdio: mdio-bus {
+       mdio-bus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               switch@0 {
+               switch@1f {
                        compatible = "mediatek,mt7530";
-                       reg = <0>;
+                       reg = <0x1f>;
                        reset-gpios = <&pio 33 0>;
                        core-supply = <&mt6323_vpa_reg>;
                        io-supply = <&mt6323_vemc3v3_reg>;
@@ -226,6 +236,19 @@
                                        label = "lan3";
                                };
 
+                               port@5 {
+                                       reg = <5>;
+                                       label = "cpu";
+                                       ethernet = <&gmac1>;
+                                       phy-mode = "rgmii";
+
+                                       fixed-link {
+                                               speed = <1000>;
+                                               full-duplex;
+                                               pause;
+                                       };
+                               };
+
                                port@6 {
                                        reg = <6>;
                                        label = "cpu";

diff --git a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
index bf67a8e..34994f3 100644 (file)
--- a/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
+++ b/arch/arm/boot/dts/mt7623n-rfb-emmc.dts
@@ -156,27 +156,25 @@
        };
 };
 
-&eth {
+&gmac0 {
        status = "okay";
+       phy-mode = "trgmii";
 
-       gmac0: mac@0 {
-               compatible = "mediatek,eth-mac";
-               reg = <0>;
-               phy-mode = "trgmii";
-
-               fixed-link {
-                       speed = <1000>;
-                       full-duplex;
-                       pause;
-               };
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+               pause;
        };
+};
 
-       mac@1 {
-               compatible = "mediatek,eth-mac";
-               reg = <1>;
-               phy-mode = "rgmii";
-               phy-handle = <&phy5>;
-       };
+&gmac1 {
+       status = "okay";
+       phy-mode = "rgmii";
+       phy-handle = <&phy5>;
+};
+
+&eth {
+       status = "okay";
 
        mdio-bus {
                #address-cells = <1>;
@@ -187,9 +185,9 @@
                        phy-mode = "rgmii-rxid";
                };
 
-               switch@0 {
+               switch@1f {
                        compatible = "mediatek,mt7530";
-                       reg = <0>;
+                       reg = <0x1f>;
                        reset-gpios = <&pio 33 0>;
                        core-supply = <&mt6323_vpa_reg>;
                        io-supply = <&mt6323_vemc3v3_reg>;
@@ -232,6 +230,7 @@
                                        fixed-link {
                                                speed = <1000>;
                                                full-duplex;
+                                               pause;
                                        };
                                };
                        };