diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 04ccc127e75..a6c441842cc 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -276,13 +276,20 @@ static inline void omap_init_cpufreq(void) devinfo.name = "omap-cpufreq"; else devinfo.name = "cpufreq-cpu0"; + + /* OLIO test - we want to use the omap driver. + * Will hardcoding this work? - YES, it does. + */ + devinfo.name = "omap-cpufreq"; + platform_device_register_full(&devinfo); } static int __init omap2_common_pm_init(void) { - if (!of_have_populated_dt()) - omap2_init_processor_devices(); + /* if (!of_have_populated_dt()) OLIO TEST */ + omap2_init_processor_devices(); + omap_pm_if_init(); return 0; @@ -296,6 +303,7 @@ int __init omap2_common_pm_late_init(void) * a completely different mechanism. * Disable this part if a DT blob is available. */ + if (!of_have_populated_dt()) { /* Init the voltage layer */ @@ -308,8 +316,6 @@ int __init omap2_common_pm_late_init(void) /* Smartreflex device init */ omap_devinit_smartreflex(); - -#ifdef OLIO_TEST_GL_SUSPEND } else { struct device_node *np; np = of_find_node_by_name(NULL, "omap_pimic"); @@ -317,7 +323,6 @@ int __init omap2_common_pm_late_init(void) of_platform_populate(np, NULL, NULL, NULL); of_node_put(np); } -#endif /* OLIO_TEST_GL_SUSPEND */ } /* cpufreq dummy device instantiation */ |