aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-09-27 20:51:43 +0000
commit8be721208dad06c6a3119dee2db81c385a91a336 (patch)
tree70eddd3a592f75ebfb105dc619735d0c5178c471 /package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
parent54a18b3fe80d6cfe06acda47c7d4d82c0d0e5688 (diff)
downloadupstream-8be721208dad06c6a3119dee2db81c385a91a336.tar.gz
upstream-8be721208dad06c6a3119dee2db81c385a91a336.tar.bz2
upstream-8be721208dad06c6a3119dee2db81c385a91a336.zip
mac80211: update to wireless-testing 2014-09-26
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42683
Diffstat (limited to 'package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch')
-rw-r--r--package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch48
1 files changed, 24 insertions, 24 deletions
diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
index 41a7f34454..af4e77277a 100644
--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -1,13 +1,13 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -73,6 +73,7 @@
+@@ -74,6 +74,7 @@
#define RF3070 0x3070
#define RF3290 0x3290
#define RF3853 0x3853
+#define RF5350 0x5350
#define RF5360 0x5360
+ #define RF5362 0x5362
#define RF5370 0x5370
- #define RF5372 0x5372
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3038,6 +3038,13 @@ static void rt2800_config_channel_rf53xx
@@ -30,17 +30,17 @@
case RF3070:
+ case RF5350:
case RF5360:
+ case RF5362:
case RF5370:
- case RF5372:
-@@ -3533,6 +3541,7 @@ static void rt2800_config_channel(struct
+@@ -3534,6 +3542,7 @@ static void rt2800_config_channel(struct
if (rt2x00_rf(rt2x00dev, RF3070) ||
rt2x00_rf(rt2x00dev, RF3290) ||
rt2x00_rf(rt2x00dev, RF3322) ||
+ rt2x00_rf(rt2x00dev, RF5350) ||
rt2x00_rf(rt2x00dev, RF5360) ||
+ rt2x00_rf(rt2x00dev, RF5362) ||
rt2x00_rf(rt2x00dev, RF5370) ||
- rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -3810,7 +3819,8 @@ static void rt2800_config_channel(struct
+@@ -3812,7 +3821,8 @@ static void rt2800_config_channel(struct
/*
* Clear update flag
*/
@@ -50,15 +50,15 @@
rt2800_bbp_read(rt2x00dev, 49, &bbp);
rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
rt2800_bbp_write(rt2x00dev, 49, bbp);
-@@ -4689,6 +4699,7 @@ void rt2800_vco_calibration(struct rt2x0
+@@ -4691,6 +4701,7 @@ void rt2800_vco_calibration(struct rt2x0
case RF3070:
case RF3290:
case RF3853:
+ case RF5350:
case RF5360:
+ case RF5362:
case RF5370:
- case RF5372:
-@@ -5101,6 +5112,8 @@ static int rt2800_init_registers(struct
+@@ -5104,6 +5115,8 @@ static int rt2800_init_registers(struct
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
@@ -67,7 +67,7 @@
} else {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-@@ -5756,9 +5769,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5759,9 +5772,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 82, 0x62);
@@ -84,7 +84,7 @@
rt2800_bbp_write(rt2x00dev, 86, 0x38);
-@@ -5772,9 +5789,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5775,9 +5792,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 104, 0x92);
@@ -101,7 +101,7 @@
rt2800_bbp_write(rt2x00dev, 120, 0x50);
-@@ -5799,6 +5820,13 @@ static void rt2800_init_bbp_3352(struct
+@@ -5802,6 +5823,13 @@ static void rt2800_init_bbp_3352(struct
rt2800_bbp_write(rt2x00dev, 143, 0xa2);
rt2800_bbp_write(rt2x00dev, 148, 0xc8);
@@ -115,7 +115,7 @@
}
static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
-@@ -6140,6 +6168,7 @@ static void rt2800_init_bbp(struct rt2x0
+@@ -6143,6 +6171,7 @@ static void rt2800_init_bbp(struct rt2x0
rt2800_init_bbp_3290(rt2x00dev);
break;
case RT3352:
@@ -123,7 +123,7 @@
rt2800_init_bbp_3352(rt2x00dev);
break;
case RT3390:
-@@ -7091,6 +7120,76 @@ static void rt2800_init_rfcsr_3883(struc
+@@ -7094,6 +7123,76 @@ static void rt2800_init_rfcsr_3883(struc
rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
}
@@ -200,7 +200,7 @@
static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
{
rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -7331,6 +7430,9 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -7334,6 +7433,9 @@ static void rt2800_init_rfcsr(struct rt2
case RT3593:
rt2800_init_rfcsr_3593(rt2x00dev);
break;
@@ -210,7 +210,7 @@
case RT5390:
rt2800_init_rfcsr_5390(rt2x00dev);
break;
-@@ -7590,6 +7692,12 @@ static int rt2800_validate_eeprom(struct
+@@ -7593,6 +7695,12 @@ static int rt2800_validate_eeprom(struct
rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@@ -223,7 +223,7 @@
} else if (rt2x00_rt(rt2x00dev, RT2860) ||
rt2x00_rt(rt2x00dev, RT2872)) {
/*
-@@ -7728,6 +7836,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7731,6 +7839,8 @@ static int rt2800_init_eeprom(struct rt2
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
else if (rt2x00_rt(rt2x00dev, RT3883))
rf = RF3853;
@@ -232,31 +232,31 @@
else
rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
-@@ -7747,6 +7857,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7750,6 +7860,7 @@ static int rt2800_init_eeprom(struct rt2
case RF3320:
case RF3322:
case RF3853:
+ case RF5350:
case RF5360:
+ case RF5362:
case RF5370:
- case RF5372:
-@@ -8301,6 +8412,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -8305,6 +8416,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3290:
case RF3320:
case RF3322:
+ case RF5350:
case RF5360:
+ case RF5362:
case RF5370:
- case RF5372:
-@@ -8439,6 +8551,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -8444,6 +8556,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3070:
case RF3290:
case RF3853:
+ case RF5350:
case RF5360:
+ case RF5362:
case RF5370:
- case RF5372:
-@@ -8478,6 +8591,7 @@ static int rt2800_probe_rt(struct rt2x00
+@@ -8484,6 +8597,7 @@ static int rt2800_probe_rt(struct rt2x00
case RT3572:
case RT3593:
case RT3883: