aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-08-18 11:38:13 +0200
committerMathias Kresin <dev@kresin.me>2018-08-29 09:34:07 +0200
commit99045dfc5989e732f671de5d145532f0fe8c0ce1 (patch)
treeda007e85e6638b5eb713e07c14fceef532c80f22
parent111907e8d319eb05e7a5ef7a0cc6ec55cb069242 (diff)
downloadupstream-99045dfc5989e732f671de5d145532f0fe8c0ce1.tar.gz
upstream-99045dfc5989e732f671de5d145532f0fe8c0ce1.tar.bz2
upstream-99045dfc5989e732f671de5d145532f0fe8c0ce1.zip
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 <dev@kresin.me>
-rwxr-xr-xtarget/linux/ramips/base-files/etc/board.d/01_leds6
-rw-r--r--target/linux/ramips/dts/DCH-M225.dts2
-rw-r--r--target/linux/ramips/dts/DIR-615-D.dts2
-rw-r--r--target/linux/ramips/dts/DIR-615-H1.dts2
-rw-r--r--target/linux/ramips/dts/HPM.dts2
-rw-r--r--target/linux/ramips/dts/PBR-M1.dts7
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 6da04ea9b1..c92712c453 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|\
@@ -228,7 +224,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"
;;
@@ -314,7 +309,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>;
};