From f887536147ac892751a18752f34764daf7267845 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 23 Jun 2013 15:00:28 +0200 Subject: 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 --- arch/arm/mach-imx/imx.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'arch/arm/mach-imx/imx.c') diff --git a/arch/arm/mach-imx/imx.c b/arch/arm/mach-imx/imx.c index d36f3d9443..d6e30a8aa0 100644 --- a/arch/arm/mach-imx/imx.c +++ b/arch/arm/mach-imx/imx.c @@ -12,7 +12,9 @@ */ #include +#include #include +#include static int __imx_silicon_revision = IMX_CHIP_REV_UNKNOWN; @@ -29,3 +31,56 @@ void imx_set_silicon_revision(const char *soc, int revision) (revision >> 4) & 0xf, revision & 0xf); } + +static int imx_init(void) +{ + int ret; + + if (cpu_is_mx1()) + ret = imx1_init(); + else if (cpu_is_mx21()) + ret = imx21_init(); + else if (cpu_is_mx25()) + ret = imx25_init(); + else if (cpu_is_mx27()) + ret = imx27_init(); + else if (cpu_is_mx31()) + ret = imx31_init(); + else if (cpu_is_mx35()) + ret = imx35_init(); + else if (cpu_is_mx51()) + ret = imx51_init(); + else if (cpu_is_mx53()) + ret = imx53_init(); + else if (cpu_is_mx6()) + ret = imx6_init(); + else + return -EINVAL; + + if (of_get_root_node()) + return ret; + + if (cpu_is_mx1()) + ret = imx1_devices_init(); + else if (cpu_is_mx21()) + ret = imx21_devices_init(); + else if (cpu_is_mx25()) + ret = imx25_devices_init(); + else if (cpu_is_mx27()) + ret = imx27_devices_init(); + else if (cpu_is_mx31()) + ret = imx31_devices_init(); + else if (cpu_is_mx35()) + ret = imx35_devices_init(); + else if (cpu_is_mx51()) + ret = imx51_devices_init(); + else if (cpu_is_mx53()) + ret = imx53_devices_init(); + else if (cpu_is_mx6()) + ret = imx6_devices_init(); + else + return -EINVAL; + + return ret; +} +postcore_initcall(imx_init); -- cgit v1.2.3