diff options
author | Nishanth Menon <nm@ti.com> | 2013-10-16 11:39:03 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-10-22 11:10:09 -0400 |
commit | 60c5fc86d01154e2a005bf701f495426ebc81f73 (patch) | |
tree | 255ba94edb4648ba79915a90772a564a8e8116ae | |
parent | 765e7a067eebf372687048ba0242e27f43cf0d71 (diff) |
ARM: OMAP3+: use cpu0-cpufreq driver in device tree supported boot
With OMAP3+ and AM33xx supported SoC having defined CPU device tree
entries with operating-points and clock nodes defined, we can now use
the SoC generic cpufreq-cpu0 driver by registering appropriate device.
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/pm.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index e742118fcfd2..360b2daf54dd 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c | |||
@@ -266,7 +266,12 @@ static void __init omap4_init_voltages(void) | |||
266 | 266 | ||
267 | static inline void omap_init_cpufreq(void) | 267 | static inline void omap_init_cpufreq(void) |
268 | { | 268 | { |
269 | struct platform_device_info devinfo = { .name = "omap-cpufreq", }; | 269 | struct platform_device_info devinfo = { }; |
270 | |||
271 | if (!of_have_populated_dt()) | ||
272 | devinfo.name = "omap-cpufreq"; | ||
273 | else | ||
274 | devinfo.name = "cpufreq-cpu0"; | ||
270 | platform_device_register_full(&devinfo); | 275 | platform_device_register_full(&devinfo); |
271 | } | 276 | } |
272 | 277 | ||
@@ -300,10 +305,11 @@ int __init omap2_common_pm_late_init(void) | |||
300 | /* Smartreflex device init */ | 305 | /* Smartreflex device init */ |
301 | omap_devinit_smartreflex(); | 306 | omap_devinit_smartreflex(); |
302 | 307 | ||
303 | /* cpufreq dummy device instantiation */ | ||
304 | omap_init_cpufreq(); | ||
305 | } | 308 | } |
306 | 309 | ||
310 | /* cpufreq dummy device instantiation */ | ||
311 | omap_init_cpufreq(); | ||
312 | |||
307 | #ifdef CONFIG_SUSPEND | 313 | #ifdef CONFIG_SUSPEND |
308 | suspend_set_ops(&omap_pm_ops); | 314 | suspend_set_ops(&omap_pm_ops); |
309 | #endif | 315 | #endif |