summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r--arch/arm/mach-omap2/pm.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index b2dc18a6b82..b06b22c3f64 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -276,8 +276,6 @@ static inline void omap_init_cpufreq(void)
devinfo.name = "omap-cpufreq";
else
devinfo.name = "cpufreq-cpu0";
-
- devinfo.name = "omap-cpufreq"; /* OLIO HACK */
platform_device_register_full(&devinfo);
}
@@ -311,6 +309,13 @@ int __init omap2_common_pm_late_init(void)
/* Smartreflex device init */
omap_devinit_smartreflex();
+ } else {
+ struct device_node *np;
+ np = of_find_node_by_name(NULL, "omap_pimic");
+ if (np) {
+ of_platform_populate(np, NULL, NULL, NULL);
+ of_node_put(np);
+ }
}
/* cpufreq dummy device instantiation */