diff --git a/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch b/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch index 885d9b0851..bf427ca954 100644 --- a/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch +++ b/target/linux/rockchip/patches-6.1/100-rockchip-use-system-LED-for-OpenWrt.patch @@ -15,7 +15,15 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -16,6 +16,11 @@ +@@ -6,6 +6,7 @@ + /dts-v1/; + + #include ++#include + #include + #include "rk3328.dtsi" + +@@ -16,6 +17,11 @@ aliases { ethernet1 = &rtl8153; mmc0 = &sdmmc; @@ -27,25 +35,29 @@ Signed-off-by: David Bauer }; chosen { -@@ -49,18 +54,18 @@ +@@ -48,19 +54,22 @@ + pinctrl-names = "default"; lan_led: led-0 { ++ color = ; ++ function = LED_FUNCTION_LAN; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - label = "nanopi-r2s:green:lan"; -+ label = "green:lan"; }; sys_led: led-1 { ++ color = ; ++ function = LED_FUNCTION_STATUS; gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; - label = "nanopi-r2s:red:sys"; -+ label = "red:sys"; default-state = "on"; }; wan_led: led-2 { ++ color = ; ++ function = LED_FUNCTION_WAN; gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; - label = "nanopi-r2s:green:wan"; -+ label = "green:wan"; }; }; @@ -270,7 +282,15 @@ Signed-off-by: David Bauer }; --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -20,6 +20,11 @@ +@@ -8,6 +8,7 @@ + /dts-v1/; + + #include ++#include + #include + #include + #include "rk3588.dtsi" +@@ -20,6 +21,11 @@ mmc0 = &sdhci; mmc1 = &sdmmc; serial2 = &uart2; @@ -282,7 +302,7 @@ Signed-off-by: David Bauer }; chosen { -@@ -28,20 +33,19 @@ +@@ -28,20 +34,19 @@ leds { compatible = "gpio-leds"; @@ -291,7 +311,7 @@ Signed-off-by: David Bauer sys_led: led-0 { + color = ; -+ function = LED_FUNCTION_SYSTEM; ++ function = LED_FUNCTION_STATUS; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - label = "system-led"; - linux,default-trigger = "heartbeat"; diff --git a/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch b/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch index a3e5072a71..89a0d9a8be 100644 --- a/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch +++ b/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -161,6 +161,8 @@ +@@ -165,6 +165,8 @@ #size-cells = <0>; rtl8211e: ethernet-phy@1 { diff --git a/target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch index 013e149811..70c53ba3a4 100644 --- a/target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch +++ b/target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch @@ -9,7 +9,7 @@ Subject: [PATCH] rockchip: rk3328: add i2c0 controller for nanopi r2s --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -173,6 +173,10 @@ +@@ -177,6 +177,10 @@ }; }; diff --git a/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch index cb23463fc1..3f562a5eb5 100644 --- a/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch +++ b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch @@ -36,7 +36,7 @@ Signed-off-by: David Bauer }; --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -562,8 +562,7 @@ +@@ -563,8 +563,7 @@ no-sd; non-removable; max-frequency = <200000000>; @@ -46,7 +46,7 @@ Signed-off-by: David Bauer status = "okay"; }; -@@ -574,7 +573,7 @@ +@@ -575,7 +574,7 @@ disable-wp; no-mmc; no-sdio; diff --git a/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch b/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch index 39c679611f..26f7ddf3ee 100644 --- a/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch +++ b/target/linux/rockchip/patches-6.1/124-01-arm64-dts-rockchip-nanopc-t6-cpu-mem-regulator-info.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -203,34 +203,42 @@ +@@ -204,34 +204,42 @@ &cpu_l0 { cpu-supply = <&vdd_cpu_lit_s0>; diff --git a/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch b/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch index 68436153f0..5f4ecbb51a 100644 --- a/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch +++ b/target/linux/rockchip/patches-6.1/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -109,6 +109,28 @@ +@@ -110,6 +110,28 @@ vin-supply = <&vcc12v_dcin>; }; @@ -29,7 +29,7 @@ vcc_1v1_nldo_s3: vcc-1v1-nldo-s3-regulator { compatible = "regulator-fixed"; regulator-name = "vcc-1v1-nldo-s3"; -@@ -551,6 +573,10 @@ +@@ -552,6 +574,10 @@ usbc0_int: usbc0-int { rockchip,pins = <0 RK_PD3 RK_FUNC_GPIO &pcfg_pull_up>; }; @@ -40,7 +40,7 @@ }; }; -@@ -922,6 +948,11 @@ +@@ -923,6 +949,11 @@ status = "okay"; }; @@ -52,7 +52,7 @@ &u2phy2_host { phy-supply = <&vdd_4g_3v3>; status = "okay"; -@@ -931,6 +962,10 @@ +@@ -932,6 +963,10 @@ status = "okay"; }; @@ -63,7 +63,7 @@ &u2phy2 { status = "okay"; }; -@@ -939,6 +974,14 @@ +@@ -940,6 +975,14 @@ status = "okay"; }; @@ -78,7 +78,7 @@ &usb_host0_ehci { status = "okay"; }; -@@ -954,3 +997,7 @@ +@@ -955,3 +998,7 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch b/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch index e966ee0bff..4fef062d58 100644 --- a/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch +++ b/target/linux/rockchip/patches-6.1/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -421,6 +421,48 @@ +@@ -422,6 +422,48 @@ source-pdos = ; sink-pdos = ; op-sink-microwatt = <1000000>; @@ -49,7 +49,7 @@ }; }; -@@ -948,6 +990,10 @@ +@@ -949,6 +991,10 @@ status = "okay"; }; @@ -60,7 +60,7 @@ &u2phy1_otg { phy-supply = <&vcc5v0_host_30>; status = "okay"; -@@ -962,6 +1008,10 @@ +@@ -963,6 +1009,10 @@ status = "okay"; }; @@ -71,7 +71,7 @@ &u2phy1 { status = "okay"; }; -@@ -974,6 +1024,33 @@ +@@ -975,6 +1025,33 @@ status = "okay"; }; @@ -105,7 +105,7 @@ &usbdp_phy1 { status = "okay"; }; -@@ -990,6 +1067,21 @@ +@@ -991,6 +1068,21 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch index bb01aad6ee..0b00b1d40b 100644 --- a/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch +++ b/target/linux/rockchip/patches-6.1/610-arm64-rockchip-add-OF-node-for-eth.patch @@ -32,7 +32,7 @@ Signed-off-by: David Bauer +}; --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -405,9 +405,11 @@ +@@ -409,9 +409,11 @@ #size-cells = <0>; /* Second port is for USB 3.0 */ @@ -176,7 +176,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -530,6 +530,17 @@ +@@ -531,6 +531,17 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie2_0_rst>; status = "okay"; @@ -194,7 +194,7 @@ Signed-off-by: David Bauer }; &pcie2x1l1 { -@@ -546,6 +557,17 @@ +@@ -547,6 +558,17 @@ pinctrl-names = "default"; pinctrl-0 = <&pcie2_2_rst>; status = "okay"; diff --git a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch b/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch index 521fe41355..0ac0e58f46 100644 --- a/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch +++ b/target/linux/rockchip/patches-6.1/801-07-arm64-dts-rockchip-enable-hwrng-for-rockchip-boards.patch @@ -52,7 +52,7 @@ status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts -@@ -649,6 +649,10 @@ +@@ -650,6 +650,10 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch b/target/linux/rockchip/patches-6.1/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch index 9d07f88efd..b31ca56d77 100644 --- a/target/linux/rockchip/patches-6.1/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch +++ b/target/linux/rockchip/patches-6.1/806-arm64-dts-rockchip-enable-dmc-for-rk3328-boards.patch @@ -16,7 +16,7 @@ Signed-off-by: hmz007 --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -141,6 +141,11 @@ +@@ -145,6 +145,11 @@ status = "disabled"; }; @@ -28,7 +28,7 @@ Signed-off-by: hmz007 &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clk>, <&gmac_clk>; -@@ -206,6 +211,7 @@ +@@ -210,6 +215,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -36,7 +36,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -220,6 +226,7 @@ +@@ -224,6 +230,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on;