Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0343371e authored by Kalle Jokiniemi's avatar Kalle Jokiniemi Committed by Kevin Hilman
Browse files

OMAP3: PM: CPUidle: fix init sequencing 



Previously omap3_idle_init() was called in device_init, while
omap_pm_init() is called at late_initcall. This causes the cpu idle
driver to call omap_sram_idle before it is properly initialized. This
patch fixes the issue by moving omap3_idle_init into omap3_pm_init.

Signed-off-by: default avatarKalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 0f724ed9

arch/arm/mach-omap2/cpuidle34xx.c

+6 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ struct cpuidle_driver omap3_idle_driver = { 
 * Registers the OMAP3 specific cpuidle driver with the cpuidle

 * framework with the valid set of states.

 */

int omap3_idle_init(void)

int __init omap3_idle_init(void)

{

	int i, count = 0;

	struct omap3_processor_cx *cx;
@@ -272,5 +272,9 @@ int omap3_idle_init(void) 


	return 0;

}

device_initcall(omap3_idle_init);

#else

int __init omap3_idle_init(void)

{

	return 0;

}

#endif /* CONFIG_CPU_IDLE */

arch/arm/mach-omap2/pm.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ extern void omap3_pm_off_mode_enable(int); 
extern void omap_sram_idle(void);

extern int omap3_can_sleep(void);

extern int set_pwrdm_state(struct powerdomain *pwrdm, u32 state);

extern int omap3_idle_init(void);



extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);

extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);

arch/arm/mach-omap2/pm34xx.c

+1 −2
Original line number Diff line number Diff line
@@ -1099,9 +1099,8 @@ static int __init omap3_pm_init(void) 
	suspend_set_ops(&omap_pm_ops);

#endif /* CONFIG_SUSPEND */



#ifndef CONFIG_CPU_IDLE

	pm_idle = omap3_pm_idle;

#endif

	omap3_idle_init();



	pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm);

	/*