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

Commit 586aed96 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move eeprom versions to HW files 



The hardware files belong to the core PCI
functionality, but the eeprom header file
mixes higher-level functionality and the
defines, so move out the specific defines
and put them into the appropriate HW files
instead.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent f1f80a8c

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ 
#define IWL1000_UCODE_API_MIN 1

#define IWL1000_UCODE_API_MIN 1

#define IWL100_UCODE_API_MIN 5

#define IWL100_UCODE_API_MIN 5





/* EEPROM version */

#define EEPROM_1000_TX_POWER_VERSION	(4)

#define EEPROM_1000_EEPROM_VERSION	(0x15C)



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define IWL1000_FW_PRE "iwlwifi-1000-"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,11 @@ 
#define IWL105_UCODE_API_MIN 5

#define IWL105_UCODE_API_MIN 5

#define IWL135_UCODE_API_MIN 5

#define IWL135_UCODE_API_MIN 5





/* EEPROM version */

#define EEPROM_2000_TX_POWER_VERSION	(6)

#define EEPROM_2000_EEPROM_VERSION	(0x805)





#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_FW_PRE "iwlwifi-2030-"

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

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

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,12 @@ 
#define IWL5000_UCODE_API_MIN 1

#define IWL5000_UCODE_API_MIN 1

#define IWL5150_UCODE_API_MIN 1

#define IWL5150_UCODE_API_MIN 1





/* EEPROM versions */

#define EEPROM_5000_TX_POWER_VERSION	(4)

#define EEPROM_5000_EEPROM_VERSION	(0x11A)

#define EEPROM_5050_TX_POWER_VERSION	(4)

#define EEPROM_5050_EEPROM_VERSION	(0x21E)



#define IWL5000_FW_PRE "iwlwifi-5000-"

#define IWL5000_FW_PRE "iwlwifi-5000-"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"

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

+14 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,20 @@ 
#define IWL6050_UCODE_API_MIN 4

#define IWL6050_UCODE_API_MIN 4

#define IWL6000G2_UCODE_API_MIN 4

#define IWL6000G2_UCODE_API_MIN 4





/* EEPROM versions */

#define EEPROM_6000_TX_POWER_VERSION	(4)

#define EEPROM_6000_EEPROM_VERSION	(0x423)

#define EEPROM_6050_TX_POWER_VERSION	(4)

#define EEPROM_6050_EEPROM_VERSION	(0x532)

#define EEPROM_6150_TX_POWER_VERSION	(6)

#define EEPROM_6150_EEPROM_VERSION	(0x553)

#define EEPROM_6005_TX_POWER_VERSION	(6)

#define EEPROM_6005_EEPROM_VERSION	(0x709)

#define EEPROM_6030_TX_POWER_VERSION	(6)

#define EEPROM_6030_EEPROM_VERSION	(0x709)

#define EEPROM_6035_TX_POWER_VERSION	(6)

#define EEPROM_6035_EEPROM_VERSION	(0x753)



#define IWL6000_FW_PRE "iwlwifi-6000-"

#define IWL6000_FW_PRE "iwlwifi-6000-"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"

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

+0 −42
Original line number Original line Diff line number Diff line
@@ -206,48 +206,6 @@ struct iwl_eeprom_calib_hdr { 
/* 6000 regulatory - indirect access */

/* 6000 regulatory - indirect access */

#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\

#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\

		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */

		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */



/* 5000 Specific */

#define EEPROM_5000_TX_POWER_VERSION    (4)

#define EEPROM_5000_EEPROM_VERSION	(0x11A)



/* 5050 Specific */

#define EEPROM_5050_TX_POWER_VERSION    (4)

#define EEPROM_5050_EEPROM_VERSION	(0x21E)



/* 1000 Specific */

#define EEPROM_1000_TX_POWER_VERSION    (4)

#define EEPROM_1000_EEPROM_VERSION	(0x15C)



/* 6x00 Specific */

#define EEPROM_6000_TX_POWER_VERSION    (4)

#define EEPROM_6000_EEPROM_VERSION	(0x423)



/* 6x50 Specific */

#define EEPROM_6050_TX_POWER_VERSION    (4)

#define EEPROM_6050_EEPROM_VERSION	(0x532)



/* 6150 Specific */

#define EEPROM_6150_TX_POWER_VERSION    (6)

#define EEPROM_6150_EEPROM_VERSION	(0x553)



/* 6x05 Specific */

#define EEPROM_6005_TX_POWER_VERSION    (6)

#define EEPROM_6005_EEPROM_VERSION	(0x709)



/* 6x30 Specific */

#define EEPROM_6030_TX_POWER_VERSION    (6)

#define EEPROM_6030_EEPROM_VERSION	(0x709)



/* 2x00 Specific */

#define EEPROM_2000_TX_POWER_VERSION    (6)

#define EEPROM_2000_EEPROM_VERSION	(0x805)



/* 6x35 Specific */

#define EEPROM_6035_TX_POWER_VERSION    (6)

#define EEPROM_6035_EEPROM_VERSION	(0x753)





/* OTP */

/* OTP */

/* lower blocks contain EEPROM image and calibration data */

/* lower blocks contain EEPROM image and calibration data */

#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */

#define OTP_LOW_IMAGE_SIZE		(2 * 512 * sizeof(u16)) /* 2 KB */