1 files changed, 85 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index c585c9b35973..76e8c359bbf8 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -29,6 +29,14 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
        { PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI   */
        { PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI   */
        { PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */
+        /* AR9285 card for Asus */
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x002B,
+                         PCI_VENDOR_ID_AZWAVE,
+                         0x2C37),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
        { PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */
        { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
        { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
@@ -40,29 +48,101 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
                         0x0032,
                         PCI_VENDOR_ID_AZWAVE,
                         0x2086),
-          .driver_data = ATH9K_PCI_CUS198 },
+          .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                         0x0032,
                         PCI_VENDOR_ID_AZWAVE,
                         0x1237),
-          .driver_data = ATH9K_PCI_CUS198 },
+          .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                         0x0032,
                         PCI_VENDOR_ID_AZWAVE,
                         0x2126),
-          .driver_data = ATH9K_PCI_CUS198 },
+          .driver_data = ATH9K_PCI_CUS198 | ATH9K_PCI_BT_ANT_DIV },
        /* PCI-E CUS230 */
        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                         0x0032,
                         PCI_VENDOR_ID_AZWAVE,
                         0x2152),
-          .driver_data = ATH9K_PCI_CUS230 },
+          .driver_data = ATH9K_PCI_CUS230 | ATH9K_PCI_BT_ANT_DIV },
        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
                         0x0032,
                         PCI_VENDOR_ID_FOXCONN,
                         0xE075),
-          .driver_data = ATH9K_PCI_CUS230 },
+          .driver_data = ATH9K_PCI_CUS230 | ATH9K_PCI_BT_ANT_DIV },
+        /* WB225 */
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_ATHEROS,
+                         0x3119),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_ATHEROS,
+                         0x3122),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x185F, /* WNC */
+                         0x3119),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         0x185F, /* WNC */
+                         0x3027),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0x4105),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0x4106),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0x410D),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0x410E),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0x410F),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0xC706),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0xC680),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_SAMSUNG,
+                         0xC708),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_LENOVO,
+                         0x3218),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
+                         0x0032,
+                         PCI_VENDOR_ID_LENOVO,
+                         0x3219),
+          .driver_data = ATH9K_PCI_BT_ANT_DIV },
        { 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 c585c9b35973..76e8c359bbf8 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -29,6 +29,14 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
29	{ PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */	29	{ PCI_VDEVICE(ATHEROS, 0x0027) }, /* PCI */
30	{ PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */	30	{ PCI_VDEVICE(ATHEROS, 0x0029) }, /* PCI */
31	{ PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */	31	{ PCI_VDEVICE(ATHEROS, 0x002A) }, /* PCI-E */
		32
		33	/* AR9285 card for Asus */
		34	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		35	0x002B,
		36	PCI_VENDOR_ID_AZWAVE,
		37	0x2C37),
		38	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		39
32	{ PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */	40	{ PCI_VDEVICE(ATHEROS, 0x002B) }, /* PCI-E */
33	{ PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */	41	{ PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
34	{ PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */	42	{ PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI */
@@ -40,29 +48,101 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
40	0x0032,	48	0x0032,
41	PCI_VENDOR_ID_AZWAVE,	49	PCI_VENDOR_ID_AZWAVE,
42	0x2086),	50	0x2086),
43	.driver_data = ATH9K_PCI_CUS198 },	51	.driver_data = ATH9K_PCI_CUS198 \| ATH9K_PCI_BT_ANT_DIV },
44	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,	52	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
45	0x0032,	53	0x0032,
46	PCI_VENDOR_ID_AZWAVE,	54	PCI_VENDOR_ID_AZWAVE,
47	0x1237),	55	0x1237),
48	.driver_data = ATH9K_PCI_CUS198 },	56	.driver_data = ATH9K_PCI_CUS198 \| ATH9K_PCI_BT_ANT_DIV },
49	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,	57	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
50	0x0032,	58	0x0032,
51	PCI_VENDOR_ID_AZWAVE,	59	PCI_VENDOR_ID_AZWAVE,
52	0x2126),	60	0x2126),
53	.driver_data = ATH9K_PCI_CUS198 },	61	.driver_data = ATH9K_PCI_CUS198 \| ATH9K_PCI_BT_ANT_DIV },
54		62
55	/* PCI-E CUS230 */	63	/* PCI-E CUS230 */
56	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,	64	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
57	0x0032,	65	0x0032,
58	PCI_VENDOR_ID_AZWAVE,	66	PCI_VENDOR_ID_AZWAVE,
59	0x2152),	67	0x2152),
60	.driver_data = ATH9K_PCI_CUS230 },	68	.driver_data = ATH9K_PCI_CUS230 \| ATH9K_PCI_BT_ANT_DIV },
61	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,	69	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
62	0x0032,	70	0x0032,
63	PCI_VENDOR_ID_FOXCONN,	71	PCI_VENDOR_ID_FOXCONN,
64	0xE075),	72	0xE075),
65	.driver_data = ATH9K_PCI_CUS230 },	73	.driver_data = ATH9K_PCI_CUS230 \| ATH9K_PCI_BT_ANT_DIV },
		74
		75	/* WB225 */
		76	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		77	0x0032,
		78	PCI_VENDOR_ID_ATHEROS,
		79	0x3119),
		80	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		81	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		82	0x0032,
		83	PCI_VENDOR_ID_ATHEROS,
		84	0x3122),
		85	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		86	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		87	0x0032,
		88	0x185F, /* WNC */
		89	0x3119),
		90	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		91	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		92	0x0032,
		93	0x185F, /* WNC */
		94	0x3027),
		95	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		96	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		97	0x0032,
		98	PCI_VENDOR_ID_SAMSUNG,
		99	0x4105),
		100	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		101	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		102	0x0032,
		103	PCI_VENDOR_ID_SAMSUNG,
		104	0x4106),
		105	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		106	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		107	0x0032,
		108	PCI_VENDOR_ID_SAMSUNG,
		109	0x410D),
		110	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		111	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		112	0x0032,
		113	PCI_VENDOR_ID_SAMSUNG,
		114	0x410E),
		115	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		116	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		117	0x0032,
		118	PCI_VENDOR_ID_SAMSUNG,
		119	0x410F),
		120	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		121	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		122	0x0032,
		123	PCI_VENDOR_ID_SAMSUNG,
		124	0xC706),
		125	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		126	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		127	0x0032,
		128	PCI_VENDOR_ID_SAMSUNG,
		129	0xC680),
		130	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		131	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		132	0x0032,
		133	PCI_VENDOR_ID_SAMSUNG,
		134	0xC708),
		135	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		136	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		137	0x0032,
		138	PCI_VENDOR_ID_LENOVO,
		139	0x3218),
		140	.driver_data = ATH9K_PCI_BT_ANT_DIV },
		141	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
		142	0x0032,
		143	PCI_VENDOR_ID_LENOVO,
		144	0x3219),
		145	.driver_data = ATH9K_PCI_BT_ANT_DIV },
66		146
67	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */	147	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E AR9485 */
68	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */	148	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E AR9580 */