diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-13 00:46:48 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-13 00:46:48 -0400 |
commit | 84fb69f7dc769e84bfa939a8677ba793aa30d092 (patch) | |
tree | ecd78fd082a3581c014e21f8b4c6d2b67ffa776d | |
parent | 65d3977b6593d5506d711acb332d4bd09c986201 (diff) | |
parent | e423d12cbcb9576785e891617888f627f1f57bf4 (diff) |
Merge tag 'renesas-cpufreq2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Merge "Second Round of Renesas ARM Based SoC CPUFreq Updates for v3.17" from
Simon Horman:
- Remove opps table check for cpufreq as this is already handled
by the driver
* tag 'renesas-cpufreq2-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove opps table check for cpufreq
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/mach-shmobile/cpufreq.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-shmobile/cpufreq.c b/arch/arm/mach-shmobile/cpufreq.c index e2c868fc41cf..8a24b2be46ae 100644 --- a/arch/arm/mach-shmobile/cpufreq.c +++ b/arch/arm/mach-shmobile/cpufreq.c | |||
@@ -8,24 +8,10 @@ | |||
8 | * for more details. | 8 | * for more details. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/of.h> | ||
12 | #include <linux/of_device.h> | ||
13 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
14 | 12 | ||
15 | int __init shmobile_cpufreq_init(void) | 13 | int __init shmobile_cpufreq_init(void) |
16 | { | 14 | { |
17 | struct device_node *np; | 15 | platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0); |
18 | |||
19 | np = of_cpu_device_node_get(0); | ||
20 | if (np == NULL) { | ||
21 | pr_err("failed to find cpu0 node\n"); | ||
22 | return 0; | ||
23 | } | ||
24 | |||
25 | if (of_get_property(np, "operating-points", NULL)) | ||
26 | platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0); | ||
27 | |||
28 | of_node_put(np); | ||
29 | |||
30 | return 0; | 16 | return 0; |
31 | } | 17 | } |