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

Commit 7100e924 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: 5150 add support for 5150 



Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d97809db

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

+12 −0
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ 
#include "iwl-5000-hw.h"



#define IWL5000_UCODE_API  "-1"

#define IWL5150_UCODE_API  "-1"



#define IWL5000_MODULE_FIRMWARE "iwlwifi-5000" IWL5000_UCODE_API ".ucode"

#define IWL5150_MODULE_FIRMWARE "iwlwifi-5150" IWL5150_UCODE_API ".ucode"



static const u16 iwl5000_default_queue_to_tx_fifo[] = {

	IWL_TX_FIFO_AC3,
@@ -1563,7 +1565,17 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.mod_params = &iwl50_mod_params,

};



struct iwl_cfg iwl5150_agn_cfg = {

	.name = "5150AGN",

	.fw_name = IWL5150_MODULE_FIRMWARE,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

	.mod_params = &iwl50_mod_params,

};



MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE);

MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE);



module_param_named(disable50, iwl50_mod_params.disable, int, 0444);

MODULE_PARM_DESC(disable50,

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

+4 −0
Original line number Diff line number Diff line
@@ -4210,7 +4210,11 @@ static struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x423A, 0x1001, iwl5350_agn_cfg)},

	{IWL_PCI_DEVICE(0x423A, 0x1021, iwl5350_agn_cfg)},

	{IWL_PCI_DEVICE(0x423B, 0x1011, iwl5350_agn_cfg)},

/* 5150 Wifi/WiMax */

	{IWL_PCI_DEVICE(0x423C, PCI_ANY_ID, iwl5150_agn_cfg)},

	{IWL_PCI_DEVICE(0x423D, PCI_ANY_ID, iwl5150_agn_cfg)},

#endif /* CONFIG_IWL5000 */



	{0}

};

MODULE_DEVICE_TABLE(pci, iwl_hw_card_ids);

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

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ extern struct iwl_cfg iwl5100_agn_cfg; 
extern struct iwl_cfg iwl5350_agn_cfg;

extern struct iwl_cfg iwl5100_bg_cfg;

extern struct iwl_cfg iwl5100_abg_cfg;

extern struct iwl_cfg iwl5150_agn_cfg;



/* CT-KILL constants */

#define CT_KILL_THRESHOLD	110 /* in Celsius */