Commit b4ed221d authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: new 105 series device 



Correction for new 105 series devices

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent d2690c0d

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

+29 −29
Original line number Original line Diff line number Diff line
@@ -51,12 +51,12 @@ 
/* Highest firmware API version supported */

/* Highest firmware API version supported */

#define IWL2030_UCODE_API_MAX 5

#define IWL2030_UCODE_API_MAX 5

#define IWL2000_UCODE_API_MAX 5

#define IWL2000_UCODE_API_MAX 5

#define IWL200_UCODE_API_MAX 5

#define IWL105_UCODE_API_MAX 5





/* Lowest firmware API version supported */

/* Lowest firmware API version supported */

#define IWL2030_UCODE_API_MIN 5

#define IWL2030_UCODE_API_MIN 5

#define IWL2000_UCODE_API_MIN 5

#define IWL2000_UCODE_API_MIN 5

#define IWL200_UCODE_API_MIN 5

#define IWL105_UCODE_API_MIN 5





#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode"
@@ -64,8 +64,8 @@ 
#define IWL2000_FW_PRE "iwlwifi-2000-"

#define IWL2000_FW_PRE "iwlwifi-2000-"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode"





#define IWL200_FW_PRE "iwlwifi-200-"

#define IWL105_FW_PRE "iwlwifi-105-"

#define IWL200_MODULE_FIRMWARE(api) IWL200_FW_PRE #api ".ucode"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE #api ".ucode"





static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

{
@@ -312,13 +312,13 @@ static const struct iwl_ops iwl2030_ops = { 
	.utils = &iwlagn_hcmd_utils,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl200_ops = {

static const struct iwl_ops iwl105_ops = {

	.lib = &iwl2000_lib,

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.utils = &iwlagn_hcmd_utils,

};

};





static const struct iwl_ops iwl230_ops = {

static const struct iwl_ops iwl135_ops = {

	.lib = &iwl2000_lib,

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.utils = &iwlagn_hcmd_utils,
@@ -429,13 +429,13 @@ struct iwl_cfg iwl2030_2bg_cfg = { 
	IWL_DEVICE_2030,

	IWL_DEVICE_2030,

};

};





#define IWL_DEVICE_200						\

#define IWL_DEVICE_105						\

	.fw_name_pre = IWL200_FW_PRE,				\

	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL200_UCODE_API_MAX,			\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_min = IWL200_UCODE_API_MIN,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl200_ops,					\

	.ops = &iwl105_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2000_base_params,			\

	.base_params = &iwl2000_base_params,			\

	.need_dc_calib = true,					\

	.need_dc_calib = true,					\
@@ -444,24 +444,24 @@ struct iwl_cfg iwl2030_2bg_cfg = { 
	.adv_pm = true,						\

	.adv_pm = true,						\

	.rx_with_siso_diversity = true				\

	.rx_with_siso_diversity = true				\





struct iwl_cfg iwl200_bg_cfg = {

struct iwl_cfg iwl105_bg_cfg = {

	.name = "200 Series 1x1 BG",

	.name = "105 Series 1x1 BG",

	IWL_DEVICE_200,

	IWL_DEVICE_105,

};

};





struct iwl_cfg iwl200_bgn_cfg = {

struct iwl_cfg iwl105_bgn_cfg = {

	.name = "200 Series 1x1 BGN",

	.name = "105 Series 1x1 BGN",

	IWL_DEVICE_200,

	IWL_DEVICE_105,

	.ht_params = &iwl2000_ht_params,

	.ht_params = &iwl2000_ht_params,

};

};





#define IWL_DEVICE_230						\

#define IWL_DEVICE_135						\

	.fw_name_pre = IWL200_FW_PRE,				\

	.fw_name_pre = IWL105_FW_PRE,				\

	.ucode_api_max = IWL200_UCODE_API_MAX,			\

	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_min = IWL200_UCODE_API_MIN,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.ops = &iwl230_ops,					\

	.ops = &iwl135_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2030_base_params,			\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.bt_params = &iwl2030_bt_params,			\
@@ -471,17 +471,17 @@ struct iwl_cfg iwl200_bgn_cfg = { 
	.adv_pm = true,						\

	.adv_pm = true,						\

	.rx_with_siso_diversity = true				\

	.rx_with_siso_diversity = true				\





struct iwl_cfg iwl230_bg_cfg = {

struct iwl_cfg iwl135_bg_cfg = {

	.name = "200 Series 1x1 BG/BT",

	.name = "105 Series 1x1 BG/BT",

	IWL_DEVICE_230,

	IWL_DEVICE_135,

};

};





struct iwl_cfg iwl230_bgn_cfg = {

struct iwl_cfg iwl135_bgn_cfg = {

	.name = "200 Series 1x1 BGN/BT",

	.name = "105 Series 1x1 BGN/BT",

	IWL_DEVICE_230,

	IWL_DEVICE_135,

	.ht_params = &iwl2000_ht_params,

	.ht_params = &iwl2000_ht_params,

};

};





MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));

MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));

MODULE_FIRMWARE(IWL200_MODULE_FIRMWARE(IWL200_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));

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

+15 −15
Original line number Original line Diff line number Diff line
@@ -4129,21 +4129,21 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)},

	{IWL_PCI_DEVICE(0x088F, 0x4266, iwl6035_2bg_cfg)},

	{IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)},

	{IWL_PCI_DEVICE(0x088E, 0x4466, iwl6035_2bg_cfg)},





/* 200 Series */

/* 105 Series */

	{IWL_PCI_DEVICE(0x0894, 0x0022, iwl200_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0022, iwl105_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0895, 0x0222, iwl200_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0895, 0x0222, iwl105_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0422, iwl200_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0422, iwl105_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0026, iwl200_bg_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0026, iwl105_bg_cfg)},

	{IWL_PCI_DEVICE(0x0895, 0x0226, iwl200_bg_cfg)},

	{IWL_PCI_DEVICE(0x0895, 0x0226, iwl105_bg_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0426, iwl200_bg_cfg)},

	{IWL_PCI_DEVICE(0x0894, 0x0426, iwl105_bg_cfg)},





/* 230 Series */

/* 135 Series */

	{IWL_PCI_DEVICE(0x0892, 0x0062, iwl230_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0062, iwl135_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0893, 0x0262, iwl230_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0893, 0x0262, iwl135_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0462, iwl230_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0462, iwl135_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0066, iwl230_bg_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0066, iwl135_bg_cfg)},

	{IWL_PCI_DEVICE(0x0893, 0x0266, iwl230_bg_cfg)},

	{IWL_PCI_DEVICE(0x0893, 0x0266, iwl135_bg_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0466, iwl230_bg_cfg)},

	{IWL_PCI_DEVICE(0x0892, 0x0466, iwl135_bg_cfg)},





	{0}

	{0}

};

};

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -102,10 +102,10 @@ extern struct iwl_cfg iwl2030_2bg_cfg; 
extern struct iwl_cfg iwl6035_2agn_cfg;

extern struct iwl_cfg iwl6035_2agn_cfg;

extern struct iwl_cfg iwl6035_2abg_cfg;

extern struct iwl_cfg iwl6035_2abg_cfg;

extern struct iwl_cfg iwl6035_2bg_cfg;

extern struct iwl_cfg iwl6035_2bg_cfg;

extern struct iwl_cfg iwl200_bg_cfg;

extern struct iwl_cfg iwl105_bg_cfg;

extern struct iwl_cfg iwl200_bgn_cfg;

extern struct iwl_cfg iwl105_bgn_cfg;

extern struct iwl_cfg iwl230_bg_cfg;

extern struct iwl_cfg iwl135_bg_cfg;

extern struct iwl_cfg iwl230_bgn_cfg;

extern struct iwl_cfg iwl135_bgn_cfg;





extern struct iwl_mod_params iwlagn_mod_params;

extern struct iwl_mod_params iwlagn_mod_params;

extern struct iwl_hcmd_ops iwlagn_hcmd;

extern struct iwl_hcmd_ops iwlagn_hcmd;