summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx31.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-06-23 15:00:28 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2013-06-24 08:35:00 +0200
commitf887536147ac892751a18752f34764daf7267845 (patch)
tree6f30f1d6645dca834c71ea80e432ea005690b109 /arch/arm/mach-imx/imx31.c
parenta6375f6e454e117ef8c8d323a21613afab035c06 (diff)
downloadbarebox-f887536147ac892751a18752f34764daf7267845.tar.gz
barebox-f887536147ac892751a18752f34764daf7267845.tar.xz
ARM: i.MX: centralize i.MX startup
Each i.MX SoC has its own SoC initcall. To ease multi SoC support move it to a single initcall. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx31.c')
-rw-r--r--arch/arm/mach-imx/imx31.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx31.c b/arch/arm/mach-imx/imx31.c
index f0954b5d54..eb0c4150e7 100644
--- a/arch/arm/mach-imx/imx31.c
+++ b/arch/arm/mach-imx/imx31.c
@@ -17,6 +17,7 @@
#include <io.h>
#include <mach/imx31-regs.h>
#include <mach/weim.h>
+#include <mach/generic.h>
void imx31_setup_weimcs(size_t cs, unsigned upper, unsigned lower,
unsigned additional)
@@ -26,7 +27,12 @@ void imx31_setup_weimcs(size_t cs, unsigned upper, unsigned lower,
writel(additional, MX31_WEIM_BASE_ADDR + (cs * 0x10) + 0x8);
}
-static int imx31_init(void)
+int imx31_init(void)
+{
+ return 0;
+}
+
+int imx31_devices_init(void)
{
add_generic_device("imx_iim", 0, NULL, MX31_IIM_BASE_ADDR, SZ_4K,
IORESOURCE_MEM, NULL);
@@ -43,4 +49,3 @@ static int imx31_init(void)
return 0;
}
-postcore_initcall(imx31_init);