diff options
author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2016-07-01 15:41:17 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-07-02 19:34:50 +0200 |
commit | 3ce71eaedd3ea25be0c8723fefc68e3f3aac7610 (patch) | |
tree | 7b80308e01d21125ccb0db9f3a8e8b61dafb7307 /package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch | |
parent | cbfeb7796e71aabc08b1f9e9f8818ba6279e2e29 (diff) | |
download | upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.gz upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.tar.bz2 upstream-3ce71eaedd3ea25be0c8723fefc68e3f3aac7610.zip |
kernel: mac80211: fold the AR9280 GPIO patch into the ath9k GPIO patch
This folds 550-ath9k_add_ar9280_gpio_chip.patch into
548-ath9k_enable_gpio_chip.patch because the former patch only extends
code which is introduced in the latter.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Diffstat (limited to 'package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch')
-rw-r--r-- | package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch b/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch deleted file mode 100644 index 22e2c66747..0000000000 --- a/package/kernel/mac80211/patches/550-ath9k_add_ar9280_gpio_chip.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> -Date: Thu, 21 Apr 2016 23:00:54 +0200 -Subject: [PATCH] mac80211: ath9k: add GPIO support for AR9280 chip - -Enable access to GPIO on Atheros wireless chip AR9280. -Support for 9280 is added to existing 9285/9287 subsystem -because these 3 chips differ only in number of GPIO pins. - -Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl> ---- ---- a/drivers/net/wireless/ath/ath9k/gpio.c -+++ b/drivers/net/wireless/ath/ath9k/gpio.c -@@ -88,11 +88,13 @@ static void ath9k_register_gpio_chip(str - struct ath9k_gpio_chip *gc; - u16 ng; - -- /* for now only AR9285 and AR9287 are recognized */ -+ /* supported chips are AR9280, AR9285 and AR9287 */ - if (AR_SREV_9287(sc->sc_ah)) - ng = AR9287_NUM_GPIO; - else if (AR_SREV_9285(sc->sc_ah)) - ng = AR9285_NUM_GPIO; -+ else if (AR_SREV_9280(sc->sc_ah)) -+ ng = AR9280_NUM_GPIO; - else - return; - |