summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/devices
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-20 08:21:16 +0200
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 04:05:43 +0200
commit69ac71d370b21cc52a2afd06f3a6d6d1da5edc75 (patch)
tree899ec198a92150d4dac72b0b5af3a2544c126df1 /arch/arm/mach-imx/devices
parentARM: imx: remove header file mach/irqs.h (diff)
downloadlinux-69ac71d370b21cc52a2afd06f3a6d6d1da5edc75.tar.xz
linux-69ac71d370b21cc52a2afd06f3a6d6d1da5edc75.zip
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/devices')
-rw-r--r--arch/arm/mach-imx/devices/devices.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/devices/devices.c b/arch/arm/mach-imx/devices/devices.c
index 9301e07b6125..1b37482407f9 100644
--- a/arch/arm/mach-imx/devices/devices.c
+++ b/arch/arm/mach-imx/devices/devices.c
@@ -32,7 +32,7 @@ struct device mxc_ahb_bus = {
.parent = &platform_bus,
};
-static int __init mxc_device_init(void)
+int __init mxc_device_init(void)
{
int ret;
@@ -45,4 +45,3 @@ static int __init mxc_device_init(void)
done:
return ret;
}
-core_initcall(mxc_device_init);