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>

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 80d7b35f67fa6be5f367a76b51096fcabfcc3fa4..399d85f4cd0c6278829602e6f0029bbcacbc4504 100644 (file)
--- 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 @@ &uart_AO {
 
 &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 e6e3491d48a5ae97f877e4b9159b549a994a30b3..325b9c5691be9629b25e35f705a47f5319b7522e 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -83,7 +83,7 @@ &uart_AO {
 
 &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 06a34dc6002f5a78aec95e7e75f1727c0fdbf4be..031d69bee16acf5a79387c17a9982fe10329fe21 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -81,7 +81,7 @@ &uart_AO {
 
 &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 73f1593701883c40d4283f4f88a6a8a25941a2dc..e93221af390d124a43e7569a46855b875cc2d7db 100644 (file)
--- 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 @@ &ir {
 
 &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 443811b497ded01d315744a7603cc4fd152d7918..aad639ab01127af7405c142edd6b2f58f48d8234 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -443,7 +443,7 @@ mux {
                        };
                };
 
-               eth_pins: eth_c {
+               eth_rgmii_pins: eth-rgmii {
                        mux {
                                groups = "eth_mdio",
                                       "eth_mdc",
@@ -463,6 +463,21 @@ mux {
                        };
                };
 
+               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";