staging: mt7621-dts: fix pinctrl properties for ethernet

[ Upstream commit 0a93c0d75809582893e82039143591b9265b520e ]

Add pinctrl properties with rgmii1 & mdio pins under ethernet node which
was wrongfully put under an external phy node.
GMAC1 will start working with this fix.

Link: https://lore.kernel.org/netdev/02ecce91-7aad-4392-c9d7-f45ca1b31e0b@arinc9.com/T/
Move GB-PC2 specific phy_external node to its own device tree.

Reviewed-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
Link: https://lore.kernel.org/r/20220125153903.1469-5-arinc.unal@arinc9.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/staging/mt7621-dts/gbpc2.dts b/drivers/staging/mt7621-dts/gbpc2.dts
index 52760e7..f9b6909 100644 (file)
--- a/drivers/staging/mt7621-dts/gbpc2.dts
+++ b/drivers/staging/mt7621-dts/gbpc2.dts
@@ -12,10 +12,16 @@
        function = "gpio";
 };
 
-&gmac1 {
-       status = "ok";
-};
+&ethernet {
+       gmac1: mac@1 {
+               status = "ok";
+               phy-handle = <&phy_external>;
+       };
 
-&phy_external {
-       status = "ok";
+       mdio-bus {
+               phy_external: ethernet-phy@5 {
+                       reg = <5>;
+                       phy-mode = "rgmii-rxid";
+               };
+       };
 };

diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index eca384c..99b0eef 100644 (file)
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -391,6 +391,9 @@
 
                mediatek,ethsys = <&sysc>;
 
+               pinctrl-names = "default";
+               pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
+
                gmac0: mac@0 {
                        compatible = "mediatek,eth-mac";
                        reg = <0>;
@@ -408,22 +411,12 @@
                        reg = <1>;
                        status = "off";
                        phy-mode = "rgmii-rxid";
-                       phy-handle = <&phy_external>;
                };
 
                mdio-bus {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       phy_external: ethernet-phy@5 {
-                               status = "off";
-                               reg = <5>;
-                               phy-mode = "rgmii-rxid";
-
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&rgmii2_pins>;
-                       };
-
                        switch0: switch0@0 {
                                compatible = "mediatek,mt7621";
                                #address-cells = <1>;