mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-26 13:57:59 +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>
65 lines
2.4 KiB
Diff
65 lines
2.4 KiB
Diff
From cad1b4d0f128eb46af3732795f91e3aba5ea4fbb Mon Sep 17 00:00:00 2001
|
|
From: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Fri, 4 Nov 2011 07:22:37 -0700
|
|
Subject: [PATCH 158/165] iwlagn: allow up to uCode API 6 for 6000 devices
|
|
|
|
commit b914811524fbe9e91fe50845f5d7bd4316b8a6ee upstream.
|
|
|
|
Since the uCode hasn't been released (yet?),
|
|
warn only if using older than API 4, but load
|
|
anything up to API 6.
|
|
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +++++--
|
|
1 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
index c840c78..ae3ea32 100644
|
|
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
|
|
@@ -46,11 +46,12 @@
|
|
#include "iwl-cfg.h"
|
|
|
|
/* Highest firmware API version supported */
|
|
-#define IWL6000_UCODE_API_MAX 4
|
|
+#define IWL6000_UCODE_API_MAX 6
|
|
#define IWL6050_UCODE_API_MAX 5
|
|
#define IWL6000G2_UCODE_API_MAX 6
|
|
|
|
/* Oldest version we won't warn about */
|
|
+#define IWL6000_UCODE_API_OK 4
|
|
#define IWL6000G2_UCODE_API_OK 5
|
|
|
|
/* Lowest firmware API version supported */
|
|
@@ -479,6 +480,7 @@ struct iwl_cfg iwl130_bg_cfg = {
|
|
#define IWL_DEVICE_6000i \
|
|
.fw_name_pre = IWL6000_FW_PRE, \
|
|
.ucode_api_max = IWL6000_UCODE_API_MAX, \
|
|
+ .ucode_api_ok = IWL6000_UCODE_API_OK, \
|
|
.ucode_api_min = IWL6000_UCODE_API_MIN, \
|
|
.valid_tx_ant = ANT_BC, /* .cfg overwrite */ \
|
|
.valid_rx_ant = ANT_BC, /* .cfg overwrite */ \
|
|
@@ -559,6 +561,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
|
|
.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",
|
|
.fw_name_pre = IWL6000_FW_PRE,
|
|
.ucode_api_max = IWL6000_UCODE_API_MAX,
|
|
+ .ucode_api_ok = IWL6000_UCODE_API_OK,
|
|
.ucode_api_min = IWL6000_UCODE_API_MIN,
|
|
.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
|
|
.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
|
|
@@ -569,7 +572,7 @@ struct iwl_cfg iwl6000_3agn_cfg = {
|
|
.led_mode = IWL_LED_BLINK,
|
|
};
|
|
|
|
-MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
|
|
+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));
|
|
--
|
|
1.7.7.6
|
|
|