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

Commit 33e6f816 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: PA type for 6000g2 series 



For 6000g2 series of NICs, PA type is determined by uCode, driver do not
have to set the register for internal/external PA. It is a workaround
just for 6000 series NICs.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 17802211

drivers/net/wireless/iwlwifi/iwl-6000.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static const struct iwl_ops iwl6050_ops = { 
/*

 * "i": Internal configuration, use internal Power Amplifier

 */

struct iwl_cfg iwl6000g2i_2agn_cfg = {

struct iwl_cfg iwl6000g2_2agn_cfg = {

	.name = "6000 Series 2x2 AGN Gen2",

	.fw_name_pre = IWL6000G2_FW_PRE,

	.ucode_api_max = IWL6000G2_UCODE_API_MAX,
@@ -397,7 +397,7 @@ struct iwl_cfg iwl6000g2i_2agn_cfg = { 
	.pll_cfg_val = 0,

	.set_l0s = true,

	.use_bsm = false,

	.pa_type = IWL_PA_INTERNAL,

	.pa_type = IWL_PA_SYSTEM,

	.max_ll_items = OTP_MAX_LL_ITEMS_6x00,

	.shadow_ram_support = true,

	.ht_greenfield_support = true,

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −4
Original line number Diff line number Diff line
@@ -3798,10 +3798,10 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x4239, 0x1316, iwl6000i_2abg_cfg)},



/* 6x00 Series Gen2 */

	{IWL_PCI_DEVICE(0x0082, 0x1201, iwl6000g2i_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1301, iwl6000g2i_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1321, iwl6000g2i_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0085, 0x1311, iwl6000g2i_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1201, iwl6000g2_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1301, iwl6000g2_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0082, 0x1321, iwl6000g2_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0085, 0x1311, iwl6000g2_2agn_cfg)},



/* 6x50 WiFi/WiMax Series */

	{IWL_PCI_DEVICE(0x0087, 0x1301, iwl6050_2agn_cfg)},

drivers/net/wireless/iwlwifi/iwl-dev.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ extern struct iwl_cfg iwl5100_abg_cfg; 
extern struct iwl_cfg iwl5150_agn_cfg;

extern struct iwl_cfg iwl5150_abg_cfg;

extern struct iwl_cfg iwl6000i_2agn_cfg;

extern struct iwl_cfg iwl6000g2i_2agn_cfg;

extern struct iwl_cfg iwl6000g2_2agn_cfg;

extern struct iwl_cfg iwl6000i_2abg_cfg;

extern struct iwl_cfg iwl6000i_2bg_cfg;

extern struct iwl_cfg iwl6000_3agn_cfg;