]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: dts: rockchip: Clean up NanoPi-R2S Plus gmac2io
authorRobin Murphy <robin.murphy@arm.com>
Mon, 26 Jan 2026 12:32:03 +0000 (12:32 +0000)
committerHeiko Stuebner <heiko@sntech.de>
Sun, 22 Feb 2026 22:28:51 +0000 (23:28 +0100)
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>
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts

index f72b1518c14f876714c612286db0a79e87aa2bbe..4eff0503928a8fff28e5d06c80c168b179dfcbb1 100644 (file)
        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>;
-               };
-       };
-};