projects
/
librecmc
/
librecmc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to wireless-testing 2016-01-10
[librecmc/librecmc.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 354aee7bb68065c3043e49925e4fb6b7f6f40fde..3d7c352281801701b2196095207befa5a7966917 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
@@
-210,7
+210,7
@@
case RT5592:
*txwi_size = TXWI_DESC_SIZE_5WORDS;
*rxwi_size = RXWI_DESC_SIZE_6WORDS;
case RT5592:
*txwi_size = TXWI_DESC_SIZE_5WORDS;
*rxwi_size = RXWI_DESC_SIZE_6WORDS;
-@@ -330
2,6 +3375
,312 @@ static void rt2800_config_channel_rf55xx
+@@ -330
3,6 +3376
,312 @@ static void rt2800_config_channel_rf55xx
rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);
}
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)
static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,
const unsigned int word,
const u8 value)
-@@ -345
8,7 +3837
,7 @@ static void rt2800_config_channel(struct
+@@ -345
9,7 +3838
,7 @@ static void rt2800_config_channel(struct
struct channel_info *info)
{
u32 reg;
struct channel_info *info)
{
u32 reg;
@@
-532,7
+532,7
@@
u8 bbp, rfcsr;
info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
u8 bbp, rfcsr;
info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-@@ -351
2,6 +3891
,9 @@ static void rt2800_config_channel(struct
+@@ -351
3,6 +3892
,9 @@ static void rt2800_config_channel(struct
case RF5592:
rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
break;
case RF5592:
rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
break;
@@
-542,7
+542,7
@@
default:
rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
}
default:
rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
}
-@@ -361
4,7 +3996
,7 @@ static void rt2800_config_channel(struct
+@@ -361
5,7 +3997
,7 @@ static void rt2800_config_channel(struct
else if (rt2x00_rt(rt2x00dev, RT3593) ||
rt2x00_rt(rt2x00dev, RT3883))
rt2800_bbp_write(rt2x00dev, 82, 0x82);
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) ||
rt2800_bbp_write(rt2x00dev, 82, 0xf2);
if (rt2x00_rt(rt2x00dev, RT3593) ||
-@@ -363
6,7 +4018
,7 @@ static void rt2800_config_channel(struct
+@@ -363
7,7 +4019
,7 @@ static void rt2800_config_channel(struct
if (rt2x00_rt(rt2x00dev, RT3572))
rt2800_rfcsr_write(rt2x00dev, 8, 0);
if (rt2x00_rt(rt2x00dev, RT3572))
rt2800_rfcsr_write(rt2x00dev, 8, 0);
@@
-560,7
+560,7
@@
switch (rt2x00dev->default_ant.tx_chain_num) {
case 3:
switch (rt2x00dev->default_ant.tx_chain_num) {
case 3:
-@@ -368
5,6 +4067
,7 @@ static void rt2800_config_channel(struct
+@@ -368
6,6 +4068
,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);
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);
rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
-@@ -470
1,6 +5084
,14 @@ void rt2800_vco_calibration(struct rt2x0
+@@ -470
2,6 +5085
,14 @@ void rt2800_vco_calibration(struct rt2x0
rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
break;
rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
break;
@@
-583,7
+583,7
@@
default:
return;
}
default:
return;
}
-@@ -510
1,9 +5492
,42 @@ static int rt2800_init_registers(struct
+@@ -510
2,9 +5493
,42 @@ static int rt2800_init_registers(struct
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392) ||
rt2x00_rt(rt2x00dev, RT5592)) {
} 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 {
} else if (rt2x00_rt(rt2x00dev, RT5350)) {
rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
} else {
-@@ -613
5,6 +6559
,225 @@ static void rt2800_init_bbp_5592(struct
+@@ -613
6,6 +6560
,225 @@ static void rt2800_init_bbp_5592(struct
rt2800_bbp_write(rt2x00dev, 103, 0xc0);
}
rt2800_bbp_write(rt2x00dev, 103, 0xc0);
}
@@
-855,7
+855,7
@@
static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
{
unsigned int i;
static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
{
unsigned int i;
-@@ -617
7,7 +6820
,10 @@ static void rt2800_init_bbp(struct rt2x0
+@@ -617
8,7 +6821
,10 @@ static void rt2800_init_bbp(struct rt2x0
return;
case RT5390:
case RT5392:
return;
case RT5390:
case RT5392:
@@
-867,7
+867,7
@@
break;
case RT5592:
rt2800_init_bbp_5592(rt2x00dev);
break;
case RT5592:
rt2800_init_bbp_5592(rt2x00dev);
-@@ -739
1,6 +8037
,296 @@ static void rt2800_init_rfcsr_5592(struc
+@@ -739
2,6 +8038
,296 @@ static void rt2800_init_rfcsr_5592(struc
rt2800_led_open_drain_enable(rt2x00dev);
}
rt2800_led_open_drain_enable(rt2x00dev);
}
@@
-1164,7
+1164,7
@@
static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
{
if (rt2800_is_305x_soc(rt2x00dev)) {
static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
{
if (rt2800_is_305x_soc(rt2x00dev)) {
-@@ -742
6,7 +8362
,10 @@ static void rt2800_init_rfcsr(struct rt2
+@@ -742
7,7 +8363
,10 @@ static void rt2800_init_rfcsr(struct rt2
rt2800_init_rfcsr_5350(rt2x00dev);
break;
case RT5390:
rt2800_init_rfcsr_5350(rt2x00dev);
break;
case RT5390:
@@
-1176,7
+1176,7
@@
break;
case RT5392:
rt2800_init_rfcsr_5392(rt2x00dev);
break;
case RT5392:
rt2800_init_rfcsr_5392(rt2x00dev);
-@@ -785
8,6 +8797
,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -785
9,6 +8798
,7 @@ static int rt2800_init_eeprom(struct rt2
case RF5390:
case RF5392:
case RF5592:
case RF5390:
case RF5392:
case RF5592:
@@
-1184,7
+1184,7
@@
break;
default:
rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
break;
default:
rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
-@@ -842
2,6 +9362
,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -842
3,6 +9363
,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372:
case RF5390:
case RF5392:
case RF5372:
case RF5390:
case RF5392:
@@
-1192,7
+1192,7
@@
spec->num_channels = 14;
if (spec->clk_is_20mhz)
spec->channels = rf_vals_xtal20mhz_3x;
spec->num_channels = 14;
if (spec->clk_is_20mhz)
spec->channels = rf_vals_xtal20mhz_3x;
-@@ -856
2,6 +9503
,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -856
3,6 +9504
,7 @@ static int rt2800_probe_hw_mode(struct r
case RF5372:
case RF5390:
case RF5392:
case RF5372:
case RF5390:
case RF5392: