kirkwood: move led triggers to dts

This patch moves led trigger settings from 01_leds file to dts.

Now "linux,default-trigger" property is used.

Tested-by: Alberto Bursi <bobafetthotmail@gmail.com> [nsa310,nsa325]
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>

diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds
index bba845eae58d242793270e1df66015fa91b32d42..bbe689bbb5637daeb5183f2f49df4156dee8bf69 100755 (executable)
--- a/target/linux/kirkwood/base-files/etc/board.d/01_leds
+++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds
@@ -16,16 +16,6 @@ case "$board" in
 "linksys,viper")
        ucidef_set_led_default "pulse" "pulse" "viper:white:pulse" "1"
        ;;
-"zyxel,nsa310b")
-       ucidef_set_led_usbhost "usb" "USB" "nsa310:green:usb"
-       ucidef_set_led_ataport "hdd" "HDD" "nsa310:green:hdd" "1"
-       ucidef_set_led_ataport "esata" "eSata" "nsa310:green:esata" "2"
-       ;;
-"zyxel,nsa325")
-       ucidef_set_led_usbhost "usb" "USB" "nsa325:green:usb"
-       ucidef_set_led_ataport "hdd1" "HDD1" "nsa325:green:hdd1" "1"
-       ucidef_set_led_ataport "hdd2" "HDD2" "nsa325:green:hdd2" "2"
-       ;;
 esac
 
 board_config_flush

diff --git a/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-nsa310b.dts b/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-nsa310b.dts
index 10b119eb0175d54ae73fc01f0c74e91a5f223b83..12e51d66562c989291f9ec1a63a7c912a42aeb8d 100644 (file)
--- a/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-nsa310b.dts
+++ b/target/linux/kirkwood/files-5.4/arch/arm/boot/dts/kirkwood-nsa310b.dts
@@ -101,6 +101,7 @@
                green-hdd {
                        label = "nsa310:green:hdd";
                        gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "ata1";
                };
 
                red-hdd {
@@ -111,6 +112,7 @@
                green-esata {
                        label = "nsa310:green:esata";
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "ata2";
                };
 
                red-esata {
@@ -121,6 +123,7 @@
                green-usb {
                        label = "nsa310:green:usb";
                        gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "usb-host";
                };
 
                red-usb {

diff --git a/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch b/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch
index 36c77cd44a298f27236d6f8247907aac0b891736..374c0895a99e68577dc987d9dfcf53bb1027ab8a 100644 (file)
--- a/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch
+++ b/target/linux/kirkwood/patches-5.4/107-03-nsa325.patch
@@ -14,7 +14,7 @@
        memory {
                device_type = "memory";
                reg = <0x00000000 0x20000000>;
-@@ -162,11 +169,12 @@
+@@ -162,17 +169,19 @@
                             &pmx_led_hdd1_green &pmx_led_hdd1_red>;
                pinctrl-names = "default";
  
@@ -29,3 +29,26 @@
                        label = "nsa325:orange:sys";
                        gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
                };
+               green-hdd1 {
+                       label = "nsa325:green:hdd1";
+                       gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "ata1";
+               };
+               red-hdd1 {
+                       label = "nsa325:red:hdd1";
+@@ -181,6 +190,7 @@
+               green-hdd2 {
+                       label = "nsa325:green:hdd2";
+                       gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "ata2";
+               };
+               red-hdd2 {
+                       label = "nsa325:red:hdd2";
+@@ -189,6 +199,7 @@
+               green-usb {
+                       label = "nsa325:green:usb";
+                       gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
++                      linux,default-trigger = "usb-host";
+               };
+               green-copy {
+                       label = "nsa325:green:copy";