mac80211: update to version 2015-06-22
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46198
This commit is contained in:
@@ -210,7 +210,7 @@
|
||||
case RT5592:
|
||||
*txwi_size = TXWI_DESC_SIZE_5WORDS;
|
||||
*rxwi_size = RXWI_DESC_SIZE_6WORDS;
|
||||
@@ -3326,6 +3399,312 @@ static void rt2800_config_channel_rf55xx
|
||||
@@ -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 @@ static void rt2800_config_channel(struct
|
||||
@@ -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 @@ static void rt2800_config_channel(struct
|
||||
@@ -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 @@ static void rt2800_config_channel(struct
|
||||
@@ -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 @@ static void rt2800_config_channel(struct
|
||||
@@ -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 @@ static void rt2800_config_channel(struct
|
||||
@@ -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);
|
||||
|
||||
@@ -4725,6 +5108,14 @@ void rt2800_vco_calibration(struct rt2x0
|
||||
@@ -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;
|
||||
}
|
||||
@@ -5125,9 +5516,42 @@ static int rt2800_init_registers(struct
|
||||
@@ -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 {
|
||||
@@ -6159,6 +6583,225 @@ static void rt2800_init_bbp_5592(struct
|
||||
@@ -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;
|
||||
@@ -6201,7 +6844,10 @@ static void rt2800_init_bbp(struct rt2x0
|
||||
@@ -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);
|
||||
@@ -7415,6 +8061,295 @@ static void rt2800_init_rfcsr_5592(struc
|
||||
@@ -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)) {
|
||||
@@ -7450,7 +8385,10 @@ static void rt2800_init_rfcsr(struct rt2
|
||||
@@ -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);
|
||||
@@ -7882,6 +8820,7 @@ static int rt2800_init_eeprom(struct rt2
|
||||
@@ -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",
|
||||
@@ -8448,6 +9387,7 @@ static int rt2800_probe_hw_mode(struct r
|
||||
@@ -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;
|
||||
@@ -8588,6 +9528,7 @@ static int rt2800_probe_hw_mode(struct r
|
||||
@@ -8562,6 +9502,7 @@ static int rt2800_probe_hw_mode(struct r
|
||||
case RF5372:
|
||||
case RF5390:
|
||||
case RF5392:
|
||||
|
||||
Reference in New Issue
Block a user