ARM: dts: imx6ul-tx6ul: Switch away from deprecated `phy-reset-gpios`

The Ethernet PHY's reset GPIO should be specified in the node of the PHY
itself, instead of the MAC (`fec`). The latter is deprecated, and was an
i.MX-specific extension, incompatible with the new reset controller
subsystem.

Co-developed-by: Csaba Buday <buday.csaba@prolan.hu>
Signed-off-by: Csaba Buday <buday.csaba@prolan.hu>
Signed-off-by: Bence Csókás <csokas.bence@prolan.hu>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
index f053358bc9317f8447d65013a18670cb470106b2..5c7e9556b5ce823b339798ec8f1bd351afa07185 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
@@ -246,7 +246,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1_mdio &pinctrl_etnphy0_rst>;
        phy-mode = "rmii";
-       phy-reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
        phy-supply = <&reg_3v3_etn>;
        phy-handle = <&etnphy0>;
        status = "okay";
@@ -262,6 +261,11 @@
                        pinctrl-0 = <&pinctrl_etnphy0_int>;
                        interrupt-parent = <&gpio5>;
                        interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
+                       reset-gpios = <&gpio5 6 GPIO_ACTIVE_LOW>;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <25000>;
+                       /* Energy detect sometimes causes link failures */
+                       smsc,disable-energy-detect;
                        status = "okay";
                };
 
@@ -272,6 +276,9 @@
                        pinctrl-0 = <&pinctrl_etnphy1_int>;
                        interrupt-parent = <&gpio4>;
                        interrupts = <27 IRQ_TYPE_EDGE_FALLING>;
+                       reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
+                       reset-assert-us = <100>;
+                       reset-deassert-us = <25000>;
                        status = "okay";
                };
        };
@@ -281,7 +288,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2 &pinctrl_etnphy1_rst>;
        phy-mode = "rmii";
-       phy-reset-gpios = <&gpio4 28 GPIO_ACTIVE_LOW>;
        phy-supply = <&reg_3v3_etn>;
        phy-handle = <&etnphy1>;
        status = "disabled";