On 06/26/2013 12:13 PM, Bartlomiej Zolnierkiewicz wrote: > Init cpuidle driver in exynos_init_late() instead of using > device_initcall(). This is needed for multiplatform support. > > Tested on Exynos4210 (Universal C210 board).
Please, find a way to have the same level of initialization than device_init_call. In the work of consolidating the drivers, there are all at the device_init_call level. > Cc: Jaecheol Lee <[email protected]> > Cc: Lorenzo Pieralisi <[email protected]> > Cc: Amit Daniel Kachhap <[email protected]> > Cc: Tomasz Figa <[email protected]> > Cc: Kukjin Kim <[email protected]> > Cc: Daniel Lezcano <[email protected]> > Cc: "Rafael J. Wysocki" <[email protected]> > Signed-off-by: Kyungmin Park <[email protected]> > Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]> > --- > arch/arm/mach-exynos/common.c | 8 ++++---- > arch/arm/mach-exynos/common.h | 6 ++++++ > arch/arm/mach-exynos/cpuidle.c | 3 +-- > 3 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index f7e504b..1c78a16 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -346,11 +346,11 @@ void exynos5_restart(char mode, const char *cmd) > > void __init exynos_init_late(void) > { > - if (of_machine_is_compatible("samsung,exynos5440")) > - /* to be supported later */ > - return; > + /* exynos5440 to be supported later */ > + if (!of_machine_is_compatible("samsung,exynos5440")) > + exynos_pm_late_initcall(); > > - exynos_pm_late_initcall(); > + exynos4_init_cpuidle(); > } > > #ifdef CONFIG_OF > diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h > index 11fc1e2..a3b95a6 100644 > --- a/arch/arm/mach-exynos/common.h > +++ b/arch/arm/mach-exynos/common.h > @@ -40,6 +40,12 @@ int exynos_pm_late_initcall(void); > static inline int exynos_pm_late_initcall(void) { return 0; } > #endif > > +#ifdef CONFIG_CPU_IDLE > +int exynos4_init_cpuidle(void); > +#else > +static inline int exynos4_init_cpuidle(void) { return 0; } > +#endif > + > #ifdef CONFIG_ARCH_EXYNOS4 > void exynos4_register_clocks(void); > void exynos4_setup_clocks(void); > diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c > index 0a657ac..d6e5115 100644 > --- a/arch/arm/mach-exynos/cpuidle.c > +++ b/arch/arm/mach-exynos/cpuidle.c > @@ -66,7 +66,7 @@ static void __init exynos5_core_down_clk(void) > __raw_writel(tmp, EXYNOS5_PWR_CTRL2); > } > > -static int __init exynos4_init_cpuidle(void) > +int __init exynos4_init_cpuidle(void) > { > int cpu_id, ret; > struct cpuidle_device *device; > @@ -93,4 +93,3 @@ static int __init exynos4_init_cpuidle(void) > > return 0; > } > -device_initcall(exynos4_init_cpuidle); > -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
