xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/imx3' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc

Browse Source 
* '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
This commit is contained in:
Arnd Bergmann
2012-03-02 15:04:47 +00:00
parent b23f46c747 bb07d7511e
commit cb66bb1d6f
6 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-imx/mm-imx3.c
View File

@@ -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 */