ath79: fix LEDs for D-Link DIR-842

The device has a total of 8 LEDs, 5 of which are controlled by the switch
(LAN 1-4, WAN). Only power, wifi and wps are controlled by the SoC.

 * led_power is on GPIO 5 (not 15), boot flashing sequence is now visible
 * remove led 'internet', since it is only connected to the switch
 * remove ucidef_set_led_switch for WAN from 01_leds, as it has no effect

Tested on revisions C1 and C3.

Signed-off-by: Sebastian Schaper <openwrt@sebastianschaper.net>
[adjust commit title]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
index 4df4e8a96903edf293fcf61765a9dc6c4b580cff..444034ed5f50cf391b4d475a0f8516a95cc5f90b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts
@@ -17,19 +17,14 @@
        leds {
                compatible = "gpio-leds";
 
-               wps {
-                       label = "dir-842-c1:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
                led_power: power {
                        label = "dir-842-c1:green:power";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
-               internet {
-                       label = "dir-842-c1:green:internet";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+               wps {
+                       label = "dir-842-c1:green:wps";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wlan {

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
index b86ea29a993c5ebb00e5f9c875dfa84ec6fa25a9..56485a287c51a02988fc2ca1967cfd8c10a0df96 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts
@@ -17,19 +17,14 @@
        leds {
                compatible = "gpio-leds";
 
-               wps {
-                       label = "dir-842-c2:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
                led_power: power {
                        label = "dir-842-c2:green:power";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
-               internet {
-                       label = "dir-842-c2:green:internet";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+               wps {
+                       label = "dir-842-c2:green:wps";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wlan {

diff --git a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
index 205fd8f60e745164ed499989ff4c1e42affc97b4..d1467ab5fe166c2d949bb81a47c3835ecf08108b 100644 (file)
--- a/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
+++ b/target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts
@@ -17,19 +17,14 @@
        leds {
                compatible = "gpio-leds";
 
-               wps {
-                       label = "dir-842-c3:green:wps";
-                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-               };
-
                led_power: power {
                        label = "dir-842-c3:green:power";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
                };
 
-               internet {
-                       label = "dir-842-c3:green:internet";
-                       gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+               wps {
+                       label = "dir-842-c3:green:wps";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                };
 
                wlan {

diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
index 4774d5daf294ab7d5589e1df5cfe350315b57b53..90adc3a97f9201ed310f32ec5634c0a91873d14e 100755 (executable)
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -102,9 +102,6 @@ enterasys,ws-ap3705i)
 devolo,magic-2-wifi)
        ucidef_set_led_netdev "plcw" "dLAN" "devolo:white:dlan" "eth0.1" "rx"
        ;;
-dlink,dir-842-c1|\
-dlink,dir-842-c2|\
-dlink,dir-842-c3|\
 dlink,dir-859-a1)
        ucidef_set_led_switch "internet" "WAN" "$boardname:green:internet" "switch0" "0x20"
        ;;