The patch 615-rt2x00-fix_20mhz_clk.patch fixes code introduced by 611-rt2x00-rf_vals-rt3352-xtal20.patch and makes the the platform data property clk_is_20mhz obsolete. Signed-off-by: Mathias Kresin <dev@kresin.me>master
parent
12a6e3cd05
commit
e7c019c24d
@ -1,29 +0,0 @@ |
||||
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
||||
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
+#include <linux/clk.h>
|
||||
|
||||
#include "rt2x00.h"
|
||||
#include "rt2800lib.h"
|
||||
@@ -8486,13 +8487,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;
|
||||
}
|
Loading…
Reference in new issue