mac80211: update to wireless-testing 2013-11-05

[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 610-rt2x00-fix-rt3352-ext-pa.patch

diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
index c0829d74fbbb278fae78f82b2afdadb4ace53e8f..edcfa6e43d445e2cde138c1587fb63d1a489cb21 100644 (file)
--- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
+++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3186,11 +3186,17 @@ static void rt2800_config_channel(struct
+@@ -3178,11 +3178,17 @@ static void rt2800_config_channel(struct
        /*
         * Change BBP settings
         */
@@ -18,7 +18,7 @@
        } else if (rt2x00_rt(rt2x00dev, RT3593)) {
                if (rf->channel > 14) {
                        /* Disable CCK Packet detection on 5GHz */
-@@ -3204,14 +3210,8 @@ static void rt2800_config_channel(struct
+@@ -3196,14 +3202,8 @@ static void rt2800_config_channel(struct
                else
                        rt2800_bbp_write(rt2x00dev, 105, 0x34);
  
@@ -33,7 +33,7 @@
                rt2800_bbp_write(rt2x00dev, 86, 0);
        }
  
-@@ -6093,6 +6093,12 @@ static void rt2800_init_rfcsr_3290(struc
+@@ -6127,6 +6127,12 @@ static void rt2800_init_rfcsr_3290(struc
  
  static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
  {
@@ -46,7 +46,7 @@
        rt2800_rf_init_calibration(rt2x00dev, 30);
  
        rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-@@ -6128,15 +6134,30 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -6162,15 +6168,30 @@ static void rt2800_init_rfcsr_3352(struc
        rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
        rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
        rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
@@ -80,7 +80,7 @@
        rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
        rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
        rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
-@@ -6144,15 +6165,20 @@ static void rt2800_init_rfcsr_3352(struc
+@@ -6178,15 +6199,20 @@ static void rt2800_init_rfcsr_3352(struc
        rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
        rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
        rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
@@ -110,7 +110,7 @@
        rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
        rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
        rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-@@ -7004,6 +7030,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7046,6 +7072,7 @@ static int rt2800_init_eeprom(struct rt2
         * RT53xx: defined in "EEPROM_CHIP_ID" field
         */
        if (rt2x00_rt(rt2x00dev, RT3290) ||
@@ -118,7 +118,7 @@
            rt2x00_rt(rt2x00dev, RT5390) ||
            rt2x00_rt(rt2x00dev, RT5392))
                rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-@@ -7094,7 +7121,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7137,7 +7164,8 @@ static int rt2800_init_eeprom(struct rt2
        /*
         * Detect if this device has Bluetooth co-existence.
         */
@@ -128,7 +128,7 @@
                __set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
  
        /*
-@@ -7123,6 +7151,22 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7166,6 +7194,22 @@ static int rt2800_init_eeprom(struct rt2
                                        EIRP_MAX_TX_POWER_LIMIT)
                __set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
  
@@ -153,7 +153,7 @@
  
 --- a/drivers/net/wireless/rt2x00/rt2800.h
 +++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2299,6 +2299,12 @@ struct mac_iveiv_entry {
+@@ -2301,6 +2301,12 @@ struct mac_iveiv_entry {
  #define RFCSR36_RF_BS                 FIELD8(0x80)
  
  /*
@@ -166,7 +166,7 @@
   * RFCSR 38:
   */
  #define RFCSR38_RX_LO1_EN             FIELD8(0x20)
-@@ -2310,6 +2316,18 @@ struct mac_iveiv_entry {
+@@ -2312,6 +2318,18 @@ struct mac_iveiv_entry {
  #define RFCSR39_RX_LO2_EN             FIELD8(0x80)
  
  /*
@@ -185,7 +185,7 @@
   * RFCSR 49:
   */
  #define RFCSR49_TX                    FIELD8(0x3f)
-@@ -2322,6 +2340,8 @@ struct mac_iveiv_entry {
+@@ -2324,6 +2342,8 @@ struct mac_iveiv_entry {
   * RFCSR 50:
   */
  #define RFCSR50_TX                    FIELD8(0x3f)
@@ -194,7 +194,7 @@
  #define RFCSR50_EP                    FIELD8(0xc0)
  /* bits for RT3593 */
  #define RFCSR50_TX_LO1_EN             FIELD8(0x20)
-@@ -2469,6 +2489,8 @@ enum rt2800_eeprom_word {
+@@ -2471,6 +2491,8 @@ enum rt2800_eeprom_word {
   * INTERNAL_TX_ALC: 0: disable, 1: enable
   * BT_COEXIST: 0: disable, 1: enable
   * DAC_TEST: 0: disable, 1: enable
@@ -202,9 +202,9 @@
 + * EXTERNAL_TX1_PA: 0: disable, 1: enable (only on RT3352)
   */
  #define EEPROM_NIC_CONF1_HW_RADIO             FIELD16(0x0001)
- #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC              FIELD16(0x0002)
-@@ -2485,6 +2507,8 @@ enum rt2800_eeprom_word {
- #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC              FIELD16(0x2000)
+ #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC      FIELD16(0x0002)
+@@ -2487,6 +2509,8 @@ enum rt2800_eeprom_word {
+ #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC      FIELD16(0x2000)
  #define EEPROM_NIC_CONF1_BT_COEXIST           FIELD16(0x4000)
  #define EEPROM_NIC_CONF1_DAC_TEST             FIELD16(0x8000)
 +#define EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352 FIELD16(0x4000)
@@ -214,7 +214,7 @@
   * EEPROM frequency
 --- a/drivers/net/wireless/rt2x00/rt2x00.h
 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -727,6 +727,8 @@ enum rt2x00_capability_flags {
+@@ -716,6 +716,8 @@ enum rt2x00_capability_flags {
        CAPABILITY_DOUBLE_ANTENNA,
        CAPABILITY_BT_COEXIST,
        CAPABILITY_VCO_RECALIBRATION,