From e9eded257bedb4f91e656a655e8ea457a7f4f51e Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 18 Aug 2018 11:38:13 +0200 Subject: [PATCH] ramips: express diag led handling via devicetree Use the default-state property to express the desired led handling in the devicetree source file instead of the userspace. Signed-off-by: Mathias Kresin (backported from 99045dfc5989e732f671de5d145532f0fe8c0ce1) --- target/linux/ramips/base-files/etc/board.d/01_leds | 6 ------ target/linux/ramips/dts/DCH-M225.dts | 2 ++ target/linux/ramips/dts/DIR-615-D.dts | 2 ++ target/linux/ramips/dts/DIR-615-H1.dts | 2 ++ target/linux/ramips/dts/HPM.dts | 2 ++ target/linux/ramips/dts/PBR-M1.dts | 7 ++++--- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 7e88689417..267aa99ec9 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -117,9 +117,6 @@ d240) set_wifi_led "$boardname:blue:wifi" set_usb_led "$boardname:blue:usb" ;; -dch-m225) - ucidef_set_led_default "status" "STATUS" "$board:red:status" "0" - ;; dcs-930l-b1) ucidef_set_led_netdev "wifi" "WiFi" "$boardname:blue:wps" ;; @@ -143,7 +140,6 @@ wt1520-8M) ;; dir-615-d|\ dir-615-h1) - ucidef_set_led_default "status" "Status LED (amber)" "$boardname:amber:status" "0" set_wifi_led "rt2800pci-phy0::radio" ;; dir-620-d1|\ @@ -229,7 +225,6 @@ hiwifi,hc5861b) set_wifi_led "$boardname:green:wlan2g" ;; hpm) - ucidef_set_led_default "power" "POWER" "$boardname:orange:power" "1" ucidef_set_led_netdev "eth" "ETH" "$boardname:green:eth" "eth0" set_wifi_led "$boardname:green:wifi" ;; @@ -315,7 +310,6 @@ pbr-d1) ;; pbr-m1) ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "eth0.2" - ucidef_set_led_default "sys" "sys" "$boardname:blue:sys" "1" ;; d-team,newifi-d2) set_usb_led "$boardname:blue:usb" diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts index 1e32c6d194..b218436929 100644 --- a/target/linux/ramips/dts/DCH-M225.dts +++ b/target/linux/ramips/dts/DCH-M225.dts @@ -36,11 +36,13 @@ led_power: power { label = "dch-m225:green:power"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + default-state = "on"; }; status { label = "dch-m225:red:status"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + default-state = "off"; }; }; diff --git a/target/linux/ramips/dts/DIR-615-D.dts b/target/linux/ramips/dts/DIR-615-D.dts index 7931a26fa3..b59ff3c7c2 100644 --- a/target/linux/ramips/dts/DIR-615-D.dts +++ b/target/linux/ramips/dts/DIR-615-D.dts @@ -72,11 +72,13 @@ status { label = "dir-615-d:amber:status"; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; + default-state = "off"; }; led_status_green: status2 { label = "dir-615-d:green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; + default-state = "on"; }; wan { diff --git a/target/linux/ramips/dts/DIR-615-H1.dts b/target/linux/ramips/dts/DIR-615-H1.dts index 4bfeb951e5..cbc3dadb74 100644 --- a/target/linux/ramips/dts/DIR-615-H1.dts +++ b/target/linux/ramips/dts/DIR-615-H1.dts @@ -19,11 +19,13 @@ status { label = "dir-615-h1:amber:status"; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + default-state = "off"; }; led_status_green: status2 { label = "dir-615-h1:green:status"; gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + default-state = "on"; }; wan { diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts index 3a262f2b91..9d50697d88 100644 --- a/target/linux/ramips/dts/HPM.dts +++ b/target/linux/ramips/dts/HPM.dts @@ -34,11 +34,13 @@ power { label = "hpm:orange:power"; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; + default-state = "on"; }; led_status: status { label = "hpm:green:status"; gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; + default-state = "on"; }; eth { diff --git a/target/linux/ramips/dts/PBR-M1.dts b/target/linux/ramips/dts/PBR-M1.dts index 39960481f0..537e5f208f 100644 --- a/target/linux/ramips/dts/PBR-M1.dts +++ b/target/linux/ramips/dts/PBR-M1.dts @@ -10,7 +10,7 @@ model = "PBR-M1"; aliases { - led-status = &led_power; + led-status = &led_sys; }; memory@0 { @@ -37,12 +37,13 @@ gpio-leds { compatible = "gpio-leds"; - led_power: power { + power { label = "pbr-m1:blue:power"; gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; + default-state = "on"; }; - sys { + led_sys: sys { label = "pbr-m1:blue:sys"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; }; -- 2.30.2