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 3ca42df844..899453eb65 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 @@ -128,15 +128,19 @@ Signed-off-by: David Bauer }; chosen { -@@ -55,7 +60,7 @@ +@@ -55,10 +60,9 @@ pinctrl-0 = <&led_pin>; pinctrl-names = "default"; - led-0 { +- color = ; + status_led: led-0 { - color = ; ++ label = "blue:status"; gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; +- linux,default-trigger = "heartbeat"; + }; + }; + --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts @@ -19,6 +19,13 @@ @@ -169,6 +173,18 @@ Signed-off-by: David Bauer chosen: chosen { stdout-path = "serial2:1500000n8"; }; +@@ -32,10 +39,8 @@ + pinctrl-0 = <&status_led_pin>; + + status_led: led-status { +- color = ; +- function = LED_FUNCTION_STATUS; ++ label = "blue:status"; + gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>; +- linux,default-trigger = "heartbeat"; + }; + }; + --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5c.dts @@ -32,27 +32,22 @@ 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 13d3ee3796..c6b5f282c0 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 @@ -13,7 +13,7 @@ status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi -@@ -425,6 +425,10 @@ +@@ -423,6 +423,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 b99130689d..d84ac8a2c4 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 @@ -203,7 +203,7 @@ Signed-off-by: hmz007 regulator-always-on; --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts -@@ -134,6 +134,15 @@ +@@ -133,6 +133,15 @@ cpu-supply = <&vdd_arm>; }; @@ -219,7 +219,7 @@ Signed-off-by: hmz007 &emmc { bus-width = <8>; cap-mmc-highspeed; -@@ -214,6 +223,7 @@ +@@ -213,6 +222,7 @@ regulator-name = "vdd_log"; regulator-always-on; regulator-boot-on; @@ -227,7 +227,7 @@ Signed-off-by: hmz007 regulator-min-microvolt = <712500>; regulator-max-microvolt = <1450000>; regulator-ramp-delay = <12500>; -@@ -228,6 +238,7 @@ +@@ -227,6 +237,7 @@ regulator-name = "vdd_arm"; regulator-always-on; regulator-boot-on;