ath9k: fix handling of the default chip pci id on ar93xx (#14886)

[openwrt.git] / package / kernel / mac80211 / patches / 513-ath9k_add_pci_ids.patch

diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
index 074c3d8..db4e6a1 100644 (file)
--- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
+++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
@@ -1,30 +1,30 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -728,6 +728,7 @@ int ath9k_hw_init(struct ath_hw *ah)
-       case AR9300_DEVID_AR9462:
-       case AR9485_DEVID_AR1111:
-       case AR9300_DEVID_AR9565:
-+      case AR9300_DEVID_AR9381:
-               break;
-       default:
-               if (common->bus_ops->ath_bus_type == ATH_USB)
+@@ -614,6 +614,7 @@ int ath9k_hw_init(struct ath_hw *ah)
+ 
+       /* These are all the AR5008/AR9001/AR9002/AR9003 hardware family of chipsets */
+       switch (ah->hw_version.devid) {
++      case AR9300_DEVID_INVALID:
+       case AR5416_DEVID_PCI:
+       case AR5416_DEVID_PCIE:
+       case AR5416_AR9100_DEVID:
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -52,6 +52,7 @@
- #define AR9300_DEVID_QCA955X  0x0038
- #define AR9485_DEVID_AR1111   0x0037
- #define AR9300_DEVID_AR9565     0x0036
-+#define AR9300_DEVID_AR9381     0xabcd
+@@ -34,6 +34,7 @@
  
- #define AR5416_AR9100_DEVID   0x000b
+ #define ATHEROS_VENDOR_ID     0x168c
  
++#define AR9300_DEVID_INVALID  0xabcd
+ #define AR5416_DEVID_PCI      0x0023
+ #define AR5416_DEVID_PCIE     0x0024
+ #define AR9160_DEVID_PCI      0x0027
 --- a/drivers/net/wireless/ath/ath9k/pci.c
 +++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -270,6 +270,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
-       { PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E  AR9462 */
-       { PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E  AR1111/AR9485 */
-       { PCI_VDEVICE(ATHEROS, 0x0036) }, /* PCI-E  AR9565 */
-+      { PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E  AR9381 */
+@@ -658,6 +658,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
+       { PCI_VDEVICE(ATHEROS, 0x0036),
+         .driver_data = ATH9K_PCI_BT_ANT_DIV },
+ 
++      { PCI_VDEVICE(ATHEROS, 0xabcd) }, /* PCI-E  internal chip default ID */
        { 0 }
  };