OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwif...
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
iwl-7000.c
diff --git
a/drivers/net/wireless/iwlwifi/iwl-7000.c
b/drivers/net/wireless/iwlwifi/iwl-7000.c
index
003a546
..
f73de23
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-7000.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-7000.c
@@
-67,16
+67,16
@@
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
#include "iwl-agn-hw.h"
/* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX
8
-#define IWL3160_UCODE_API_MAX
8
+#define IWL7260_UCODE_API_MAX
9
+#define IWL3160_UCODE_API_MAX
9
/* Oldest version we won't warn about */
/* Oldest version we won't warn about */
-#define IWL7260_UCODE_API_OK
8
-#define IWL3160_UCODE_API_OK
8
+#define IWL7260_UCODE_API_OK
9
+#define IWL3160_UCODE_API_OK
9
/* Lowest firmware API version supported */
/* Lowest firmware API version supported */
-#define IWL7260_UCODE_API_MIN
7
-#define IWL3160_UCODE_API_MIN
7
+#define IWL7260_UCODE_API_MIN
8
+#define IWL3160_UCODE_API_MIN
8
/* NVM versions */
#define IWL7260_NVM_VERSION 0x0a1d
/* NVM versions */
#define IWL7260_NVM_VERSION 0x0a1d
@@
-107,6
+107,7
@@
static const struct iwl_base_params iwl7000_base_params = {
.max_event_log_size = 512,
.shadow_reg_enable = true,
.pcie_l1_allowed = true,
.max_event_log_size = 512,
.shadow_reg_enable = true,
.pcie_l1_allowed = true,
+ .apmg_wake_up_wa = true,
};
static const struct iwl_ht_params iwl7000_ht_params = {
};
static const struct iwl_ht_params iwl7000_ht_params = {
@@
-244,3
+245,4
@@
const struct iwl_cfg iwl7265_n_cfg = {
MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
+MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));