From b55b2d43a0f88348844bcc58aad4d3314f7c6e14 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 19 Mar 2014 00:36:28 +0000 Subject: rt2x00: remove the incompatible 20 mhz clock patch again (fixes #13532) Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@39952 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/615-rt2x00-fix_20mhz_clk.patch | 29 ----------------- .../patches/616-rt2x00-support-rt5350.patch | 36 +++++++++++----------- .../619-rt2x00-change-led-polarity-from-OF.patch | 6 ++-- .../mac80211/patches/620-rt2x00-rt3352-rf-id.patch | 2 +- .../patches/a00-ath9k_platform_h_backup.patch | 2 +- 5 files changed, 23 insertions(+), 52 deletions(-) delete mode 100644 package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch diff --git a/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch deleted file mode 100644 index d843b7ab53..0000000000 --- a/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/drivers/net/wireless/rt2x00/rt2800lib.c -+++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - - #include "rt2x00.h" - #include "rt2800lib.h" -@@ -7781,13 +7782,14 @@ static int rt2800_probe_rt(struct rt2x00 - - int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev) - { -- struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data; - struct hw_mode_spec *spec = &rt2x00dev->spec; -+ struct clk *clk = clk_get(rt2x00dev->dev, NULL); - -- if (!pdata) -- return -EINVAL; -+ if (IS_ERR(clk)) -+ return PTR_ERR(clk); - -- spec->clk_is_20mhz = pdata->clk_is_20mhz; -+ if (clk_get_rate(clk) == 20000000) -+ spec->clk_is_20mhz = 1; - - return 0; - } diff --git a/package/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/mac80211/patches/616-rt2x00-support-rt5350.patch index 8d3fcd245a..3bafa16cda 100644 --- a/package/mac80211/patches/616-rt2x00-support-rt5350.patch +++ b/package/mac80211/patches/616-rt2x00-support-rt5350.patch @@ -10,7 +10,7 @@ #define RF5372 0x5372 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -2705,6 +2705,13 @@ static void rt2800_config_channel_rf53xx +@@ -2704,6 +2704,13 @@ static void rt2800_config_channel_rf53xx rt2800_rfcsr_write(rt2x00dev, 59, r59_non_bt[idx]); @@ -24,7 +24,7 @@ } } } -@@ -3142,6 +3149,7 @@ static void rt2800_config_channel(struct +@@ -3141,6 +3148,7 @@ static void rt2800_config_channel(struct rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info); break; case RF3070: @@ -32,7 +32,7 @@ case RF5360: case RF5370: case RF5372: -@@ -3159,6 +3167,7 @@ static void rt2800_config_channel(struct +@@ -3158,6 +3166,7 @@ static void rt2800_config_channel(struct if (rt2x00_rf(rt2x00dev, RF3070) || rt2x00_rf(rt2x00dev, RF3290) || rt2x00_rf(rt2x00dev, RF3322) || @@ -40,7 +40,7 @@ rt2x00_rf(rt2x00dev, RF5360) || rt2x00_rf(rt2x00dev, RF5370) || rt2x00_rf(rt2x00dev, RF5372) || -@@ -3399,7 +3408,8 @@ static void rt2800_config_channel(struct +@@ -3398,7 +3407,8 @@ static void rt2800_config_channel(struct /* * Clear update flag */ @@ -50,7 +50,7 @@ rt2800_bbp_read(rt2x00dev, 49, &bbp); rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0); rt2800_bbp_write(rt2x00dev, 49, bbp); -@@ -4273,6 +4283,7 @@ void rt2800_vco_calibration(struct rt2x0 +@@ -4272,6 +4282,7 @@ void rt2800_vco_calibration(struct rt2x0 case RF3053: case RF3070: case RF3290: @@ -58,7 +58,7 @@ case RF5360: case RF5370: case RF5372: -@@ -4669,6 +4680,8 @@ static int rt2800_init_registers(struct +@@ -4668,6 +4679,8 @@ static int rt2800_init_registers(struct rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); @@ -67,7 +67,7 @@ } else { rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000); rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606); -@@ -5310,9 +5323,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5309,9 +5322,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 82, 0x62); @@ -84,7 +84,7 @@ rt2800_bbp_write(rt2x00dev, 86, 0x38); -@@ -5326,9 +5343,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5325,9 +5342,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 104, 0x92); @@ -101,7 +101,7 @@ rt2800_bbp_write(rt2x00dev, 120, 0x50); -@@ -5353,6 +5374,13 @@ static void rt2800_init_bbp_3352(struct +@@ -5352,6 +5373,13 @@ static void rt2800_init_bbp_3352(struct rt2800_bbp_write(rt2x00dev, 143, 0xa2); rt2800_bbp_write(rt2x00dev, 148, 0xc8); @@ -115,7 +115,7 @@ } static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev) -@@ -5653,6 +5681,7 @@ static void rt2800_init_bbp(struct rt2x0 +@@ -5652,6 +5680,7 @@ static void rt2800_init_bbp(struct rt2x0 rt2800_init_bbp_3290(rt2x00dev); break; case RT3352: @@ -123,7 +123,7 @@ rt2800_init_bbp_3352(rt2x00dev); break; case RT3390: -@@ -6463,6 +6492,76 @@ static void rt2800_init_rfcsr_3593(struc +@@ -6462,6 +6491,76 @@ static void rt2800_init_rfcsr_3593(struc /* TODO: enable stream mode support */ } @@ -200,7 +200,7 @@ static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev) { rt2800_rf_init_calibration(rt2x00dev, 2); -@@ -6700,6 +6799,9 @@ static void rt2800_init_rfcsr(struct rt2 +@@ -6699,6 +6798,9 @@ static void rt2800_init_rfcsr(struct rt2 case RT3593: rt2800_init_rfcsr_3593(rt2x00dev); break; @@ -210,7 +210,7 @@ case RT5390: rt2800_init_rfcsr_5390(rt2x00dev); break; -@@ -6949,6 +7051,12 @@ static int rt2800_validate_eeprom(struct +@@ -6948,6 +7050,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); @@ -223,7 +223,7 @@ } else if (rt2x00_rt(rt2x00dev, RT2860) || rt2x00_rt(rt2x00dev, RT2872)) { /* -@@ -7082,6 +7190,8 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7081,6 +7189,8 @@ static int rt2800_init_eeprom(struct rt2 rt2x00_rt(rt2x00dev, RT5390) || rt2x00_rt(rt2x00dev, RT5392)) rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf); @@ -232,7 +232,7 @@ else rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE); -@@ -7100,6 +7210,7 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7099,6 +7209,7 @@ static int rt2800_init_eeprom(struct rt2 case RF3290: case RF3320: case RF3322: @@ -240,7 +240,7 @@ case RF5360: case RF5370: case RF5372: -@@ -7595,6 +7706,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -7594,6 +7705,7 @@ static int rt2800_probe_hw_mode(struct r case RF3290: case RF3320: case RF3322: @@ -248,7 +248,7 @@ case RF5360: case RF5370: case RF5372: -@@ -7727,6 +7839,7 @@ static int rt2800_probe_hw_mode(struct r +@@ -7726,6 +7838,7 @@ static int rt2800_probe_hw_mode(struct r case RF3053: case RF3070: case RF3290: @@ -256,7 +256,7 @@ case RF5360: case RF5370: case RF5372: -@@ -7765,6 +7878,7 @@ static int rt2800_probe_rt(struct rt2x00 +@@ -7764,6 +7877,7 @@ static int rt2800_probe_rt(struct rt2x00 case RT3390: case RT3572: case RT3593: diff --git a/package/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch b/package/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch index f820b96f6e..f9186d82bc 100644 --- a/package/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch +++ b/package/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch @@ -1,14 +1,14 @@ --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -37,6 +37,7 @@ +@@ -36,6 +36,7 @@ + #include #include #include - #include +#include #include "rt2x00.h" #include "rt2800lib.h" -@@ -7299,6 +7300,17 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7298,6 +7299,17 @@ static int rt2800_init_eeprom(struct rt2 rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC); rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY); diff --git a/package/mac80211/patches/620-rt2x00-rt3352-rf-id.patch b/package/mac80211/patches/620-rt2x00-rt3352-rf-id.patch index 51c223d12c..5e67344c85 100644 --- a/package/mac80211/patches/620-rt2x00-rt3352-rf-id.patch +++ b/package/mac80211/patches/620-rt2x00-rt3352-rf-id.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -7187,10 +7187,11 @@ static int rt2800_init_eeprom(struct rt2 +@@ -7186,10 +7186,11 @@ static int rt2800_init_eeprom(struct rt2 * RT53xx: defined in "EEPROM_CHIP_ID" field */ if (rt2x00_rt(rt2x00dev, RT3290) || diff --git a/package/mac80211/patches/a00-ath9k_platform_h_backup.patch b/package/mac80211/patches/a00-ath9k_platform_h_backup.patch index 5a74fbf3db..cff3daee82 100644 --- a/package/mac80211/patches/a00-ath9k_platform_h_backup.patch +++ b/package/mac80211/patches/a00-ath9k_platform_h_backup.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -676,8 +676,7 @@ static int ath9k_init_soc_platform(struc +@@ -678,8 +678,7 @@ static int ath9k_init_soc_platform(struc return ret; } -- cgit v1.2.3