From 6ce1e299be13800dbc49821b1faad5e934b91f09 Mon Sep 17 00:00:00 2001 From: Sebastian Schaper Date: Tue, 19 May 2020 12:34:53 +0200 Subject: [PATCH] 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 [adjust commit title] Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9563_dlink_dir-842-c1.dts | 13 ++++--------- target/linux/ath79/dts/qca9563_dlink_dir-842-c2.dts | 13 ++++--------- target/linux/ath79/dts/qca9563_dlink_dir-842-c3.dts | 13 ++++--------- .../ath79/generic/base-files/etc/board.d/01_leds | 3 --- 4 files changed, 12 insertions(+), 30 deletions(-) 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 4df4e8a969..444034ed5f 100644 --- 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 b86ea29a99..56485a287c 100644 --- 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 205fd8f60e..d1467ab5fe 100644 --- 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 4774d5daf2..90adc3a97f 100755 --- 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" ;;