diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-21 16:53:00 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-21 16:53:00 -0800 |
| commit | bb3613aa34a81a5e2f1227ccdb801fde04a7da10 (patch) | |
| tree | bb79c15d5da41113bd7b83d9e74fbfc4a1bf8569 /arch/arm/mach-omap2/pm.h | |
| parent | 6971071cdda79cad5f53ba390e466d696e7e9006 (diff) | |
| parent | bb1c9034b3ce7f29d3d178a87b42b767611d6574 (diff) | |
| download | kernel_samsung_smdk4412-bb3613aa34a81a5e2f1227ccdb801fde04a7da10.zip kernel_samsung_smdk4412-bb3613aa34a81a5e2f1227ccdb801fde04a7da10.tar.gz kernel_samsung_smdk4412-bb3613aa34a81a5e2f1227ccdb801fde04a7da10.tar.bz2 | |
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/pm.h')
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 0d75bfd..c04f7b5 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -58,7 +58,7 @@ extern u32 sleep_while_idle; #endif #if defined(CONFIG_CPU_IDLE) -extern void omap3_cpuidle_update_states(void); +extern void omap3_cpuidle_update_states(u32, u32); #endif #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS) @@ -80,9 +80,20 @@ extern void save_secure_ram_context(u32 *addr); extern void omap3_save_scratchpad_contents(void); extern unsigned int omap24xx_idle_loop_suspend_sz; -extern unsigned int omap34xx_suspend_sz; extern unsigned int save_secure_ram_context_sz; extern unsigned int omap24xx_cpu_suspend_sz; extern unsigned int omap34xx_cpu_suspend_sz; +#define PM_RTA_ERRATUM_i608 (1 << 0) +#define PM_SDRC_WAKEUP_ERRATUM_i583 (1 << 1) + +#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) +extern u16 pm34xx_errata; +#define IS_PM34XX_ERRATUM(id) (pm34xx_errata & (id)) +extern void enable_omap3630_toggle_l2_on_restore(void); +#else +#define IS_PM34XX_ERRATUM(id) 0 +static inline void enable_omap3630_toggle_l2_on_restore(void) { } +#endif /* defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP3) */ + #endif |