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/mach-imx/mm-imx3.c | |
| parent | b23f46c7471d0adcf81092b6702299562c4149c5 (diff) | |
| parent | bb07d7511e0884f913a0610d5f9a2f8a27914042 (diff) | |
| download | blackbird-op-linux-cb66bb1d6fab2d91960c20f256c6986d5afac1a1.tar.gz blackbird-op-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/mach-imx/mm-imx3.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index 8404ee72555a..b23bd3f09a60 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c @@ -34,6 +34,8 @@ static void imx3_idle(void) { unsigned long reg = 0; + mx3_cpu_lp_set(MX3_WAIT); + __asm__ __volatile__( /* disable I and D cache */ "mrc p15, 0, %0, c1, c0, 0\n" @@ -173,6 +175,9 @@ void __init imx31_soc_init(void) } imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata); + + imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS1_BASE_ADDR)); + imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS2_BASE_ADDR)); } #endif /* ifdef CONFIG_SOC_IMX31 */ |
