diff options
| author | John Crispin <blogic@openwrt.org> | 2016-04-26 07:51:58 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2016-04-26 07:51:58 +0000 |
| commit | 420cb24d41fcd650795f09d2b26e0e1d2cf21165 (patch) | |
| tree | 5909023bae0f1c4fc6b710d10c48f70f0a719978 | |
| parent | 78ee7e532ba2183f7f4747a081b9f3ca8ea618f6 (diff) | |
| download | upstream-420cb24d41fcd650795f09d2b26e0e1d2cf21165.tar.gz upstream-420cb24d41fcd650795f09d2b26e0e1d2cf21165.tar.bz2 upstream-420cb24d41fcd650795f09d2b26e0e1d2cf21165.zip | |
lantiq: Fix ath9k LED for TDW8970.
Backport of r47911, r47912, r47969 to CC.
All other required patches have already been backported in r48822.
Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49229 3c298f89-4303-0410-b956-a3cf2f4a3e73
3 files changed, 22 insertions, 1 deletions
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds index 6956d616af..5643f7f2be 100644 --- a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds +++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds @@ -30,6 +30,9 @@ BTHOMEHUBV3A) ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt" ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan" ;; +TDW8970) + ucidef_set_led_wlan "wifi" "wifi" "ath9k-phy0" "phy0tpt" + ;; VGV7510KW22) ucidef_set_led_default "power" "power" "power" "1" ucidef_set_led_default "power2" "power2" "power2" "0" diff --git a/target/linux/lantiq/dts/TDW8970.dts b/target/linux/lantiq/dts/TDW8970.dts index d8dcb5d836..cb4d88b160 100644 --- a/target/linux/lantiq/dts/TDW8970.dts +++ b/target/linux/lantiq/dts/TDW8970.dts @@ -202,6 +202,8 @@ ath,mac-offset = <0xf100>; ath,mac-increment; ath,led-pin = <0>; + ath,disable-5ghz; + ath,led-active-high; }; gpio-keys-polled { diff --git a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch index 04c2071f32..9198fe580a 100644 --- a/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch +++ b/target/linux/lantiq/patches-3.18/0035-owrt-lantiq-wifi-and-ethernet-eeprom-handling.patch @@ -51,13 +51,14 @@ Signed-off-by: John Crispin <blogic@openwrt.org> obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o --- /dev/null +++ b/arch/mips/lantiq/xway/ath_eep.c -@@ -0,0 +1,282 @@ +@@ -0,0 +1,298 @@ +/* + * Copyright (C) 2011 Luca Olivetti <luca@ventoso.org> + * Copyright (C) 2011 John Crispin <blogic@openwrt.org> + * Copyright (C) 2011 Andrej Vlašić <andrej.vlasic0@gmail.com> + * Copyright (C) 2013 Álvaro Fernández Rojas <noltari@gmail.com> + * Copyright (C) 2013 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> ++ * Copyright (C) 2015 Vittorio Gambaletta <openwrt@vittgam.net> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -192,6 +193,21 @@ Signed-off-by: John Crispin <blogic@openwrt.org> + dev_info(&pdev->dev, "using led pin %d.\n", led_pin); + } + ++ if (of_property_read_bool(np, "ath,led-active-high")) { ++ ath9k_pdata.led_active_high = true; ++ dev_info(&pdev->dev, "inverted LED polarity\n"); ++ } ++ ++ if (of_property_read_bool(np, "ath,disable-2ghz")) { ++ ath9k_pdata.disable_2ghz = true; ++ dev_info(&pdev->dev, "disabled 2.4 GHz band\n"); ++ } ++ ++ if (of_property_read_bool(np, "ath,disable-5ghz")) { ++ ath9k_pdata.disable_5ghz = true; ++ dev_info(&pdev->dev, "disabled 5 GHz band\n"); ++ } ++ + dev_info(&pdev->dev, "loaded ath9k eeprom\n"); + + return 0; |