diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/net/wireless/ath/ath9k/pci.c | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/pci.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 282 |
1 files changed, 1 insertions, 281 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index b5656fc..d089a7c 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -195,93 +195,6 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 0x3219), .driver_data = ATH9K_PCI_BT_ANT_DIV }, - /* AR9485 cards with PLL power-save disabled by default. */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x2C97), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x2100), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x1C56, /* ASKEY */ - 0x4001), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x11AD, /* LITEON */ - 0x6627), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x11AD, /* LITEON */ - 0x6628), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_FOXCONN, - 0xE04E), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_FOXCONN, - 0xE04F), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x144F, /* ASKEY */ - 0x7197), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x1B9A, /* XAVI */ - 0x2000), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x1B9A, /* XAVI */ - 0x2001), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x1186), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x1F86), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x1195), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_AZWAVE, - 0x1F95), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x1B9A, /* XAVI */ - 0x1C00), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - 0x1B9A, /* XAVI */ - 0x1C01), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0032, - PCI_VENDOR_ID_ASUSTEK, - 0x850D), - .driver_data = ATH9K_PCI_NO_PLL_PWRSAVE }, - { PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */ { PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */ @@ -356,200 +269,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { { PCI_VDEVICE(ATHEROS, 0x0034) }, /* PCI-E AR9462 */ { PCI_VDEVICE(ATHEROS, 0x0037) }, /* PCI-E AR1111/AR9485 */ - - /* CUS252 */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x3028), - .driver_data = ATH9K_PCI_CUS252 | - ATH9K_PCI_AR9565_2ANT | - ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_AZWAVE, - 0x2176), - .driver_data = ATH9K_PCI_CUS252 | - ATH9K_PCI_AR9565_2ANT | - ATH9K_PCI_BT_ANT_DIV }, - - /* WB335 1-ANT */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_FOXCONN, - 0xE068), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x185F, /* WNC */ - 0xA119), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0632), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x6671), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x1B9A, /* XAVI */ - 0x2811), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x1B9A, /* XAVI */ - 0x2812), - .driver_data = ATH9K_PCI_AR9565_1ANT }, - - /* WB335 1-ANT / Antenna Diversity */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x3025), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x3026), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x302B), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_FOXCONN, - 0xE069), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x185F, /* WNC */ - 0x3028), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0622), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0672), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0662), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_AZWAVE, - 0x213A), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_LENOVO, - 0x3026), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_HP, - 0x18E3), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_HP, - 0x217F), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_DELL, - 0x020E), - .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV }, - - /* WB335 2-ANT */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_SAMSUNG, - 0x411A), - .driver_data = ATH9K_PCI_AR9565_2ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_SAMSUNG, - 0x411B), - .driver_data = ATH9K_PCI_AR9565_2ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_SAMSUNG, - 0x411C), - .driver_data = ATH9K_PCI_AR9565_2ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_SAMSUNG, - 0x411D), - .driver_data = ATH9K_PCI_AR9565_2ANT }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_SAMSUNG, - 0x411E), - .driver_data = ATH9K_PCI_AR9565_2ANT }, - - /* WB335 2-ANT / Antenna-Diversity */ - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x3027), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_ATHEROS, - 0x302C), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0642), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0652), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x11AD, /* LITEON */ - 0x0612), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - PCI_VENDOR_ID_AZWAVE, - 0x2130), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x144F, /* ASKEY */ - 0x7202), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x1B9A, /* XAVI */ - 0x2810), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS, - 0x0036, - 0x185F, /* WNC */ - 0x3027), - .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV }, - - /* PCI-E AR9565 (WB335) */ - { PCI_VDEVICE(ATHEROS, 0x0036), - .driver_data = ATH9K_PCI_BT_ANT_DIV }, - + { PCI_VDEVICE(ATHEROS, 0x0036) }, /* PCI-E AR9565 */ { 0 } }; |