mac80211: brcmfmac: backport wowlan netdetect fixes
[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 550-ath9k-Add-a-define-for-the-EEPROM-eepmisc-endianness.patch
1 From 9692ab1ff30ae0abc1000d11b2f929b6e2e4cb7f Mon Sep 17 00:00:00 2001
2 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
3 Date: Mon, 3 Oct 2016 00:29:07 +0200
4 Subject: [v2 PATCH 1/7] ath9k: Add a #define for the EEPROM "eepmisc" endianness
5 bit
6
7 This replaces a magic number with a named #define. Additionally it
8 removes two "eeprom format" specific #defines for the "big endianness"
9 bit which are the same on all eeprom formats.
10
11 Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
12 ---
13 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 ++-
14 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 1 -
15 drivers/net/wireless/ath/ath9k/eeprom.h | 4 +++-
16 drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +-
17 drivers/net/wireless/ath/ath9k/eeprom_9287.c | 2 +-
18 drivers/net/wireless/ath/ath9k/eeprom_def.c | 2 +-
19 6 files changed, 8 insertions(+), 6 deletions(-)
20
21 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
22 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
23 @@ -3468,7 +3468,8 @@ static u32 ath9k_hw_ar9003_dump_eeprom(s
24 AR5416_OPFLAGS_N_5G_HT20));
25 PR_EEP("Disable 5Ghz HT40", !!(pBase->opCapFlags.opFlags &
26 AR5416_OPFLAGS_N_5G_HT40));
27 - PR_EEP("Big Endian", !!(pBase->opCapFlags.eepMisc & 0x01));
28 + PR_EEP("Big Endian", !!(pBase->opCapFlags.eepMisc &
29 + AR5416_EEPMISC_BIG_ENDIAN));
30 PR_EEP("RF Silent", pBase->rfSilent);
31 PR_EEP("BT option", pBase->blueToothOptions);
32 PR_EEP("Device Cap", pBase->deviceCap);
33 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
34 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
35 @@ -38,7 +38,6 @@
36 #define AR9300_NUM_CTLS_2G 12
37 #define AR9300_NUM_BAND_EDGES_5G 8
38 #define AR9300_NUM_BAND_EDGES_2G 4
39 -#define AR9300_EEPMISC_BIG_ENDIAN 0x01
40 #define AR9300_EEPMISC_WOW 0x02
41 #define AR9300_CUSTOMER_DATA_SIZE 20
42
43 --- a/drivers/net/wireless/ath/ath9k/eeprom.h
44 +++ b/drivers/net/wireless/ath/ath9k/eeprom.h
45 @@ -161,6 +161,9 @@
46 #define AR5416_EEP_TXGAIN_ORIGINAL 0
47 #define AR5416_EEP_TXGAIN_HIGH_POWER 1
48
49 +/* Endianness of EEPROM content */
50 +#define AR5416_EEPMISC_BIG_ENDIAN 0x01
51 +
52 #define AR5416_EEP4K_START_LOC 64
53 #define AR5416_EEP4K_NUM_2G_CAL_PIERS 3
54 #define AR5416_EEP4K_NUM_2G_CCK_TARGET_POWERS 3
55 @@ -191,7 +194,6 @@
56 #define AR9287_NUM_CTLS 12
57 #define AR9287_NUM_BAND_EDGES 4
58 #define AR9287_PD_GAIN_ICEPTS 1
59 -#define AR9287_EEPMISC_BIG_ENDIAN 0x01
60 #define AR9287_EEPMISC_WOW 0x02
61 #define AR9287_MAX_CHAINS 2
62 #define AR9287_ANT_16S 32
63 --- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
64 +++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
65 @@ -154,7 +154,7 @@ static u32 ath9k_hw_4k_dump_eeprom(struc
66 AR5416_OPFLAGS_N_5G_HT20));
67 PR_EEP("Disable 5Ghz HT40", !!(pBase->opCapFlags &
68 AR5416_OPFLAGS_N_5G_HT40));
69 - PR_EEP("Big Endian", !!(pBase->eepMisc & 0x01));
70 + PR_EEP("Big Endian", !!(pBase->eepMisc & AR5416_EEPMISC_BIG_ENDIAN));
71 PR_EEP("Cal Bin Major Ver", (pBase->binBuildNumber >> 24) & 0xFF);
72 PR_EEP("Cal Bin Minor Ver", (pBase->binBuildNumber >> 16) & 0xFF);
73 PR_EEP("Cal Bin Build", (pBase->binBuildNumber >> 8) & 0xFF);
74 --- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
75 +++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
76 @@ -150,7 +150,7 @@ static u32 ath9k_hw_ar9287_dump_eeprom(s
77 AR5416_OPFLAGS_N_5G_HT20));
78 PR_EEP("Disable 5Ghz HT40", !!(pBase->opCapFlags &
79 AR5416_OPFLAGS_N_5G_HT40));
80 - PR_EEP("Big Endian", !!(pBase->eepMisc & 0x01));
81 + PR_EEP("Big Endian", !!(pBase->eepMisc & AR5416_EEPMISC_BIG_ENDIAN));
82 PR_EEP("Cal Bin Major Ver", (pBase->binBuildNumber >> 24) & 0xFF);
83 PR_EEP("Cal Bin Minor Ver", (pBase->binBuildNumber >> 16) & 0xFF);
84 PR_EEP("Cal Bin Build", (pBase->binBuildNumber >> 8) & 0xFF);
85 --- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
86 +++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
87 @@ -232,7 +232,7 @@ static u32 ath9k_hw_def_dump_eeprom(stru
88 AR5416_OPFLAGS_N_5G_HT20));
89 PR_EEP("Disable 5Ghz HT40", !!(pBase->opCapFlags &
90 AR5416_OPFLAGS_N_5G_HT40));
91 - PR_EEP("Big Endian", !!(pBase->eepMisc & 0x01));
92 + PR_EEP("Big Endian", !!(pBase->eepMisc & AR5416_EEPMISC_BIG_ENDIAN));
93 PR_EEP("Cal Bin Major Ver", (pBase->binBuildNumber >> 24) & 0xFF);
94 PR_EEP("Cal Bin Minor Ver", (pBase->binBuildNumber >> 16) & 0xFF);
95 PR_EEP("Cal Bin Build", (pBase->binBuildNumber >> 8) & 0xFF);