From 56e6ebdea42aab76d6ef54e0296c6bf946956684 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sat, 18 Aug 2018 12:22:25 +0200 Subject: [PATCH] ramips: fix multi colour led handling All boards either have a multi colour led or a single lightpipe. It makes it impossible to handle the LEDs individual. Change the LED config for these boards to take it into account. Signed-off-by: Mathias Kresin --- target/linux/ramips/base-files/etc/board.d/01_leds | 11 ----------- target/linux/ramips/dts/MIWIFI-MINI.dts | 3 +++ target/linux/ramips/dts/Newifi-D1.dts | 3 +++ target/linux/ramips/dts/PSG1218A.dts | 5 ++++- target/linux/ramips/dts/PSG1218B.dts | 5 ++++- 5 files changed, 14 insertions(+), 13 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 a937cdba5ed2..0dd37a26373b 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -298,9 +298,6 @@ mir3g) ucidef_set_led_switch "lan1-amber" "LAN1 (amber)" "$boardname:amber:lan1" "switch0" "0x08" "0x08" ucidef_set_led_switch "lan2-amber" "LAN2 (amber)" "$boardname:amber:lan2" "switch0" "0x04" "0x08" ;; -miwifi-mini) - ucidef_set_led_default "power" "power" "$boardname:red:status" "1" - ;; mlw221|\ mlwg2) set_wifi_led "$boardname:blue:wifi" @@ -332,9 +329,6 @@ netgear,r6120) ucidef_set_led_wlan "wlan2g" "WiFi 2.4GHz" "$boardname:green:wlan2g" "phy0tpt" ucidef_set_led_wlan "wlan5g" "WiFi 5GHz" "$boardname:green:wlan5g" "phy1tpt" ;; -newifi-d1) - set_usb_led "$boardname:red:status" - ;; nw718) set_usb_led "$boardname:amber:usb" ;; @@ -359,11 +353,6 @@ d-team,newifi-d2) psg1208) set_wifi_led "$boardname:white:wlan2g" ;; -psg1218a|\ -psg1218b) - ucidef_set_led_netdev "Network" "Network" "$boardname:blue:status" "eth0" - ucidef_set_led_default "status" "STATUS" "$boardname:yellow:status" "0" - ;; px-4885-4M|\ px-4885-8M) set_wifi_led "px-4885:orange:wifi" diff --git a/target/linux/ramips/dts/MIWIFI-MINI.dts b/target/linux/ramips/dts/MIWIFI-MINI.dts index 0223b7cd584e..89a688bfee63 100644 --- a/target/linux/ramips/dts/MIWIFI-MINI.dts +++ b/target/linux/ramips/dts/MIWIFI-MINI.dts @@ -23,16 +23,19 @@ led_blue: blue { label = "miwifi-mini:blue:status"; gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + default-state = "on"; }; yellow { label = "miwifi-mini:yellow:status"; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; + default-state = "off"; }; red { label = "miwifi-mini:red:status"; gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; + default-state = "off"; }; }; diff --git a/target/linux/ramips/dts/Newifi-D1.dts b/target/linux/ramips/dts/Newifi-D1.dts index 9fe0ea3b6a35..1aebc1b7f6e8 100644 --- a/target/linux/ramips/dts/Newifi-D1.dts +++ b/target/linux/ramips/dts/Newifi-D1.dts @@ -28,16 +28,19 @@ status-red { label = "newifi-d1:red:status"; gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; + default-state = "off"; }; status-green { label = "newifi-d1:green:status"; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; + default-state = "off"; }; led_blue: status-blue { label = "newifi-d1:blue:status"; gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; + default-state = "on"; }; }; diff --git a/target/linux/ramips/dts/PSG1218A.dts b/target/linux/ramips/dts/PSG1218A.dts index f48ac1deb635..5065b79462f5 100644 --- a/target/linux/ramips/dts/PSG1218A.dts +++ b/target/linux/ramips/dts/PSG1218A.dts @@ -15,16 +15,19 @@ led_blue: blue { label = "psg1218a:blue:status"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + default-state = "on"; }; yellow { label = "psg1218a:yellow:status"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + default-state = "off"; }; red { label = "psg1218a:red:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + default-state = "off"; }; }; }; diff --git a/target/linux/ramips/dts/PSG1218B.dts b/target/linux/ramips/dts/PSG1218B.dts index 86b1194b7a00..3278a51bf3a8 100644 --- a/target/linux/ramips/dts/PSG1218B.dts +++ b/target/linux/ramips/dts/PSG1218B.dts @@ -15,16 +15,19 @@ led_blue: blue { label = "psg1218b:blue:status"; gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; + default-state = "on"; }; yellow { label = "psg1218b:yellow:status"; gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + default-state = "off"; }; red { label = "psg1218b:red:status"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + default-state = "off"; }; }; }; -- 2.30.2