hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: rt2x00: fix default register settings for rt5350

Browse Source 
Comparing the RTSDK driver and mac80211 revealed, that this register needs
to have a special setup on rt5350.

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37608
master
John Crispin 11 years ago
parent 7f895c6776
commit 2b906791be
1 changed files with 38 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 71
      package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch

71
package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
Unescape View File

@ -1,5 +1,7 @@
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
Index: compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2800.h
===================================================================
--- compat-wireless-2013-06-27.orig/drivers/net/wireless/rt2x00/rt2800.h 2013-07-27 18:03:04.837450150 +0200
+++ compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2800.h 2013-07-27 18:03:04.973450152 +0200
@@ -71,6 +71,7 @@
#define RF3053 0x000d
#define RF5592 0x000f
@ -8,9 +10,11 @@
#define RF5360 0x5360
#define RF5370 0x5370
#define RF5372 0x5372
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2141,6 +2141,15 @@ static void rt2800_config_channel_rf53xx
Index: compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2800lib.c
===================================================================
--- compat-wireless-2013-06-27.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2013-07-27 18:03:04.949450152 +0200
+++ compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2800lib.c 2013-07-27 18:20:44.749475406 +0200
@@ -2141,6 +2141,15 @@
if (rf->channel <= 14) {
int idx = rf->channel-1;
@ -26,7 +30,7 @@
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 */
@@ -2598,6 +2607,7 @@ static void rt2800_config_channel(struct
@@ -2598,6 +2607,7 @@
case RF3322:
rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
break;
@ -34,7 +38,7 @@
case RF5360:
case RF5370:
case RF5372:
@@ -2614,6 +2624,7 @@ static void rt2800_config_channel(struct
@@ -2614,6 +2624,7 @@
if (rt2x00_rf(rt2x00dev, RF3290) ||
rt2x00_rf(rt2x00dev, RF3322) ||
@ -42,7 +46,7 @@
rt2x00_rf(rt2x00dev, RF5360) ||
rt2x00_rf(rt2x00dev, RF5370) ||
rt2x00_rf(rt2x00dev, RF5372) ||
@@ -2778,7 +2789,8 @@ static void rt2800_config_channel(struct
@@ -2778,7 +2789,8 @@
/*
* Clear update flag
*/
@ -52,7 +56,7 @@
rt2800_bbp_read(rt2x00dev, 49, &bbp);
rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
rt2800_bbp_write(rt2x00dev, 49, bbp);
@@ -3224,6 +3236,7 @@ void rt2800_vco_calibration(struct rt2x0
@@ -3224,6 +3236,7 @@
rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
break;
case RF3290:
@ -60,17 +64,16 @@
case RF5360:
case RF5370:
case RF5372:
@@ -3563,7 +3576,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)) {
@@ -3569,6 +3582,8 @@
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
@@ -4216,9 +4230,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);
@@ -4216,9 +4231,13 @@
rt2800_bbp_write(rt2x00dev, 82, 0x62);
@ -87,7 +90,7 @@
rt2800_bbp_write(rt2x00dev, 86, 0x38);
@@ -4232,9 +4250,13 @@ static void rt2800_init_bbp_3352(struct
@@ -4232,9 +4251,13 @@
rt2800_bbp_write(rt2x00dev, 104, 0x92);
@ -104,7 +107,7 @@
rt2800_bbp_write(rt2x00dev, 120, 0x50);
@@ -4259,6 +4281,13 @@ static void rt2800_init_bbp_3352(struct
@@ -4259,6 +4282,13 @@
rt2800_bbp_write(rt2x00dev, 143, 0xa2);
rt2800_bbp_write(rt2x00dev, 148, 0xc8);
@ -118,7 +121,7 @@
}
static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
@@ -4543,6 +4572,7 @@ static void rt2800_init_bbp(struct rt2x0
@@ -4543,6 +4573,7 @@
rt2800_init_bbp_3290(rt2x00dev);
break;
case RT3352:
@ -126,7 +129,7 @@
rt2800_init_bbp_3352(rt2x00dev);
break;
case RT3390:
@@ -5182,6 +5212,76 @@ static void rt2800_init_rfcsr_3572(struc
@@ -5182,6 +5213,76 @@
rt2800_normal_mode_setup_3xxx(rt2x00dev);
}
@ -203,7 +206,7 @@
static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
{
rt2800_rf_init_calibration(rt2x00dev, 2);
@@ -5410,6 +5510,9 @@ static void rt2800_init_rfcsr(struct rt2
@@ -5410,6 +5511,9 @@
case RT3572:
rt2800_init_rfcsr_3572(rt2x00dev);
break;
@ -213,7 +216,7 @@
case RT5390:
rt2800_init_rfcsr_5390(rt2x00dev);
break;
@@ -5621,6 +5724,12 @@ static int rt2800_validate_eeprom(struct
@@ -5621,6 +5725,12 @@
rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@ -226,7 +229,7 @@
} else if (rt2x00_rt(rt2x00dev, RT2860) ||
rt2x00_rt(rt2x00dev, RT2872)) {
/*
@@ -5749,6 +5858,8 @@ static int rt2800_init_eeprom(struct rt2
@@ -5749,6 +5859,8 @@
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
@ -235,7 +238,7 @@
else
rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
@@ -5765,6 +5876,7 @@ static int rt2800_init_eeprom(struct rt2
@@ -5765,6 +5877,7 @@
case RF3290:
case RF3320:
case RF3322:
@ -243,7 +246,7 @@
case RF5360:
case RF5370:
case RF5372:
@@ -6263,7 +6375,8 @@ static int rt2800_probe_hw_mode(struct r
@@ -6263,7 +6376,8 @@
rt2x00_rf(rt2x00dev, RF5392)) {
spec->num_channels = 14;
spec->channels = rf_vals_3x;
@ -253,7 +256,7 @@
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
@@ -6364,6 +6478,7 @@
case RF3320:
case RF3052:
case RF3290:
@ -261,7 +264,7 @@
case RF5360:
case RF5370:
case RF5372:
@@ -6401,6 +6515,7 @@ static int rt2800_probe_rt(struct rt2x00
@@ -6401,6 +6516,7 @@
case RT3352:
case RT3390:
case RT3572:
@ -269,9 +272,11 @@
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 {
Index: compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2x00.h
===================================================================
--- compat-wireless-2013-06-27.orig/drivers/net/wireless/rt2x00/rt2x00.h 2013-07-27 18:03:04.865450150 +0200
+++ compat-wireless-2013-06-27/drivers/net/wireless/rt2x00/rt2x00.h 2013-07-27 18:03:04.977450152 +0200
@@ -181,6 +181,7 @@
#define RT3572 0x3572
#define RT3593 0x3593
#define RT3883 0x3883 /* WSOC */

Write Preview
Loading…
Cancel
Save