mac80211: update to version 2015-06-22

[openwrt/svn-archive/archive.git] / package / kernel / mac80211 / patches / 910-01-add-support-for-mt7620.patch

diff --git a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
index eb94b4b05b03006330064575f6edc5c811ad2813..5ddb8214bd76684878ddecc230cd250c863b5c27 100644 (file)
--- a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
+++ b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
@@ -73,7 +73,7 @@
  #define WAIT_FOR_RF(__dev, __reg) \
        rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))
  #define WAIT_FOR_MCU(__dev, __reg) \
-@@ -186,19 +188,55 @@
+@@ -186,19 +188,55 @@ static void rt2800_rfcsr_write(struct rt
         * Wait until the RFCSR becomes available, afterwards we
         * can safely write the new data into the register.
         */
@@ -136,7 +136,7 @@
  static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
                              const unsigned int word, u8 *value)
  {
-@@ -214,22 +252,47 @@
+@@ -214,22 +252,47 @@ static void rt2800_rfcsr_read(struct rt2
         * doesn't become available in time, reg will be 0xffffffff
         * which means we return 0xff to the caller.
         */
@@ -193,7 +193,7 @@
  static void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
                            const unsigned int word, const u32 value)
  {
-@@ -566,6 +629,16 @@
+@@ -566,6 +629,16 @@ void rt2800_get_txwi_rxwi_size(struct rt
                *rxwi_size = RXWI_DESC_SIZE_5WORDS;
                break;
  
@@ -210,7 +210,7 @@
        case RT5592:
                *txwi_size = TXWI_DESC_SIZE_5WORDS;
                *rxwi_size = RXWI_DESC_SIZE_6WORDS;
-@@ -3326,6 +3399,312 @@
+@@ -3302,6 +3375,312 @@ static void rt2800_config_channel_rf55xx
        rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);
  }
  
@@ -523,7 +523,7 @@
  static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,
                                           const unsigned int word,
                                           const u8 value)
-@@ -3482,7 +3861,7 @@
+@@ -3458,7 +3837,7 @@ static void rt2800_config_channel(struct
                                  struct channel_info *info)
  {
        u32 reg;
@@ -532,7 +532,7 @@
        u8 bbp, rfcsr;
  
        info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-@@ -3536,6 +3915,9 @@
+@@ -3512,6 +3891,9 @@ static void rt2800_config_channel(struct
        case RF5592:
                rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
                break;
@@ -542,7 +542,7 @@
        default:
                rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
        }
-@@ -3638,7 +4020,7 @@
+@@ -3614,7 +3996,7 @@ static void rt2800_config_channel(struct
                else if (rt2x00_rt(rt2x00dev, RT3593) ||
                         rt2x00_rt(rt2x00dev, RT3883))
                        rt2800_bbp_write(rt2x00dev, 82, 0x82);
@@ -551,7 +551,7 @@
                        rt2800_bbp_write(rt2x00dev, 82, 0xf2);
  
                if (rt2x00_rt(rt2x00dev, RT3593) ||
-@@ -3660,7 +4042,7 @@
+@@ -3636,7 +4018,7 @@ static void rt2800_config_channel(struct
        if (rt2x00_rt(rt2x00dev, RT3572))
                rt2800_rfcsr_write(rt2x00dev, 8, 0);
  
@@ -560,7 +560,7 @@
  
        switch (rt2x00dev->default_ant.tx_chain_num) {
        case 3:
-@@ -3709,6 +4091,7 @@
+@@ -3685,6 +4067,7 @@ static void rt2800_config_channel(struct
  
        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
        rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
@@ -568,7 +568,7 @@
  
        rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
  
-@@ -4718,6 +5101,14 @@
+@@ -4701,6 +5084,14 @@ void rt2800_vco_calibration(struct rt2x0
                rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
                rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
                break;
@@ -583,7 +583,7 @@
        default:
                return;
        }
-@@ -5118,9 +5509,42 @@
+@@ -5101,9 +5492,42 @@ static int rt2800_init_registers(struct
        } else if (rt2x00_rt(rt2x00dev, RT5390) ||
                   rt2x00_rt(rt2x00dev, RT5392) ||
                   rt2x00_rt(rt2x00dev, RT5592)) {
@@ -629,7 +629,7 @@
        } else if (rt2x00_rt(rt2x00dev, RT5350)) {
                rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
        } else {
-@@ -6152,6 +6576,225 @@
+@@ -6135,6 +6559,225 @@ static void rt2800_init_bbp_5592(struct
                rt2800_bbp_write(rt2x00dev, 103, 0xc0);
  }
  
@@ -855,7 +855,7 @@
  static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
  {
        unsigned int i;
-@@ -6194,7 +6837,10 @@
+@@ -6177,7 +6820,10 @@ static void rt2800_init_bbp(struct rt2x0
                return;
        case RT5390:
        case RT5392:
@@ -867,7 +867,7 @@
                break;
        case RT5592:
                rt2800_init_bbp_5592(rt2x00dev);
-@@ -7408,6 +8054,295 @@
+@@ -7391,6 +8037,295 @@ static void rt2800_init_rfcsr_5592(struc
        rt2800_led_open_drain_enable(rt2x00dev);
  }
  
@@ -1163,7 +1163,7 @@
  static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
  {
        if (rt2800_is_305x_soc(rt2x00dev)) {
-@@ -7443,7 +8378,10 @@
+@@ -7426,7 +8361,10 @@ static void rt2800_init_rfcsr(struct rt2
                rt2800_init_rfcsr_5350(rt2x00dev);
                break;
        case RT5390:
@@ -1175,7 +1175,7 @@
                break;
        case RT5392:
                rt2800_init_rfcsr_5392(rt2x00dev);
-@@ -7875,6 +8813,7 @@
+@@ -7858,6 +8796,7 @@ static int rt2800_init_eeprom(struct rt2
        case RF5390:
        case RF5392:
        case RF5592:
@@ -1183,7 +1183,7 @@
                break;
        default:
                rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
-@@ -8441,6 +9380,7 @@
+@@ -8422,6 +9361,7 @@ static int rt2800_probe_hw_mode(struct r
        case RF5372:
        case RF5390:
        case RF5392:
@@ -1191,7 +1191,7 @@
                spec->num_channels = 14;
                if (spec->clk_is_20mhz)
                        spec->channels = rf_vals_xtal20mhz_3x;
-@@ -8581,6 +9521,7 @@
+@@ -8562,6 +9502,7 @@ static int rt2800_probe_hw_mode(struct r
        case RF5372:
        case RF5390:
        case RF5392: