diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 15:04:47 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-02 15:04:47 +0000 |
commit | cb66bb1d6fab2d91960c20f256c6986d5afac1a1 (patch) | |
tree | 08bec33c473e85de9478b68cb1f3fbc1e6ebef07 /arch/arm/plat-mxc/include | |
parent | b23f46c7471d0adcf81092b6702299562c4149c5 (diff) | |
parent | bb07d7511e0884f913a0610d5f9a2f8a27914042 (diff) | |
download | blackbird-obmc-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.tar.gz blackbird-obmc-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.zip |
Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
* 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: mx3: Setup AIPS registers
ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
Conflicts:
arch/arm/mach-imx/mm-imx3.c
Diffstat (limited to 'arch/arm/plat-mxc/include')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 1bf0df81bdc6..7c24e5ab7d50 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -75,6 +75,7 @@ extern void mxc_restart(char, const char *); extern void mxc_arch_reset_init(void __iomem *); extern int mx53_revision(void); extern int mx53_display_revision(void); +extern void imx_set_aips(void __iomem *); enum mxc_cpu_pwr_mode { WAIT_CLOCKED, /* wfi only */ @@ -84,6 +85,14 @@ enum mxc_cpu_pwr_mode { STOP_POWER_OFF, /* STOP + SRPG */ }; +enum mx3_cpu_pwr_mode { + MX3_RUN, + MX3_WAIT, + MX3_DOZE, + MX3_SLEEP, +}; + +extern void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode); extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode); extern void imx_print_silicon_rev(const char *cpu, int srev); |