diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-10-30 16:03:32 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-11-20 14:25:58 -0800 |
| commit | 1263594ac4592804a8f49e73b42ed9c2f41644db (patch) | |
| tree | 04f5f84e90e5a6f72d1e0dddc29885d6bf6d4836 /arch/arm/mach-omap2 | |
| parent | 4f911e64b91df9adde8137cfa408639167cf250a (diff) | |
| download | olio-linux-3.10-1263594ac4592804a8f49e73b42ed9c2f41644db.tar.xz olio-linux-3.10-1263594ac4592804a8f49e73b42ed9c2f41644db.zip | |
Power changes: Removed dummy regulators, added cpufreq table initialization and makes sure that cpufreq gets initialized properly.
Change-Id: I679d86c150e4acee098e4a5cfe1855d46fac872a
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/opp.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/opp3xxx_data.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 15 |
3 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/opp.c b/arch/arm/mach-omap2/opp.c index 82fd8c72f75..56e5ad35b17 100644 --- a/arch/arm/mach-omap2/opp.c +++ b/arch/arm/mach-omap2/opp.c @@ -41,8 +41,10 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, { int i, r; +#ifndef CONFIG_MACH_OMAP3_H1 /* olio has a partial DT */ if (of_have_populated_dt()) return -EINVAL; +#endif if (!opp_def || !opp_def_size) { pr_err("%s: invalid params!\n", __func__); diff --git a/arch/arm/mach-omap2/opp3xxx_data.c b/arch/arm/mach-omap2/opp3xxx_data.c index f715f6ffd1d..fcede945353 100644 --- a/arch/arm/mach-omap2/opp3xxx_data.c +++ b/arch/arm/mach-omap2/opp3xxx_data.c @@ -196,7 +196,7 @@ int __init omap3_opp_init(void) return r; if (cpu_is_omap3630()) -#ifdef CONFIG_MACH_OMAP3_H1_DVT2 +#ifdef CONFIG_MACH_OMAP3_H1 r = omap_init_opp_table(omap36xx_olioh1_opp_def_list, ARRAY_SIZE(omap36xx_olioh1_opp_def_list)); #else 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 */ |