From 236e7ee23997523bbb5d8bda001768523967d99a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 5 Jun 2014 14:09:14 +0000 Subject: rt2x00: merge beacon setup fixes, disable unused hw beacon slots Signed-off-by: Felix Fietkau SVN-Revision: 41016 --- .../patches/616-rt2x00-support-rt5350.patch | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch') diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch index fd897e93c8..41a7f34454 100644 --- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch +++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch @@ -10,7 +10,7 @@ #define RF5372 0x5372 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -2993,6 +2993,13 @@ static void rt2800_config_channel_rf53xx +@@ -3038,6 +3038,13 @@ static void rt2800_config_channel_rf53xx rt2800_rfcsr_write(rt2x00dev, 59, r59_non_bt[idx]); @@ -24,7 +24,7 @@ } } } -@@ -3471,6 +3478,7 @@ static void rt2800_config_channel(struct +@@ -3516,6 +3523,7 @@ static void rt2800_config_channel(struct rt2800_config_channel_rf3853(rt2x00dev, conf, rf, info); break; case RF3070: @@ -32,7 +32,7 @@ case RF5360: case RF5370: case RF5372: -@@ -3488,6 +3496,7 @@ static void rt2800_config_channel(struct +@@ -3533,6 +3541,7 @@ static void rt2800_config_channel(struct if (rt2x00_rf(rt2x00dev, RF3070) || rt2x00_rf(rt2x00dev, RF3290) || rt2x00_rf(rt2x00dev, RF3322) || @@ -40,7 +40,7 @@ rt2x00_rf(rt2x00dev, RF5360) || rt2x00_rf(rt2x00dev, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || -@@ -3765,7 +3774,8 @@ static void rt2800_config_channel(struct +@@ -3810,7 +3819,8 @@ static void rt2800_config_channel(struct /* * Clear update flag */ @@ -50,7 +50,7 @@ rt2800_bbp_read(rt2x00dev, 49, &bbp); rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0); rt2800_bbp_write(rt2x00dev, 49, bbp); -@@ -4644,6 +4654,7 @@ void rt2800_vco_calibration(struct rt2x0 +@@ -4689,6 +4699,7 @@ void rt2800_vco_calibration(struct rt2x0 case RF3070: case RF3290: case RF3853: @@ -58,7 +58,7 @@ case RF5360: case RF5370: case RF5372: -@@ -5078,6 +5089,8 @@ static int rt2800_init_registers(struct +@@ -5101,6 +5112,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); -@@ -5733,9 +5746,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5756,9 +5769,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 82, 0x62); @@ -84,7 +84,7 @@ rt2800_bbp_write(rt2x00dev, 86, 0x38); -@@ -5749,9 +5766,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5772,9 +5789,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 104, 0x92); @@ -101,7 +101,7 @@ rt2800_bbp_write(rt2x00dev, 120, 0x50); -@@ -5776,6 +5797,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5799,6 +5820,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) -@@ -6117,6 +6145,7 @@ static void rt2800_init_bbp(struct rt2x0 +@@ -6140,6 +6168,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: -@@ -7068,6 +7097,76 @@ static void rt2800_init_rfcsr_3883(struc +@@ -7091,6 +7120,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); -@@ -7308,6 +7407,9 @@ static void rt2800_init_rfcsr(struct rt2 +@@ -7331,6 +7430,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; -@@ -7567,6 +7669,12 @@ static int rt2800_validate_eeprom(struct +@@ -7590,6 +7692,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)) { /* -@@ -7705,6 +7813,8 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7728,6 +7836,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,7 +232,7 @@ else rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE); -@@ -7724,6 +7834,7 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7747,6 +7857,7 @@ static int rt2800_init_eeprom(struct rt2 case RF3320: case RF3322: case RF3853: @@ -240,7 +240,7 @@ case RF5360: case RF5370: case RF5372: -@@ -8278,6 +8389,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -8301,6 +8412,7 @@ static int rt2800_probe_hw_mode(struct r case RF3290: case RF3320: case RF3322: @@ -248,7 +248,7 @@ case RF5360: case RF5370: case RF5372: -@@ -8416,6 +8528,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -8439,6 +8551,7 @@ static int rt2800_probe_hw_mode(struct r case RF3070: case RF3290: case RF3853: @@ -256,7 +256,7 @@ case RF5360: case RF5370: case RF5372: -@@ -8455,6 +8568,7 @@ static int rt2800_probe_rt(struct rt2x00 +@@ -8478,6 +8591,7 @@ static int rt2800_probe_rt(struct rt2x00 case RT3572: case RT3593: case RT3883: -- cgit v1.2.3