Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c36254c authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Update WB335 PCI IDs 



* Add new AR9565 1.0/1.0.1/1.1 IDs
* Change Dell/Lenovo/Samsung cards to 2-Antenna with diversity.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b58df446

drivers/net/wireless/ath/ath9k/pci.c

+82 −19
Original line number Diff line number Diff line
@@ -409,6 +409,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 0x11AD, /* LITEON */

			 0x0632),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */

			 0x06B2),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */

			 0x0842),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */
@@ -424,6 +434,16 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 0x1B9A, /* XAVI */

			 0x2812),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x1B9A, /* XAVI */

			 0x28A1),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_AZWAVE,

			 0x218A),

	  .driver_data = ATH9K_PCI_AR9565_1ANT },



	/* WB335 1-ANT / Antenna Diversity */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,
@@ -469,22 +489,17 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */

			 0x0682),

			 0x06A2),

	  .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),

			 0x11AD, /* LITEON */

			 0x0682),

	  .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_LENOVO,

			 0x4026),

			 PCI_VENDOR_ID_AZWAVE,

			 0x213A),

	  .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,
@@ -504,37 +519,35 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_DELL,

			 0x020E),

			 0x020C),

	  .driver_data = ATH9K_PCI_AR9565_1ANT | ATH9K_PCI_BT_ANT_DIV },



	/* WB335 2-ANT */

	/* WB335 2-ANT / Antenna-Diversity */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_SAMSUNG,

			 0x411A),

	  .driver_data = ATH9K_PCI_AR9565_2ANT },

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_SAMSUNG,

			 0x411B),

	  .driver_data = ATH9K_PCI_AR9565_2ANT },

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_SAMSUNG,

			 0x411C),

	  .driver_data = ATH9K_PCI_AR9565_2ANT },

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_SAMSUNG,

			 0x411D),

	  .driver_data = ATH9K_PCI_AR9565_2ANT },

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_SAMSUNG,

			 0x411E),

	  .driver_data = ATH9K_PCI_AR9565_2ANT },



	/* WB335 2-ANT / Antenna-Diversity */

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_ATHEROS,
@@ -560,11 +573,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 0x11AD, /* LITEON */

			 0x0612),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */

			 0x0832),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x11AD, /* LITEON */

			 0x0692),

	  .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,

			 PCI_VENDOR_ID_AZWAVE,

			 0x213B),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_AZWAVE,

			 0x2182),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x144F, /* ASKEY */
@@ -575,6 +608,11 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 0x1B9A, /* XAVI */

			 0x2810),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x1B9A, /* XAVI */

			 0x28A2),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 0x185F, /* WNC */
@@ -590,6 +628,31 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 PCI_VENDOR_ID_FOXCONN,

			 0xE07F),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_FOXCONN,

			 0xE081),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_LENOVO,

			 0x3026),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_LENOVO,

			 0x4026),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_ASUSTEK,

			 0x85F2),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0036,

			 PCI_VENDOR_ID_DELL,

			 0x020E),

	  .driver_data = ATH9K_PCI_AR9565_2ANT | ATH9K_PCI_BT_ANT_DIV },



	/* PCI-E AR9565 (WB335) */

	{ PCI_VDEVICE(ATHEROS, 0x0036),