summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mm-imx25.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-20 14:21:16 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:05:43 +0800
commit69ac71d370b21cc52a2afd06f3a6d6d1da5edc75 (patch)
tree899ec198a92150d4dac72b0b5af3a2544c126df1 /arch/arm/mach-imx/mm-imx25.c
parent1e66210a3135b544713a9455e78e36f6f8d1bf77 (diff)
ARM: imx: call mxc_device_init() in soc specific function
mxc_device_init() is a core_initcall function used to register devices for mxc_aips_bus and mxc_ahb_bus, which are needed by gpio and dma device registration. Instead of being a core_initcall function, we have it called in soc specific initialization function before gpio and dma devices get registered, so that it will not be called for other platforms when we enable multi-platform support for imx. Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx25.c')
-rw-r--r--arch/arm/mach-imx/mm-imx25.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c
index 9be33cda2e2..9357707bb7a 100644
--- a/arch/arm/mach-imx/mm-imx25.c
+++ b/arch/arm/mach-imx/mm-imx25.c
@@ -89,6 +89,8 @@ static const struct resource imx25_audmux_res[] __initconst = {
void __init imx25_soc_init(void)
{
+ mxc_device_init();
+
/* i.mx25 has the i.mx35 type gpio */
mxc_register_gpio("imx35-gpio", 0, MX25_GPIO1_BASE_ADDR, SZ_16K, MX25_INT_GPIO1, 0);
mxc_register_gpio("imx35-gpio", 1, MX25_GPIO2_BASE_ADDR, SZ_16K, MX25_INT_GPIO2, 0);