summaryrefslogtreecommitdiff
path: root/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-09-09 17:31:53 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-09-09 17:31:53 +0000
commit8fd6a76d417eecc86ae08d62e0b92bc60d0f3b9c (patch)
treea43e203fb0c5e62e1b7979e45a5659dd68209b62 /package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
parent48af557cbd0e87536edf068fb479b51c38d200fe (diff)
rt2x00: merge an rt2800 initialization order fix
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37922 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch')
-rw-r--r--package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
index 223d46a8e3..6acc70eaa2 100644
--- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
@@ -212,7 +212,7 @@
case RT5390:
rt2800_init_rfcsr_5390(rt2x00dev);
break;
-@@ -6901,6 +7005,12 @@ static int rt2800_validate_eeprom(struct
+@@ -6902,6 +7006,12 @@ static int rt2800_validate_eeprom(struct
rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
@@ -225,7 +225,7 @@
} else if (rt2x00_rt(rt2x00dev, RT2860) ||
rt2x00_rt(rt2x00dev, RT2872)) {
/*
-@@ -7034,6 +7144,8 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7035,6 +7145,8 @@ static int rt2800_init_eeprom(struct rt2
rt2x00_rt(rt2x00dev, RT5390) ||
rt2x00_rt(rt2x00dev, RT5392))
rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
@@ -234,7 +234,7 @@
else
rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
-@@ -7051,6 +7163,7 @@ static int rt2800_init_eeprom(struct rt2
+@@ -7052,6 +7164,7 @@ static int rt2800_init_eeprom(struct rt2
case RF3290:
case RF3320:
case RF3322:
@@ -242,7 +242,7 @@
case RF5360:
case RF5370:
case RF5372:
-@@ -7617,7 +7730,8 @@ static int rt2800_probe_hw_mode(struct r
+@@ -7618,7 +7731,8 @@ static int rt2800_probe_hw_mode(struct r
rt2x00_rf(rt2x00dev, RF5392)) {
spec->num_channels = 14;
spec->channels = rf_vals_3x;
@@ -252,7 +252,7 @@
spec->num_channels = 14;
if (spec->clk_is_20mhz)
spec->channels = rf_vals_xtal20mhz_3x;
-@@ -7742,6 +7856,7 @@ static int rt2800_probe_hw_mode(struct r
+@@ -7743,6 +7857,7 @@ static int rt2800_probe_hw_mode(struct r
case RF3052:
case RF3053:
case RF3290:
@@ -260,7 +260,7 @@
case RF5360:
case RF5370:
case RF5372:
-@@ -7780,6 +7895,7 @@ static int rt2800_probe_rt(struct rt2x00
+@@ -7781,6 +7896,7 @@ static int rt2800_probe_rt(struct rt2x00
case RT3390:
case RT3572:
case RT3593: