From c754f2df383ce702978b75d6955d439907fca8b4 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 30 Aug 2022 10:10:43 +0800 Subject: [PATCH] rockchip: remove boardname from LED labels Signed-off-by: Tianling Shen --- .../armv8/base-files/etc/board.d/01_leds | 5 +---- .../boot/dts/rockchip/rk3328-nanopi-r2c.dts | 12 ---------- .../rockchip/rk3328-orangepi-r1-plus-lts.dts | 12 ---------- .../dts/rockchip/rk3328-orangepi-r1-plus.dts | 10 +-------- ...-rockchip-use-system-LED-for-OpenWrt.patch | 22 +++++++++++++++++++ 5 files changed, 24 insertions(+), 37 deletions(-) diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds index 0e31d85683..d82e47cf53 100644 --- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds +++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds @@ -10,12 +10,9 @@ board_config_update case $board in friendlyarm,nanopi-r2c|\ friendlyarm,nanopi-r2s|\ +friendlyarm,nanopi-r4s|\ xunlong,orangepi-r1-plus|\ xunlong,orangepi-r1-plus-lts) - ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" - ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1" - ;; -friendlyarm,nanopi-r4s) ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1" ;; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts index 530739a696..eac6c0391f 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2c.dts @@ -32,18 +32,6 @@ }; }; -&lan_led { - label = "nanopi-r2c:green:lan"; -}; - &rtl8153 { realtek,led-data = <0x78>; }; - -&sys_led { - label = "nanopi-r2c:red:sys"; -}; - -&wan_led { - label = "nanopi-r2c:green:wan"; -}; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts index a690c062fe..1ad0991b61 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts @@ -49,18 +49,6 @@ }; }; -&lan_led { - label = "orangepi-r1-plus-lts:green:lan"; -}; - &rtl8153 { realtek,led-data = <0x78>; }; - -&sys_led { - label = "orangepi-r1-plus-lts:red:sys"; -}; - -&wan_led { - label = "orangepi-r1-plus-lts:green:wan"; -}; diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts index ed585daf43..73de6bcf92 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts @@ -1,4 +1,5 @@ // SPDX-License-Identifier: (GPL-2.0+ OR MIT) + #include "rk3328-nanopi-r2s.dts" / { @@ -6,10 +7,6 @@ compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328"; }; -&lan_led { - label = "orangepi-r1-plus:green:lan"; -}; - &spi0 { max-freq = <48000000>; status = "okay"; @@ -23,7 +20,6 @@ &sys_led { gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - label = "orangepi-r1-plus:red:sys"; }; &sys_led_pin { @@ -33,7 +29,3 @@ &uart1 { status = "okay"; }; - -&wan_led { - label = "orangepi-r1-plus:green:wan"; -}; diff --git a/target/linux/rockchip/patches-5.15/100-rockchip-use-system-LED-for-OpenWrt.patch b/target/linux/rockchip/patches-5.15/100-rockchip-use-system-LED-for-OpenWrt.patch index 0511245192..2c0db2c850 100644 --- a/target/linux/rockchip/patches-5.15/100-rockchip-use-system-LED-for-OpenWrt.patch +++ b/target/linux/rockchip/patches-5.15/100-rockchip-use-system-LED-for-OpenWrt.patch @@ -29,6 +29,28 @@ Signed-off-by: David Bauer chosen { stdout-path = "serial2:1500000n8"; }; +@@ -49,18 +49,18 @@ + + lan_led: led-0 { + gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; +- label = "nanopi-r2s:green:lan"; ++ label = "green:lan"; + }; + + sys_led: led-1 { + gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; +- label = "nanopi-r2s:red:sys"; ++ label = "red:sys"; + default-state = "on"; + }; + + wan_led: led-2 { + gpios = <&gpio2 RK_PC2 GPIO_ACTIVE_HIGH>; +- label = "nanopi-r2s:green:wan"; ++ label = "green:wan"; + }; + }; + --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts @@ -19,6 +19,13 @@