From: Robin Murphy <robin.murphy@arm.com>
Date: Mon, 26 Jan 2026 12:32:03 +0000 (+0000)
Subject: arm64: dts: rockchip: Clean up NanoPi-R2S Plus gmac2io
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e6568db5a4e65ec60d2ccc1fd2ba38cd6db59bc;p=thirdparty%2Fkernel%2Flinux.git

arm64: dts: rockchip: Clean up NanoPi-R2S Plus gmac2io

Apparently something went wonky in the refactoring, and NanoPi R2S Plus
has ended up "overriding" the GMAC properties from the base R2S include
with all identical values. Clean up the redundancy.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://patch.msgid.link/94f66f34d6023887111884093f31a8980e993ef9.1767111968.git.robin.murphy@arm.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
index f72b1518c14f8..4eff0503928a8 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts
@@ -29,20 +29,3 @@
 	pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
 	status = "okay";
 };
-
-&gmac2io {
-	phy-handle = <&rtl8211e>;
-	tx_delay = <0x24>;
-	rx_delay = <0x18>;
-
-	mdio {
-		rtl8211e: ethernet-phy@1 {
-			reg = <1>;
-			pinctrl-0 = <&eth_phy_reset_pin>;
-			pinctrl-names = "default";
-			reset-assert-us = <10000>;
-			reset-deassert-us = <50000>;
-			reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
-		};
-	};
-};