mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-26 22:07:51 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
160 lines
6.3 KiB
Diff
160 lines
6.3 KiB
Diff
From 6ae066df7c16000f163eab3a745b711447536e70 Mon Sep 17 00:00:00 2001
|
|
From: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
|
|
Date: Sun, 22 Apr 2012 07:55:27 -0700
|
|
Subject: [PATCH 159/165] iwlwifi: use correct released ucode version
|
|
|
|
commit 78cbcf2b9dbe0565820dc7721316f9c401000a68 upstream.
|
|
|
|
Report correctly the latest released version
|
|
of the iwlwifi firmware for all
|
|
iwlwifi-supported devices.
|
|
|
|
Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
|
|
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
[bwh: Backported to 3.2: adjust context]
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/wireless/iwlwifi/iwl-1000.c | 8 ++++----
|
|
drivers/net/wireless/iwlwifi/iwl-2000.c | 16 ++++++++--------
|
|
drivers/net/wireless/iwlwifi/iwl-5000.c | 11 +++++++++--
|
|
drivers/net/wireless/iwlwifi/iwl-6000.c | 10 ++++++----
|
|
4 files changed, 27 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
|
|
index dd008b0..1e6c8cc 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-1000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
|
|
@@ -45,8 +45,8 @@
|
|
#include "iwl-cfg.h"
|
|
|
|
/* Highest firmware API version supported */
|
|
-#define IWL1000_UCODE_API_MAX 6
|
|
-#define IWL100_UCODE_API_MAX 6
|
|
+#define IWL1000_UCODE_API_MAX 5
|
|
+#define IWL100_UCODE_API_MAX 5
|
|
|
|
/* Oldest version we won't warn about */
|
|
#define IWL1000_UCODE_API_OK 5
|
|
@@ -244,5 +244,5 @@ struct iwl_cfg iwl100_bg_cfg = {
|
|
IWL_DEVICE_100,
|
|
};
|
|
|
|
-MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));
|
|
+MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_OK));
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-2000.c b/drivers/net/wireless/iwlwifi/iwl-2000.c
|
|
index 7943197..9823e41 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-2000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-2000.c
|
|
@@ -51,10 +51,10 @@
|
|
#define IWL135_UCODE_API_MAX 6
|
|
|
|
/* Oldest version we won't warn about */
|
|
-#define IWL2030_UCODE_API_OK 5
|
|
-#define IWL2000_UCODE_API_OK 5
|
|
-#define IWL105_UCODE_API_OK 5
|
|
-#define IWL135_UCODE_API_OK 5
|
|
+#define IWL2030_UCODE_API_OK 6
|
|
+#define IWL2000_UCODE_API_OK 6
|
|
+#define IWL105_UCODE_API_OK 6
|
|
+#define IWL135_UCODE_API_OK 6
|
|
|
|
/* Lowest firmware API version supported */
|
|
#define IWL2030_UCODE_API_MIN 5
|
|
@@ -372,7 +372,7 @@ struct iwl_cfg iwl135_bgn_cfg = {
|
|
.ht_params = &iwl2000_ht_params,
|
|
};
|
|
|
|
-MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_MAX));
|
|
+MODULE_FIRMWARE(IWL2000_MODULE_FIRMWARE(IWL2000_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL2030_MODULE_FIRMWARE(IWL2030_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL105_MODULE_FIRMWARE(IWL105_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL135_MODULE_FIRMWARE(IWL135_UCODE_API_OK));
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
|
|
index f55fb2d..606213f 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
|
|
@@ -50,6 +50,10 @@
|
|
#define IWL5000_UCODE_API_MAX 5
|
|
#define IWL5150_UCODE_API_MAX 2
|
|
|
|
+/* Oldest version we won't warn about */
|
|
+#define IWL5000_UCODE_API_OK 5
|
|
+#define IWL5150_UCODE_API_OK 2
|
|
+
|
|
/* Lowest firmware API version supported */
|
|
#define IWL5000_UCODE_API_MIN 1
|
|
#define IWL5150_UCODE_API_MIN 1
|
|
@@ -373,6 +377,7 @@ static struct iwl_ht_params iwl5000_ht_params = {
|
|
#define IWL_DEVICE_5000 \
|
|
.fw_name_pre = IWL5000_FW_PRE, \
|
|
.ucode_api_max = IWL5000_UCODE_API_MAX, \
|
|
+ .ucode_api_ok = IWL5000_UCODE_API_OK, \
|
|
.ucode_api_min = IWL5000_UCODE_API_MIN, \
|
|
.eeprom_ver = EEPROM_5000_EEPROM_VERSION, \
|
|
.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION, \
|
|
@@ -416,6 +421,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
|
|
.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",
|
|
.fw_name_pre = IWL5000_FW_PRE,
|
|
.ucode_api_max = IWL5000_UCODE_API_MAX,
|
|
+ .ucode_api_ok = IWL5000_UCODE_API_OK,
|
|
.ucode_api_min = IWL5000_UCODE_API_MIN,
|
|
.eeprom_ver = EEPROM_5050_EEPROM_VERSION,
|
|
.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,
|
|
@@ -429,6 +435,7 @@ struct iwl_cfg iwl5350_agn_cfg = {
|
|
#define IWL_DEVICE_5150 \
|
|
.fw_name_pre = IWL5150_FW_PRE, \
|
|
.ucode_api_max = IWL5150_UCODE_API_MAX, \
|
|
+ .ucode_api_ok = IWL5150_UCODE_API_OK, \
|
|
.ucode_api_min = IWL5150_UCODE_API_MIN, \
|
|
.eeprom_ver = EEPROM_5050_EEPROM_VERSION, \
|
|
.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION, \
|
|
@@ -450,5 +457,5 @@ struct iwl_cfg iwl5150_abg_cfg = {
|
|
IWL_DEVICE_5150,
|
|
};
|
|
|
|
-MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_MAX));
|
|
+MODULE_FIRMWARE(IWL5000_MODULE_FIRMWARE(IWL5000_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL5150_MODULE_FIRMWARE(IWL5150_UCODE_API_OK));
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
index ae3ea32..9509298 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
@@ -53,6 +53,8 @@
|
|
/* Oldest version we won't warn about */
|
|
#define IWL6000_UCODE_API_OK 4
|
|
#define IWL6000G2_UCODE_API_OK 5
|
|
+#define IWL6050_UCODE_API_OK 5
|
|
+#define IWL6000G2B_UCODE_API_OK 6
|
|
|
|
/* Lowest firmware API version supported */
|
|
#define IWL6000_UCODE_API_MIN 4
|
|
@@ -359,7 +361,7 @@ static struct iwl_bt_params iwl6000_bt_params = {
|
|
#define IWL_DEVICE_6005 \
|
|
.fw_name_pre = IWL6005_FW_PRE, \
|
|
.ucode_api_max = IWL6000G2_UCODE_API_MAX, \
|
|
- .ucode_api_ok = IWL6000G2_UCODE_API_OK, \
|
|
+ .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \
|
|
.ucode_api_min = IWL6000G2_UCODE_API_MIN, \
|
|
.eeprom_ver = EEPROM_6005_EEPROM_VERSION, \
|
|
.eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION, \
|
|
@@ -573,6 +575,6 @@ struct iwl_cfg iwl6000_3agn_cfg = {
|
|
};
|
|
|
|
MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_OK));
|
|
-MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
|
|
-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
|
|
+MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_OK));
|
|
+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_OK));
|
|
--
|
|
1.7.7.6
|
|
|