[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: rockchip: fix wan port for nanopi r2c (coolsnowwolf#11091)
DeakeyTan · Apr 9, 2023 · 3996da3 · 3996da3
2 parents 1f98d7d + 0d49842
commit 3996da3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/...inux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch b/...inux/rockchip/patches-5.15/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch
@@ -10,7 +10,7 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,71 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2016 Xunlong Software. Co., Ltd.
@@ -53,6 +53,11 @@
 +			compatible = "ethernet-phy-id4f51.e91b",
 +				     "ethernet-phy-ieee802.3-c22";
 +			reg = <0>;
++
++ 			motorcomm,clk-out-frequency-hz = <125000000>;
++			motorcomm,keep-pll-enabled;
++			motorcomm,auto-sleep-disabled;
++
 +			pinctrl-0 = <&eth_phy_reset_pin>;
 +			pinctrl-names = "default";
 +			reset-assert-us = <15000>;

diff --git a/...inux/rockchip/patches-5.15/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/...inux/rockchip/patches-5.15/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
@@ -10,7 +10,7 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
@@ -40,6 +40,11 @@
 +			compatible = "ethernet-phy-id0000.011a",
 +				     "ethernet-phy-ieee802.3-c22";
 +			reg = <3>;
++
++			motorcomm,clk-out-frequency-hz = <125000000>;
++			motorcomm,keep-pll-enabled;
++			motorcomm,auto-sleep-disabled;
++
 +			interrupt-parent = <&gpio2>;
 +			interrupts = <RK_PC4 IRQ_TYPE_EDGE_FALLING>;
 +			pinctrl-0 = <&eth_phy_reset_pin>;

diff --git a/...linux/rockchip/patches-6.1/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch b/...linux/rockchip/patches-6.1/203-rockchip-rk3328-Add-support-for-OrangePi-R1-Plus-LTS.patch
@@ -10,7 +10,7 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts
-@@ -0,0 +1,66 @@
+@@ -0,0 +1,71 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2016 Xunlong Software. Co., Ltd.
@@ -53,6 +53,11 @@
 +			compatible = "ethernet-phy-id4f51.e91b",
 +				     "ethernet-phy-ieee802.3-c22";
 +			reg = <0>;
++
++ 			motorcomm,clk-out-frequency-hz = <125000000>;
++			motorcomm,keep-pll-enabled;
++			motorcomm,auto-sleep-disabled;
++
 +			pinctrl-0 = <&eth_phy_reset_pin>;
 +			pinctrl-names = "default";
 +			reset-assert-us = <15000>;

diff --git a/...linux/rockchip/patches-6.1/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch b/...linux/rockchip/patches-6.1/204-rockchip-rk3328-Add-support-for-FriendlyARM-NanoPi-R.patch
@@ -10,7 +10,7 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts
-@@ -0,0 +1,55 @@
+@@ -0,0 +1,60 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +/*
 + * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
@@ -40,6 +40,11 @@
 +			compatible = "ethernet-phy-id0000.011a",
 +				     "ethernet-phy-ieee802.3-c22";
 +			reg = <3>;
++
++ 			motorcomm,clk-out-frequency-hz = <125000000>;
++			motorcomm,keep-pll-enabled;
++			motorcomm,auto-sleep-disabled;
++
 +			interrupt-parent = <&gpio2>;
 +			interrupts = <RK_PC4 IRQ_TYPE_EDGE_FALLING>;
 +			pinctrl-0 = <&eth_phy_reset_pin>;