diff options
Diffstat (limited to 'package/mac80211/patches/616-rt2x00-support-rt5350.patch')
-rw-r--r-- | package/mac80211/patches/616-rt2x00-support-rt5350.patch | 119 |
1 files changed, 57 insertions, 62 deletions
diff --git a/package/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/mac80211/patches/616-rt2x00-support-rt5350.patch index 9dc5835605..8d3fcd245a 100644 --- a/package/mac80211/patches/616-rt2x00-support-rt5350.patch +++ b/package/mac80211/patches/616-rt2x00-support-rt5350.patch @@ -1,8 +1,8 @@ --- a/drivers/net/wireless/rt2x00/rt2800.h +++ b/drivers/net/wireless/rt2x00/rt2800.h @@ -71,6 +71,7 @@ - #define RF3053 0x000d #define RF5592 0x000f + #define RF3070 0x3070 #define RF3290 0x3290 +#define RF5350 0x5350 #define RF5360 0x5360 @@ -10,39 +10,37 @@ #define RF5372 0x5372 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -2140,6 +2140,15 @@ static void rt2800_config_channel_rf53xx - if (rf->channel <= 14) { - int idx = rf->channel-1; +@@ -2705,6 +2705,13 @@ static void rt2800_config_channel_rf53xx -+ if (rt2x00_rt(rt2x00dev, RT5350)) { -+ static const char r59_non_bt[] = {0x0b, 0x0b, -+ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, -+ 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06}; + rt2800_rfcsr_write(rt2x00dev, 59, + r59_non_bt[idx]); ++ } else if (rt2x00_rt(rt2x00dev, RT5350)) { ++ static const char r59_non_bt[] = {0x0b, 0x0b, ++ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, ++ 0x0a, 0x09, 0x08, 0x07, 0x07, 0x06}; + -+ rt2800_rfcsr_write(rt2x00dev, 59, -+ r59_non_bt[idx]); -+ } -+ - if (test_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags)) { - if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { - /* r55/r59 value array of channel 1~14 */ -@@ -2597,6 +2606,7 @@ static void rt2800_config_channel(struct - case RF3322: ++ rt2800_rfcsr_write(rt2x00dev, 59, ++ r59_non_bt[idx]); + } + } + } +@@ -3142,6 +3149,7 @@ static void rt2800_config_channel(struct rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info); break; + case RF3070: + case RF5350: case RF5360: case RF5370: case RF5372: -@@ -2613,6 +2623,7 @@ static void rt2800_config_channel(struct - - if (rt2x00_rf(rt2x00dev, RF3290) || +@@ -3159,6 +3167,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, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || -@@ -2777,7 +2788,8 @@ static void rt2800_config_channel(struct +@@ -3399,7 +3408,8 @@ static void rt2800_config_channel(struct /* * Clear update flag */ @@ -52,25 +50,24 @@ rt2800_bbp_read(rt2x00dev, 49, &bbp); rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0); rt2800_bbp_write(rt2x00dev, 49, bbp); -@@ -3223,6 +3235,7 @@ void rt2800_vco_calibration(struct rt2x0 - rt2800_rfcsr_write(rt2x00dev, 7, rfcsr); - break; +@@ -4273,6 +4283,7 @@ void rt2800_vco_calibration(struct rt2x0 + case RF3053: + case RF3070: case RF3290: + case RF5350: case RF5360: case RF5370: case RF5372: -@@ -3562,7 +3575,8 @@ static int rt2800_init_registers(struct - } else if (rt2x00_rt(rt2x00dev, RT3572)) { - rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400); - rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); -- } else if (rt2x00_rt(rt2x00dev, RT5390) || -+ } else if (rt2x00_rt(rt2x00dev, RT5350) || -+ rt2x00_rt(rt2x00dev, RT5390) || - rt2x00_rt(rt2x00dev, RT5392) || - rt2x00_rt(rt2x00dev, RT5592)) { +@@ -4669,6 +4680,8 @@ static int rt2800_init_registers(struct rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); -@@ -4215,9 +4229,13 @@ static void rt2800_init_bbp_3352(struct + rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); + rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); ++ } else if (rt2x00_rt(rt2x00dev, RT5350)) { ++ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); + } else { + rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000); + rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); +@@ -5310,9 +5323,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 82, 0x62); @@ -87,7 +84,7 @@ rt2800_bbp_write(rt2x00dev, 86, 0x38); -@@ -4231,9 +4249,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5326,9 +5343,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 104, 0x92); @@ -104,7 +101,7 @@ rt2800_bbp_write(rt2x00dev, 120, 0x50); -@@ -4258,6 +4280,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5353,6 +5374,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 143, 0xa2); rt2800_bbp_write(rt2x00dev, 148, 0xc8); @@ -118,7 +115,7 @@ } static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev) -@@ -4542,6 +4571,7 @@ static void rt2800_init_bbp(struct rt2x0 +@@ -5653,6 +5681,7 @@ static void rt2800_init_bbp(struct rt2x0 rt2800_init_bbp_3290(rt2x00dev); break; case RT3352: @@ -126,8 +123,8 @@ rt2800_init_bbp_3352(rt2x00dev); break; case RT3390: -@@ -5181,6 +5211,76 @@ static void rt2800_init_rfcsr_3572(struc - rt2800_normal_mode_setup_3xxx(rt2x00dev); +@@ -6463,6 +6492,76 @@ static void rt2800_init_rfcsr_3593(struc + /* TODO: enable stream mode support */ } +static void rt2800_init_rfcsr_5350(struct rt2x00_dev *rt2x00dev) @@ -203,9 +200,9 @@ static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev) { rt2800_rf_init_calibration(rt2x00dev, 2); -@@ -5409,6 +5509,9 @@ static void rt2800_init_rfcsr(struct rt2 - case RT3572: - rt2800_init_rfcsr_3572(rt2x00dev); +@@ -6700,6 +6799,9 @@ static void rt2800_init_rfcsr(struct rt2 + case RT3593: + rt2800_init_rfcsr_3593(rt2x00dev); break; + case RT5350: + rt2800_init_rfcsr_5350(rt2x00dev); @@ -213,9 +210,9 @@ case RT5390: rt2800_init_rfcsr_5390(rt2x00dev); break; -@@ -5621,6 +5724,12 @@ static int rt2800_validate_eeprom(struct +@@ -6949,6 +7051,12 @@ static int rt2800_validate_eeprom(struct rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820); - rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word); + rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word); rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word); + } else if (rt2x00_rt(rt2x00dev, RT5350)) { + rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 1); @@ -226,16 +223,16 @@ } else if (rt2x00_rt(rt2x00dev, RT2860) || rt2x00_rt(rt2x00dev, RT2872)) { /* -@@ -5749,6 +5858,8 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7082,6 +7190,8 @@ static int rt2800_init_eeprom(struct rt2 rt2x00_rt(rt2x00dev, RT5390) || rt2x00_rt(rt2x00dev, RT5392)) - rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf); + rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf); + else if (rt2x00_rt(rt2x00dev, RT5350)) + rf = RF5350; else rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE); -@@ -5765,6 +5876,7 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7100,6 +7210,7 @@ static int rt2800_init_eeprom(struct rt2 case RF3290: case RF3320: case RF3322: @@ -243,35 +240,33 @@ case RF5360: case RF5370: case RF5372: -@@ -6263,7 +6375,8 @@ static int rt2800_probe_hw_mode(struct r - rt2x00_rf(rt2x00dev, RF5392)) { - spec->num_channels = 14; - spec->channels = rf_vals_3x; -- } else if (rt2x00_rf(rt2x00dev, RF3322)) { -+ } else if (rt2x00_rf(rt2x00dev, RF3322) || -+ rt2x00_rf(rt2x00dev, RF5350)) { - spec->num_channels = 14; - if (spec->clk_is_20mhz) - spec->channels = rf_vals_xtal20mhz_3x; -@@ -6364,6 +6477,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -7595,6 +7706,7 @@ static int rt2800_probe_hw_mode(struct r + case RF3290: case RF3320: - case RF3052: + case RF3322: ++ case RF5350: + case RF5360: + case RF5370: + case RF5372: +@@ -7727,6 +7839,7 @@ static int rt2800_probe_hw_mode(struct r + case RF3053: + case RF3070: case RF3290: + case RF5350: case RF5360: case RF5370: case RF5372: -@@ -6401,6 +6515,7 @@ static int rt2800_probe_rt(struct rt2x00 - case RT3352: +@@ -7765,6 +7878,7 @@ static int rt2800_probe_rt(struct rt2x00 case RT3390: case RT3572: + case RT3593: + case RT5350: case RT5390: case RT5392: case RT5592: --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h -@@ -181,6 +181,7 @@ struct rt2x00_chip { +@@ -169,6 +169,7 @@ struct rt2x00_chip { #define RT3572 0x3572 #define RT3593 0x3593 #define RT3883 0x3883 /* WSOC */ |