From bc8fce8fd179a35b66cd4d3ec916179b4ebb8605 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 12 Jun 2013 15:54:36 +0000 Subject: AA: rt2x00: remove the clk_get patch, the kernel still uses the old platform_data flag (#13532) Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36929 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/615-rt2x00-fix_20mhz_clk.patch | 29 ---------------------- 1 file changed, 29 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 fa0ffa549c..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 -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - - #include "rt2x00.h" - #include "rt2800lib.h" -@@ -5375,13 +5376,14 @@ static int rt2800_probe_hw_mode(struct r - - 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; - } -- cgit v1.2.3