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

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

ath9k: Modify IDs to identify CUS230 



CUS198 and CUS230 are similar cards, both
are AR9485 + xLNA solutions. But, the subsystem IDs
differ - identify CUS230 explicitly to make things
clearer.

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

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -632,6 +632,7 @@ void ath_ant_comb_update(struct ath_softc *sc); 
/********************/

/********************/





#define ATH9K_PCI_CUS198 0x0001

#define ATH9K_PCI_CUS198 0x0001

#define ATH9K_PCI_CUS230 0x0002





/*

/*

 * Default cache line size, in bytes.

 * Default cache line size, in bytes.

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -521,11 +521,14 @@ static void ath9k_init_platform(struct ath_softc *sc) 
	if (common->bus_ops->ath_bus_type != ATH_PCI)

	if (common->bus_ops->ath_bus_type != ATH_PCI)

		return;

		return;





	if (sc->driver_data & ATH9K_PCI_CUS198) {

	if (sc->driver_data & (ATH9K_PCI_CUS198 |

			       ATH9K_PCI_CUS230)) {

		ah->config.xlna_gpio = 9;

		ah->config.xlna_gpio = 9;

		ah->config.xatten_margin_cfg = true;

		ah->config.xatten_margin_cfg = true;





		ath_info(common, "Set parameters for CUS198\n");

		ath_info(common, "Set parameters for %s\n",

			 (sc->driver_data & ATH9K_PCI_CUS198) ?

			 "CUS198" : "CUS230");

	}

	}

}

}

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -51,16 +51,18 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
			 PCI_VENDOR_ID_AZWAVE,

			 PCI_VENDOR_ID_AZWAVE,

			 0x2126),

			 0x2126),

	  .driver_data = ATH9K_PCI_CUS198 },

	  .driver_data = ATH9K_PCI_CUS198 },



	/* PCI-E CUS230 */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0032,

			 0x0032,

			 PCI_VENDOR_ID_AZWAVE,

			 PCI_VENDOR_ID_AZWAVE,

			 0x2152),

			 0x2152),

	  .driver_data = ATH9K_PCI_CUS198 },

	  .driver_data = ATH9K_PCI_CUS230 },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_ATHEROS,

			 0x0032,

			 0x0032,

			 PCI_VENDOR_ID_FOXCONN,

			 PCI_VENDOR_ID_FOXCONN,

			 0xE075),

			 0xE075),

	  .driver_data = ATH9K_PCI_CUS198 },

	  .driver_data = ATH9K_PCI_CUS230 },





	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E  AR9485 */

	{ PCI_VDEVICE(ATHEROS, 0x0032) }, /* PCI-E  AR9485 */

	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E  AR9580 */

	{ PCI_VDEVICE(ATHEROS, 0x0033) }, /* PCI-E  AR9580 */