ARM64: dts: meson-gxbb: Add rmii pinctrl node and rename rgmii node

For boards only supporting 10/100 ethernet over a RMII PHY link, add
a separate pinctrl node. By the way, rename the existing node to rgmii
specific naming in all boards dts.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

5 files changed, 21 insertions, 5 deletions

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 80d7b35f67fa..399d85f4cd0c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -97,8 +97,9 @@
 
 &ethmac {
         status = "okay";
-        pinctrl-0 = <&eth_pins>;
+        pinctrl-0 = <&eth_rmii_pins>;
         pinctrl-names = "default";
+        phy-mode = "rmii";
 };
 
 &ir {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index e6e3491d48a5..325b9c5691be 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -83,7 +83,7 @@
 
 &ethmac {
         status = "okay";
-        pinctrl-0 = <&eth_pins>;
+        pinctrl-0 = <&eth_rgmii_pins>;
         pinctrl-names = "default";
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 06a34dc6002f..031d69bee16a 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -81,7 +81,7 @@
 
 &ethmac {
         status = "okay";
-        pinctrl-0 = <&eth_pins>;
+        pinctrl-0 = <&eth_rgmii_pins>;
         pinctrl-names = "default";
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 73f159370188..e93221af390d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -82,7 +82,7 @@
 
 &ethmac {
         status = "okay";
-        pinctrl-0 = <&eth_pins>;
+        pinctrl-0 = <&eth_rgmii_pins>;
         pinctrl-names = "default";
 };
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 443811b497de..aad639ab0112 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -443,7 +443,7 @@
                         };
                 };
 
-                eth_pins: eth_c {
+                eth_rgmii_pins: eth-rgmii {
                         mux {
                                 groups = "eth_mdio",
                                        "eth_mdc",
@@ -463,6 +463,21 @@
                         };
                 };
 
+                eth_rmii_pins: eth-rmii {
+                        mux {
+                                groups = "eth_mdio",
+                                       "eth_mdc",
+                                       "eth_clk_rx_clk",
+                                       "eth_rx_dv",
+                                       "eth_rxd0",
+                                       "eth_rxd1",
+                                       "eth_tx_en",
+                                       "eth_txd0",
+                                       "eth_txd1";
+                                function = "eth";
+                        };
+                };
+
                 pwm_a_x_pins: pwm_a_x {
                         mux {
                                 groups = "pwm_a_x";