projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
firewall: update to git head
[openwrt.git] / package / mac80211 / patches / 616-rt2x00-support-rt5350.patch
diff --git a/package/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/mac80211/patches/616-rt2x00-support-rt5350.patch
index 3f28648..93c1d61 100644 (file)
--- a/package/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -1,20 +1,16 @@
-Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800.h
-===================================================================
---- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800.h       2013-04-01 18:42:38.843812191 +0200
-+++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800.h    2013-04-01 18:42:44.483812325 +0200
-@@ -69,6 +69,7 @@
- #define RF3322                                0x000c
+--- 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 RF3290                                0x3290
 +#define RF5350                                0x5350
  #define RF5360                                0x5360
  #define RF5370                                0x5370
  #define RF5372                                0x5372
-Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
-===================================================================
---- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2800lib.c    2013-04-01 18:42:38.843812191 +0200
-+++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c 2013-04-01 18:43:27.907813351 +0200
-@@ -2137,6 +2137,15 @@
+--- a/drivers/net/wireless/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/rt2x00/rt2800lib.c
+@@ -2132,6 +2132,15 @@ static void rt2800_config_channel_rf53xx
        if (rf->channel <= 14) {
                int idx = rf->channel-1;
  
@@ -30,7 +26,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                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 */
-@@ -2218,6 +2227,7 @@
+@@ -2589,6 +2598,7 @@ static void rt2800_config_channel(struct
        case RF3322:
                rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
                break;
@@ -38,7 +34,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -2231,6 +2241,7 @@
+@@ -2605,6 +2615,7 @@ static void rt2800_config_channel(struct
  
        if (rt2x00_rf(rt2x00dev, RF3290) ||
            rt2x00_rf(rt2x00dev, RF3322) ||
@@ -46,7 +42,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rf(rt2x00dev, RF5360) ||
            rt2x00_rf(rt2x00dev, RF5370) ||
            rt2x00_rf(rt2x00dev, RF5372) ||
-@@ -2361,7 +2372,8 @@
+@@ -2746,7 +2757,8 @@ static void rt2800_config_channel(struct
        /*
         * Clear update flag
         */
@@ -56,7 +52,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                rt2800_bbp_read(rt2x00dev, 49, &bbp);
                rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
                rt2800_bbp_write(rt2x00dev, 49, bbp);
-@@ -2800,6 +2812,7 @@
+@@ -3185,6 +3197,7 @@ void rt2800_vco_calibration(struct rt2x0
                rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
                break;
        case RF3290:
@@ -64,17 +60,17 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -3124,7 +3137,8 @@
+@@ -3524,7 +3537,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, RT5392) ||
+                  rt2x00_rt(rt2x00dev, RT5592)) {
                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
-               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-@@ -3506,6 +3520,10 @@
+@@ -4043,6 +4057,10 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 4, 0x50);
        }
  
@@ -84,8 +80,8 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
 +
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT5390) ||
-           rt2x00_rt(rt2x00dev, RT5392)) {
-@@ -3518,11 +3536,13 @@
+           rt2x00_rt(rt2x00dev, RT5392))
+@@ -4052,11 +4070,13 @@ static int rt2800_init_bbp(struct rt2x00
            rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
            rt2x00_rt(rt2x00dev, RT3572) ||
@@ -100,7 +96,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                rt2800_bbp_write(rt2x00dev, 47, 0x48);
  
        rt2800_bbp_write(rt2x00dev, 65, 0x2c);
-@@ -3530,6 +3550,7 @@
+@@ -4064,6 +4084,7 @@ static int rt2800_init_bbp(struct rt2x00
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
@@ -108,7 +104,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 68, 0x0b);
-@@ -3539,6 +3560,7 @@
+@@ -4073,6 +4094,7 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 73, 0x12);
        } else if (rt2x00_rt(rt2x00dev, RT3290) ||
                   rt2x00_rt(rt2x00dev, RT3352) ||
@@ -116,7 +112,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                   rt2x00_rt(rt2x00dev, RT5390) ||
                   rt2x00_rt(rt2x00dev, RT5392)) {
                rt2800_bbp_write(rt2x00dev, 69, 0x12);
-@@ -3575,7 +3597,8 @@
+@@ -4109,7 +4131,8 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 79, 0x18);
                rt2800_bbp_write(rt2x00dev, 80, 0x09);
                rt2800_bbp_write(rt2x00dev, 81, 0x33);
@@ -126,7 +122,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                rt2800_bbp_write(rt2x00dev, 78, 0x0e);
                rt2800_bbp_write(rt2x00dev, 80, 0x08);
                rt2800_bbp_write(rt2x00dev, 81, 0x37);
-@@ -3585,6 +3608,7 @@
+@@ -4119,6 +4142,7 @@ static int rt2800_init_bbp(struct rt2x00
  
        rt2800_bbp_write(rt2x00dev, 82, 0x62);
        if (rt2x00_rt(rt2x00dev, RT3290) ||
@@ -134,7 +130,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 83, 0x7a);
-@@ -3594,6 +3618,7 @@
+@@ -4128,6 +4152,7 @@ static int rt2800_init_bbp(struct rt2x00
        if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
                rt2800_bbp_write(rt2x00dev, 84, 0x19);
        else if (rt2x00_rt(rt2x00dev, RT3290) ||
@@ -142,7 +138,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                 rt2x00_rt(rt2x00dev, RT5390) ||
                 rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 84, 0x9a);
-@@ -3602,6 +3627,7 @@
+@@ -4136,6 +4161,7 @@ static int rt2800_init_bbp(struct rt2x00
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
@@ -150,7 +146,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 86, 0x38);
-@@ -3616,6 +3642,7 @@
+@@ -4150,6 +4176,7 @@ static int rt2800_init_bbp(struct rt2x00
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
@@ -158,7 +154,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 92, 0x02);
-@@ -3634,6 +3661,7 @@
+@@ -4168,6 +4195,7 @@ static int rt2800_init_bbp(struct rt2x00
            rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
            rt2x00_rt(rt2x00dev, RT3572) ||
@@ -166,7 +162,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392) ||
            rt2800_is_305x_soc(rt2x00dev))
-@@ -3643,6 +3671,7 @@
+@@ -4177,6 +4205,7 @@ static int rt2800_init_bbp(struct rt2x00
  
        if (rt2x00_rt(rt2x00dev, RT3290) ||
            rt2x00_rt(rt2x00dev, RT3352) ||
@@ -174,7 +170,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 104, 0x92);
-@@ -3653,13 +3682,15 @@
+@@ -4187,13 +4216,15 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 105, 0x1c);
        else if (rt2x00_rt(rt2x00dev, RT3352))
                rt2800_bbp_write(rt2x00dev, 105, 0x34);
@@ -191,7 +187,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390))
                rt2800_bbp_write(rt2x00dev, 106, 0x03);
        else if (rt2x00_rt(rt2x00dev, RT3352))
-@@ -3669,11 +3700,13 @@
+@@ -4203,11 +4234,13 @@ static int rt2800_init_bbp(struct rt2x00
        else
                rt2800_bbp_write(rt2x00dev, 106, 0x35);
  
@@ -206,7 +202,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_bbp_write(rt2x00dev, 128, 0x12);
-@@ -3683,13 +3716,15 @@
+@@ -4217,13 +4250,15 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 135, 0xf6);
        }
  
@@ -223,7 +219,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392)) {
                rt2800_bbp_read(rt2x00dev, 138, &value);
-@@ -3726,7 +3761,8 @@
+@@ -4260,7 +4295,8 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 3, value);
        }
  
@@ -233,7 +229,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                rt2800_bbp_write(rt2x00dev, 163, 0xbd);
                /* Set ITxBF timeout to 0x9c40=1000msec */
                rt2800_bbp_write(rt2x00dev, 179, 0x02);
-@@ -3748,6 +3784,14 @@
+@@ -4282,6 +4318,14 @@ static int rt2800_init_bbp(struct rt2x00
                rt2800_bbp_write(rt2x00dev, 148, 0xc8);
        }
  
@@ -248,7 +244,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        if (rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392)) {
                int ant, div_mode;
-@@ -4142,6 +4186,76 @@
+@@ -4674,6 +4718,76 @@ static void rt2800_init_rfcsr_3572(struc
        rt2800_rfcsr_write(rt2x00dev, 31, 0x10);
  }
  
@@ -325,15 +321,15 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
  static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
  {
        rt2800_rfcsr_write(rt2x00dev, 1, 0x0f);
-@@ -4304,6 +4418,7 @@
+@@ -4899,6 +5013,7 @@ static int rt2800_init_rfcsr(struct rt2x
            !rt2x00_rt(rt2x00dev, RT3352) &&
            !rt2x00_rt(rt2x00dev, RT3390) &&
            !rt2x00_rt(rt2x00dev, RT3572) &&
 +          !rt2x00_rt(rt2x00dev, RT5350) &&
            !rt2x00_rt(rt2x00dev, RT5390) &&
            !rt2x00_rt(rt2x00dev, RT5392) &&
-           !rt2800_is_305x_soc(rt2x00dev))
-@@ -4354,6 +4469,9 @@
+           !rt2x00_rt(rt2x00dev, RT5392) &&
+@@ -4951,6 +5066,9 @@ static int rt2800_init_rfcsr(struct rt2x
        case RT3572:
                rt2800_init_rfcsr_3572(rt2x00dev);
                break;
@@ -343,7 +339,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        case RT5390:
                rt2800_init_rfcsr_5390(rt2x00dev);
                break;
-@@ -4750,6 +4868,12 @@
+@@ -5361,6 +5479,12 @@ static int rt2800_validate_eeprom(struct
                if (rt2x00_get_field16(word, EEPROM_NIC_CONF0_RXPATH) > 2)
                        rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 2);
                rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
@@ -356,24 +352,16 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        }
  
        rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &word);
-@@ -4874,6 +4998,8 @@
-           rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||
-           rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)
-               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);
-+      else if(rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5350)
-+              value = RF5350;
+@@ -5480,6 +5604,8 @@ static int rt2800_init_eeprom(struct rt2
+           rt2x00_rt(rt2x00dev, RT5390) ||
+           rt2x00_rt(rt2x00dev, RT5392))
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
++      else if (rt2x00_rt(rt2x00dev, RT5350))
++              rf = RF5350;
        else
-               value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
+               rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
  
-@@ -4891,6 +5017,7 @@
-       case RT3352:
-       case RT3390:
-       case RT3572:
-+      case RT5350:
-       case RT5390:
-       case RT5392:
-               break;
-@@ -4912,6 +5039,7 @@
+@@ -5496,6 +5622,7 @@ static int rt2800_init_eeprom(struct rt2
        case RF3290:
        case RF3320:
        case RF3322:
@@ -381,7 +369,7 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
        case RF5360:
        case RF5370:
        case RF5372:
-@@ -5274,7 +5402,8 @@
+@@ -5993,7 +6120,8 @@ static int rt2800_probe_hw_mode(struct r
                   rt2x00_rf(rt2x00dev, RF5392)) {
                spec->num_channels = 14;
                spec->channels = rf_vals_3x;
@@ -391,23 +379,29 @@ Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2800lib.c
                spec->num_channels = 14;
                if (spec->clk_is_20mhz)
                        spec->channels = rf_vals_xtal20mhz_3x;
-@@ -5363,6 +5492,7 @@
+@@ -6094,6 +6222,7 @@ static int rt2800_probe_hw_mode(struct r
+       case RF3320:
+       case RF3052:
        case RF3290:
++      case RF5350:
        case RF5360:
        case RF5370:
-+      case RF5350:
        case RF5372:
-       case RF5390:
-       case RF5392:
-Index: compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00.h
-===================================================================
---- compat-wireless-2013-02-22.orig/drivers/net/wireless/rt2x00/rt2x00.h       2013-04-01 18:42:38.843812191 +0200
-+++ compat-wireless-2013-02-22/drivers/net/wireless/rt2x00/rt2x00.h    2013-04-01 18:42:44.487812326 +0200
-@@ -192,6 +192,7 @@
+@@ -6131,6 +6260,7 @@ static int rt2800_probe_rt(struct rt2x00
+       case RT3352:
+       case RT3390:
+       case RT3572:
++      case RT5350:
+       case RT5390:
+       case RT5392:
+       case RT5592:
+--- a/drivers/net/wireless/rt2x00/rt2x00.h
++++ b/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -192,6 +192,7 @@ struct rt2x00_chip {
  #define RT3572                0x3572
  #define RT3593                0x3593
  #define RT3883                0x3883  /* WSOC */
 +#define RT5350                0x5350  /* WSOC 2.4GHz */
  #define RT5390                0x5390  /* 2.4GHz */
  #define RT5392                0x5392  /* 2.4GHz */
- 
+ #define RT5592                0x5592
OpenWrt main development branch