Merge tag 'modules-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[karo-tx-linux.git] / arch / arm / mach-imx / mach-mx31ads.c

diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c
index 4f2c56d44ba14de19f10ccc2dc16927a4b03a545..766b8b93fb97e27d59eaa3aa50d479c2f21b30e1 100644 (file)
--- a/arch/arm/mach-imx/mach-mx31ads.c
+++ b/arch/arm/mach-imx/mach-mx31ads.c
@@ -554,20 +554,19 @@ static void __init mx31ads_map_io(void)
        iotable_init(mx31ads_io_desc, ARRAY_SIZE(mx31ads_io_desc));
 }
 
-static void __init mx31ads_init_irq(void)
-{
-       mx31_init_irq();
-       mx31ads_init_expio();
-}
-
 static void __init mx31ads_init(void)
 {
        imx31_soc_init();
 
-       mxc_init_extuart();
        mxc_init_imx_uart();
-       mxc_init_i2c();
        mxc_init_audio();
+}
+
+static void __init mx31ads_late(void)
+{
+       mx31ads_init_expio();
+       mxc_init_extuart();
+       mxc_init_i2c();
        mxc_init_ext_ethernet();
 }
 
@@ -581,8 +580,9 @@ MACHINE_START(MX31ADS, "Freescale MX31ADS")
        .atag_offset = 0x100,
        .map_io = mx31ads_map_io,
        .init_early = imx31_init_early,
-       .init_irq = mx31ads_init_irq,
+       .init_irq       = mx31_init_irq,
        .init_time      = mx31ads_timer_init,
        .init_machine = mx31ads_init,
+       .init_late      = mx31ads_late,
        .restart        = mxc_restart,
 MACHINE_END