iwlwifi: EEPROM version for 1000 and 6000 series
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Thu, 17 Sep 2009 17:43:46 +0000 (10:43 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 7 Oct 2009 20:39:33 +0000 (16:39 -0400)
Update EEPROM version requirement for 1000 and 6000 series of NIC
for EEPROM version verification.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-eeprom.h

index 1dd8db2f6f236db5ded9474662c879057a91c00f..879b3753a3bdebcb1f971aff7b12c9406a5c4abb 100644 (file)
@@ -155,7 +155,7 @@ struct iwl_cfg iwl1000_bgn_cfg = {
        .sku = IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl1000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_A,
index a9665ce1d65803ebb9d1b139cb381be27cf26cbc..0d2cbab1f7d2122683862ac1b8581569b1cc4a35 100644 (file)
@@ -248,7 +248,7 @@ struct iwl_cfg iwl6000h_2agn_cfg = {
        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl6000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_AB,
@@ -273,7 +273,7 @@ struct iwl_cfg iwl6000i_2agn_cfg = {
        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl6000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_BC,
@@ -295,7 +295,7 @@ struct iwl_cfg iwl6050_2agn_cfg = {
        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl6000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_AB,
@@ -317,7 +317,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl6000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_ABC,
@@ -339,7 +339,7 @@ struct iwl_cfg iwl6050_3agn_cfg = {
        .sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
        .ops = &iwl6000_ops,
        .eeprom_size = OTP_LOW_IMAGE_SIZE,
-       .eeprom_ver = EEPROM_5000_EEPROM_VERSION,
+       .eeprom_ver = EEPROM_6000_EEPROM_VERSION,
        .eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,
        .mod_params = &iwl50_mod_params,
        .valid_tx_ant = ANT_ABC,
index 61794eb3d6898de67cc926a4a30e9cbe76890ea2..75fe02282998ba50ee40aeeafe8d57f1fa39e1bc 100644 (file)
@@ -256,6 +256,12 @@ struct iwl_eeprom_enhanced_txpwr {
 #define EEPROM_5050_TX_POWER_VERSION    (4)
 #define EEPROM_5050_EEPROM_VERSION     (0x21E)
 
+/* 1000 Specific */
+#define EEPROM_1000_EEPROM_VERSION     (0x15D)
+
+/* 60x0 Specific */
+#define EEPROM_6000_EEPROM_VERSION     (0x434)
+
 /* OTP */
 /* lower blocks contain EEPROM image and calibration data */
 #define OTP_LOW_IMAGE_SIZE             (2 * 512 * sizeof(u16)) /* 2 KB */