From 6731d2c9039fbe1ecf21915eab3acee0a999508a Mon Sep 17 00:00:00 2001 From: David Bauer Date: Fri, 10 Jul 2020 21:38:20 +0200 Subject: [PATCH] rockchip: use system LED for OpenWrt Use the SYS LED on the casing for showing system status. This patch is kept separate from the NanoPi R2S support patch, as i plan on submitting the device support upstream. Signed-off-by: David Bauer --- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts @@ -6,6 +6,7 @@ /dts-v1/; #include +#include #include #include "rk3328.dtsi" @@ -16,6 +17,11 @@ aliases { ethernet1 = &rtl8153; mmc0 = &sdmmc; + + led-boot = &sys_led; + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; }; chosen { @@ -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"; }; sys_led: led-1 { + color = ; + function = LED_FUNCTION_STATUS; gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; - label = "nanopi-r2s: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"; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus.dts @@ -17,6 +17,11 @@ aliases { ethernet1 = &rtl8153; mmc0 = &sdmmc; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen { @@ -41,11 +46,10 @@ gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; }; - led-1 { + status_led: led-1 { function = LED_FUNCTION_STATUS; color = ; gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; }; led-2 { --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts @@ -13,6 +13,11 @@ aliases { mmc0 = &sdmmc; mmc1 = &emmc; + + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; chosen { @@ -93,9 +98,7 @@ power_led: led-0 { label = "firefly:blue:power"; - linux,default-trigger = "heartbeat"; gpios = <&rk805 1 GPIO_ACTIVE_LOW>; - default-state = "on"; }; user_led: led-1 { --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -23,6 +23,11 @@ aliases { mmc0 = &sdmmc; mmc1 = &emmc; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen { @@ -55,10 +60,9 @@ pinctrl-0 = <&led_pin>; pinctrl-names = "default"; - led-0 { - color = ; + status_led: led-0 { + label = "blue:status"; gpios = <&gpio3 RK_PA5 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts @@ -15,6 +15,13 @@ model = "FriendlyElec NanoPC-T4"; compatible = "friendlyarm,nanopc-t4", "rockchip,rk3399"; + aliases { + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; + }; + vcc12v0_sys: vcc12v0-sys { compatible = "regulator-fixed"; regulator-always-on; --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts @@ -19,6 +19,13 @@ model = "FriendlyElec NanoPi R4S"; compatible = "friendlyarm,nanopi-r4s", "rockchip,rk3399"; + aliases { + led-boot = &sys_led; + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; + }; + /delete-node/ display-subsystem; gpio-leds { --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi @@ -17,7 +17,7 @@ leds { compatible = "gpio-leds"; - led-0 { + status_led: led-0 { gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; color = ; function = LED_FUNCTION_STATUS; --- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts @@ -16,6 +16,10 @@ aliases { ethernet0 = &gmac1; mmc1 = &sdmmc0; + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen: chosen { --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi @@ -9,6 +9,13 @@ #include "rk3568.dtsi" / { + aliases { + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; + }; + chosen: chosen { stdout-path = "serial2:1500000n8"; }; @@ -35,7 +42,6 @@ color = ; function = LED_FUNCTION_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 @@ -40,7 +40,6 @@ power_led: led-power { color = ; function = LED_FUNCTION_POWER; - linux,default-trigger = "heartbeat"; gpios = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; }; --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts @@ -39,7 +39,6 @@ power_led: led-power { color = ; function = LED_FUNCTION_POWER; - linux,default-trigger = "heartbeat"; gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; }; --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi @@ -18,6 +18,11 @@ aliases { mmc0 = &sdmmc0; mmc1 = &sdhci; + + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; chosen: chosen { --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi @@ -10,6 +10,11 @@ aliases { mmc0 = &sdhci; + + led-boot = &led_user; + led-failsafe = &led_user; + led-running = &led_user; + led-upgrade = &led_user; }; chosen { @@ -23,7 +28,6 @@ gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; function = LED_FUNCTION_HEARTBEAT; color = ; - linux,default-trigger = "heartbeat"; pinctrl-names = "default"; pinctrl-0 = <&led_user_en>; }; --- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts @@ -19,6 +19,11 @@ ethernet1 = &gmac1; mmc0 = &sdmmc0; mmc1 = &sdhci; + + led-boot = &power_led; + led-failsafe = &power_led; + led-running = &power_led; + led-upgrade = &power_led; }; chosen: chosen { @@ -50,15 +55,17 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&power_led_pin>, <&user_led_pin>; + + power_led: led-power { + label = "red:power"; + gpios = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; + }; led-user { - label = "user-led"; - default-state = "on"; + label = "blue:user"; gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&user_led_enable_h>; - retain-state-suspended; }; }; @@ -490,7 +497,11 @@ &pinctrl { leds { - user_led_enable_h: user-led-enable-h { + power_led_pin: power-led-pin { + rockchip,pins = <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + user_led_pin: user-led-pin { rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -16,6 +16,11 @@ mmc0 = &sdhci; mmc1 = &sdmmc0; mmc2 = &sdmmc2; + + led-boot = &led_user; + led-failsafe = &led_user; + led-running = &led_user; + led-upgrade = &led_user; }; chosen: chosen { @@ -47,7 +52,6 @@ gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; function = LED_FUNCTION_HEARTBEAT; color = ; - linux,default-trigger = "heartbeat"; pinctrl-names = "default"; pinctrl-0 = <&led_user_en>; }; --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts @@ -8,6 +8,7 @@ /dts-v1/; #include +#include #include #include #include "rk3588.dtsi" @@ -19,6 +20,11 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc; + + led-boot = &sys_led; + led-failsafe = &sys_led; + led-running = &sys_led; + led-upgrade = &sys_led; }; chosen { @@ -27,20 +33,19 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&sys_led_pin>, <&usr_led_pin>; sys_led: led-0 { + color = ; + function = LED_FUNCTION_STATUS; gpios = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; - label = "system-led"; - linux,default-trigger = "heartbeat"; - pinctrl-names = "default"; - pinctrl-0 = <&sys_led_pin>; }; usr_led: led-1 { + color = ; + function = LED_FUNCTION_WAN; gpios = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; - label = "user-led"; - pinctrl-names = "default"; - pinctrl-0 = <&usr_led_pin>; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts @@ -20,6 +20,11 @@ mmc0 = &sdhci; mmc1 = &sdmmc; serial2 = &uart2; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen { @@ -78,7 +83,7 @@ pinctrl-names = "default"; pinctrl-0 = <&blue_led_pin>; - led { + status_led: led { color = ; function = LED_FUNCTION_INDICATOR; function-enumerator = <1>; --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -14,6 +14,11 @@ mmc0 = &sdhci; mmc1 = &sdmmc; mmc2 = &sdio; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen { @@ -42,11 +47,10 @@ pinctrl-names = "default"; pinctrl-0 = <&led_rgb_b>; - led_rgb_b { + status_led: led_rgb_b { function = LED_FUNCTION_STATUS; color = ; gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts @@ -11,11 +11,16 @@ / { model = "Xunlong Orange Pi 5"; - compatible = "xunlong,orangepi-5", "rockchip,rk3588s"; + compatible = "xunlong,orangepi-5", "rockchip,rk3588"; aliases { mmc0 = &sdmmc; serial2 = &uart2; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; chosen { @@ -41,10 +46,9 @@ pinctrl-names = "default"; pinctrl-0 =<&leds_gpio>; - led-1 { + status_led: led-1 { gpios = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; label = "status_led"; - linux,default-trigger = "heartbeat"; }; }; --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -9,11 +9,16 @@ / { model = "Radxa ROCK 5A"; - compatible = "radxa,rock-5a", "rockchip,rk3588s"; + compatible = "radxa,rock-5a", "rockchip,rk3588"; aliases { mmc0 = &sdhci; mmc1 = &sdmmc; + + led-boot = &status_led; + led-failsafe = &status_led; + led-running = &status_led; + led-upgrade = &status_led; }; analog-sound { @@ -39,11 +44,10 @@ pinctrl-names = "default"; pinctrl-0 = <&io_led>; - io-led { + status_led: io-led { color = ; function = LED_FUNCTION_STATUS; gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; }; };