ARM: dts: rmobile: Move the PHY reset GPIOs into PHY nodes

Both the RAVB and SH ether driver now support parsing the PHY reset
GPIOs from both the PHY nodes and the MAC nodes, move the reset GPIOs
back into the PHY nodes to minimize DT difference between U-Boot and
Linux.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>

diff --git a/arch/arm/dts/r8a77970-eagle.dts b/arch/arm/dts/r8a77970-eagle.dts
index 5b8b2f87045e669d406a8233526059ed41020577..5dcad634926af93cd0216cd13dcc6c5a98334f1b 100644 (file)
--- a/arch/arm/dts/r8a77970-eagle.dts
+++ b/arch/arm/dts/r8a77970-eagle.dts
@@ -39,13 +39,13 @@
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
        status = "okay";
-       reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
 
        phy0: ethernet-phy@0 {
                rxc-skew-ps = <1500>;
                reg = <0>;
                interrupt-parent = <&gpio1>;
                interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
+               reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
        };
 };
 

diff --git a/arch/arm/dts/salvator-common.dtsi b/arch/arm/dts/salvator-common.dtsi
index 21dbb21184a48cbba21995391b95e352e61a4db6..a36e0ebca0763c98b2f23775022bae7485ceaa92 100644 (file)
--- a/arch/arm/dts/salvator-common.dtsi
+++ b/arch/arm/dts/salvator-common.dtsi
@@ -257,7 +257,6 @@
        pinctrl-names = "default";
        phy-handle = <&phy0>;
        phy-mode = "rgmii-txid";
-       reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
        status = "okay";
 
        phy0: ethernet-phy@0 {
@@ -265,6 +264,7 @@
                reg = <0>;
                interrupt-parent = <&gpio2>;
                interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+               reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
        };
 };