1 files changed, 87 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 7e4c2524b630..b5656fce4ff5 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -195,6 +195,93 @@ 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 */

diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 7e4c2524b630..b5656fce4ff5 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -195,6 +195,93 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
195	0x3219),	195	0x3219),
196	.driver_data = ATH9K_PCI_BT_ANT_DIV },	196	.driver_data = ATH9K_PCI_BT_ANT_DIV },
197		197
		198	/* AR9485 cards with PLL power-save disabled by default. */
		199	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		200	0x0032,
		201	PCI_VENDOR_ID_AZWAVE,
		202	0x2C97),
		203	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		204	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		205	0x0032,
		206	PCI_VENDOR_ID_AZWAVE,
		207	0x2100),
		208	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		209	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		210	0x0032,
		211	0x1C56, /* ASKEY */
		212	0x4001),
		213	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		214	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		215	0x0032,
		216	0x11AD, /* LITEON */
		217	0x6627),
		218	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		219	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		220	0x0032,
		221	0x11AD, /* LITEON */
		222	0x6628),
		223	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		224	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		225	0x0032,
		226	PCI_VENDOR_ID_FOXCONN,
		227	0xE04E),
		228	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		229	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		230	0x0032,
		231	PCI_VENDOR_ID_FOXCONN,
		232	0xE04F),
		233	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		234	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		235	0x0032,
		236	0x144F, /* ASKEY */
		237	0x7197),
		238	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		239	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		240	0x0032,
		241	0x1B9A, /* XAVI */
		242	0x2000),
		243	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		244	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		245	0x0032,
		246	0x1B9A, /* XAVI */
		247	0x2001),
		248	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		249	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		250	0x0032,
		251	PCI_VENDOR_ID_AZWAVE,
		252	0x1186),
		253	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		254	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		255	0x0032,
		256	PCI_VENDOR_ID_AZWAVE,
		257	0x1F86),
		258	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		259	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		260	0x0032,
		261	PCI_VENDOR_ID_AZWAVE,
		262	0x1195),
		263	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		264	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		265	0x0032,
		266	PCI_VENDOR_ID_AZWAVE,
		267	0x1F95),
		268	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		269	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		270	0x0032,
		271	0x1B9A, /* XAVI */
		272	0x1C00),
		273	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		274	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		275	0x0032,
		276	0x1B9A, /* XAVI */
		277	0x1C01),
		278	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		279	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		280	0x0032,
		281	PCI_VENDOR_ID_ASUSTEK,
		282	0x850D),
		283	.driver_data = ATH9K_PCI_NO_PLL_PWRSAVE },
		284
198	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */	285	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */
199	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */	286	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */
200		287