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

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

iwlagn: use 6030 configuration for 6035 series 



6035 series of devices should use the same uCode as 6030 series,
change it.

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

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

+0 −31
Original line number Diff line number Diff line
@@ -471,37 +471,6 @@ struct iwl_cfg iwl2030_2bg_cfg = { 
	IWL_DEVICE_2030,

};



#define IWL_DEVICE_6035						\

	.fw_name_pre = IWL2030_FW_PRE,				\

	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.eeprom_ver = EEPROM_6035_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6035_TX_POWER_VERSION,	\

	.ops = &iwl2030_ops,					\

	.mod_params = &iwlagn_mod_params,			\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.need_dc_calib = true,					\

	.need_temp_offset_calib = true,				\

	.led_mode = IWL_LED_RF_STATE,				\

	.adv_pm = true						\



struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "2000 Series 2x2 AGN/BT",

	IWL_DEVICE_6035,

	.ht_params = &iwl2000_ht_params,

};



struct iwl_cfg iwl6035_2abg_cfg = {

	.name = "2000 Series 2x2 ABG/BT",

	IWL_DEVICE_6035,

};



struct iwl_cfg iwl6035_2bg_cfg = {

	.name = "2000 Series 2x2 BG/BT",

	IWL_DEVICE_6035,

};



#define IWL_DEVICE_200						\

	.fw_name_pre = IWL200_FW_PRE,				\

	.ucode_api_max = IWL200_UCODE_API_MAX,			\

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

+16 −0
Original line number Diff line number Diff line
@@ -613,6 +613,22 @@ struct iwl_cfg iwl6030_2bg_cfg = { 
	IWL_DEVICE_6030,

};



struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "6035 Series 2x2 AGN/BT",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6035_2abg_cfg = {

	.name = "6035 Series 2x2 ABG/BT",

	IWL_DEVICE_6030,

};



struct iwl_cfg iwl6035_2bg_cfg = {

	.name = "6035 Series 2x2 BG/BT",

	IWL_DEVICE_6030,

};



struct iwl_cfg iwl1030_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",

	IWL_DEVICE_6030,