diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-08 12:20:29 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-08 12:20:29 -0500 |
| commit | acf346084bca289a00020a5c29c23673b801b380 (patch) | |
| tree | 1ab7f6eeefd0564d8fb708b858dc19c8b7e0a67c /arch/arm/mach-imx/mm-imx3.c | |
| parent | c71656c018c8551eca45b2f873b239f0303d74cb (diff) | |
| parent | 38bb3630bcba25f16106166a4aaf211c1d195863 (diff) | |
Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
i.MX35/5 AIPS setup
Includes sync up to 3.3-rc6
* tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM: mx35: Setup the AIPS registers
ARM: mx5: Use common function for configuring AIPS
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
| -rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index b23bd3f09a60..2215814c8c2c 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c | |||
| @@ -262,5 +262,9 @@ void __init imx35_soc_init(void) | |||
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata); | 264 | imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata); |
| 265 | |||
| 266 | /* Setup AIPS registers */ | ||
| 267 | imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS1_BASE_ADDR)); | ||
| 268 | imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS2_BASE_ADDR)); | ||
| 265 | } | 269 | } |
| 266 | #endif /* ifdef CONFIG_SOC_IMX35 */ | 270 | #endif /* ifdef CONFIG_SOC_IMX35 */ |