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 <dev@kresin.me>
(backported from 56e6ebdea42aab76d6ef54e0296c6bf946956684)

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 df0915c651c364467c10e5be2dddab946b117ab5..f7ef65252969e1647f69ed0012731054da9702dc 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
@@ -299,9 +299,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"
@@ -333,9 +330,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"
        ;;
@@ -360,11 +354,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 0223b7cd584ebe2faa21c4f474c40e29e4cc7dec..89a688bfee63d94aa0113856391ad6170a5fe7ac 100644 (file)
--- 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 9fe0ea3b6a351538e68c91e1bde1ce5a5eb62b18..1aebc1b7f6e87032710015d7619546792f7b485b 100644 (file)
--- 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 f48ac1deb6351e5d0e7e95598fe762d6d596ab5a..5065b79462f541e3c4eccf8f46eb529fc4eb5acd 100644 (file)
--- 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 86b1194b7a00045fc29a88ac9252bf4af3a2d328..3278a51bf3a852502686e4d11bc431bcb1b9e059 100644 (file)
--- 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";
                };
        };
 };