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

Commit 9fcf4ad4 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: move OTP defines 



Since the PCI core shouldn't include the
iwl-eeprom.h header file, move the OTP
definitions into iwl-agn-hw.h which can
be included.

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

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

+11 −0
Original line number Diff line number Diff line
@@ -102,6 +102,17 @@ 


/* EEPROM */

#define IWLAGN_EEPROM_IMG_SIZE		2048

/* OTP */

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

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

/* high blocks contain PAPD data */

#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */

#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */

#define OTP_MAX_LL_ITEMS_1000		(3)	/* OTP blocks for 1000 */

#define OTP_MAX_LL_ITEMS_6x00		(4)	/* OTP blocks for 6x00 */

#define OTP_MAX_LL_ITEMS_6x50		(7)	/* OTP blocks for 6x50 */

#define OTP_MAX_LL_ITEMS_2x00		(4)	/* OTP blocks for 2x00 */





#define IWLAGN_NUM_QUEUES		20

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

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

#define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\

		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */

/* OTP */

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

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

/* high blocks contain PAPD data */

#define OTP_HIGH_IMAGE_SIZE_6x00        (6 * 512 * sizeof(u16)) /* 6 KB */

#define OTP_HIGH_IMAGE_SIZE_1000        (0x200 * sizeof(u16)) /* 1024 bytes */

#define OTP_MAX_LL_ITEMS_1000		(3)	/* OTP blocks for 1000 */

#define OTP_MAX_LL_ITEMS_6x00		(4)	/* OTP blocks for 6x00 */

#define OTP_MAX_LL_ITEMS_6x50		(7)	/* OTP blocks for 6x50 */

#define OTP_MAX_LL_ITEMS_2x00		(4)	/* OTP blocks for 2x00 */



/* 2.4 GHz */

extern const u8 iwl_eeprom_band_1[14];