From b9afcf4062c93d5c1766b33d083a9dff8f2d00d3 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 Dec 2024 17:20:39 +0800 Subject: [PATCH] arm64: dts: rockchip: replace deprecated snps, reset props for NanoPi R3S Replace deprecated snps,reset props and move them to the PHY node. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen Link: https://lore.kernel.org/r/20241022193537.1117919-3-cnsztl@gmail.com Signed-off-by: Heiko Stuebner [ upstream commit: 82b2868937883b65732da498b26366d34db61510 ] Signed-off-by: Tianling Shen Reviewed-by: Kever Yang --- dts/upstream/src/arm64/rockchip/rk3566-nanopi-r3s.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dts/upstream/src/arm64/rockchip/rk3566-nanopi-r3s.dts b/dts/upstream/src/arm64/rockchip/rk3566-nanopi-r3s.dts index 6bc17f755b7..66a00cddda0 100644 --- a/dts/upstream/src/arm64/rockchip/rk3566-nanopi-r3s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3566-nanopi-r3s.dts @@ -149,10 +149,6 @@ &gmac1m0_rx_bus2 &gmac1m0_rgmii_clk_level2 &gmac1m0_rgmii_bus_level3>; - snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - /* Reset time is 20ms, 100ms for rtl8211f */ - snps,reset-delays-us = <0 20000 100000>; status = "okay"; }; @@ -414,6 +410,9 @@ interrupts = ; pinctrl-names = "default"; pinctrl-0 = <ð_phy_reset_pin>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; }; }; -- 2.39.5