Merge tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull sweeping late_initcall cleanup for arm-soc from Olof Johansson:
 "This is a patch series from Shawn Guo that moves from individual
  late_initcalls() to using a member in the machine structure to invoke
  a platform's late initcalls.

  This cleanup is a step in the move towards multiplatform kernels since
  it would reduce the need to check for compatible platforms in each and
  every initcall."

Fix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,
imx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,
in the case of cpuimx51.c the board support being deleted)

* tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: ux500: use machine specific hook for late init
  ARM: tegra: use machine specific hook for late init
  ARM: shmobile: use machine specific hook for late init
  ARM: sa1100: use machine specific hook for late init
  ARM: s3c64xx: use machine specific hook for late init
  ARM: prima2: use machine specific hook for late init
  ARM: pnx4008: use machine specific hook for late init
  ARM: omap2: use machine specific hook for late init
  ARM: omap1: use machine specific hook for late init
  ARM: msm: use machine specific hook for late init
  ARM: imx: use machine specific hook for late init
  ARM: exynos: use machine specific hook for late init
  ARM: ep93xx: use machine specific hook for late init
  ARM: davinci: use machine specific hook for late init
  ARM: provide a late_initcall hook for platform initialization

11 files changed, 63 insertions, 39 deletions

diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
index aa15c517d06e..8eb15a2fcaf9 100644
--- a/arch/arm/mach-imx/cpu-imx5.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -62,11 +62,8 @@ EXPORT_SYMBOL(mx51_revision);
  * Dependent on link order - so the assumption is that vfp_init is called
  * before us.
  */
-static int __init mx51_neon_fixup(void)
+int __init mx51_neon_fixup(void)
 {
-        if (!cpu_is_mx51())
-                return 0;
-
         if (mx51_revision() < IMX_CHIP_REVISION_3_0 &&
                         (elf_hwcap & HWCAP_NEON)) {
                 elf_hwcap &= ~HWCAP_NEON;
@@ -75,7 +72,6 @@ static int __init mx51_neon_fixup(void)
         return 0;
 }
 
-late_initcall(mx51_neon_fixup);
 #endif
 
 static int get_mx53_srev(void)
diff --git a/arch/arm/mach-imx/imx51-dt.c b/arch/arm/mach-imx/imx51-dt.c
index 5f577fbda2c8..18e78dba4298 100644
--- a/arch/arm/mach-imx/imx51-dt.c
+++ b/arch/arm/mach-imx/imx51-dt.c
@@ -118,6 +118,7 @@ DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
         .handle_irq     = imx51_handle_irq,
         .timer          = &imx51_timer,
         .init_machine   = imx51_dt_init,
+        .init_late      = imx51_init_late,
         .dt_compat      = imx51_dt_board_compat,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index ce341a6874fc..ac50f1671e38 100644
--- a/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@ -369,5 +369,6 @@ MACHINE_START(EUKREA_CPUIMX51SD, "Eukrea CPUIMX51SD")
         .handle_irq = imx51_handle_irq,
         .timer = &mxc_timer,
         .init_machine = eukrea_cpuimx51sd_init,
+        .init_late      = imx51_init_late,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx51_3ds.c b/arch/arm/mach-imx/mach-mx51_3ds.c
index 83eab4176ca4..3c5b163923f6 100644
--- a/arch/arm/mach-imx/mach-mx51_3ds.c
+++ b/arch/arm/mach-imx/mach-mx51_3ds.c
@@ -175,5 +175,6 @@ MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board")
         .handle_irq = imx51_handle_irq,
         .timer = &mx51_3ds_timer,
         .init_machine = mx51_3ds_init,
+        .init_late      = imx51_init_late,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx51_babbage.c b/arch/arm/mach-imx/mach-mx51_babbage.c
index 517672ebcbc5..dde397014d4b 100644
--- a/arch/arm/mach-imx/mach-mx51_babbage.c
+++ b/arch/arm/mach-imx/mach-mx51_babbage.c
@@ -432,5 +432,6 @@ MACHINE_START(MX51_BABBAGE, "Freescale MX51 Babbage Board")
         .handle_irq = imx51_handle_irq,
         .timer = &mx51_babbage_timer,
         .init_machine = mx51_babbage_init,
+        .init_late      = imx51_init_late,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx51_efikamx.c b/arch/arm/mach-imx/mach-mx51_efikamx.c
index 86e96ef11f9d..8d09c0126cab 100644
--- a/arch/arm/mach-imx/mach-mx51_efikamx.c
+++ b/arch/arm/mach-imx/mach-mx51_efikamx.c
@@ -207,29 +207,32 @@ static void mx51_efikamx_power_off(void)
 
 static int __init mx51_efikamx_power_init(void)
 {
-        if (machine_is_mx51_efikamx()) {
-                pwgt1 = regulator_get(NULL, "pwgt1");
-                pwgt2 = regulator_get(NULL, "pwgt2");
-                if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
-                        regulator_enable(pwgt1);
-                        regulator_enable(pwgt2);
-                }
-                gpio_request(EFIKAMX_POWEROFF, "poweroff");
-                pm_power_off = mx51_efikamx_power_off;
-
-                /* enable coincell charger. maybe need a small power driver ? */
-                coincell = regulator_get(NULL, "coincell");
-                if (!IS_ERR(coincell)) {
-                        regulator_set_voltage(coincell, 3000000, 3000000);
-                        regulator_enable(coincell);
-                }
-
-                regulator_has_full_constraints();
+        pwgt1 = regulator_get(NULL, "pwgt1");
+        pwgt2 = regulator_get(NULL, "pwgt2");
+        if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
+                regulator_enable(pwgt1);
+                regulator_enable(pwgt2);
+        }
+        gpio_request(EFIKAMX_POWEROFF, "poweroff");
+        pm_power_off = mx51_efikamx_power_off;
+
+        /* enable coincell charger. maybe need a small power driver ? */
+        coincell = regulator_get(NULL, "coincell");
+        if (!IS_ERR(coincell)) {
+                regulator_set_voltage(coincell, 3000000, 3000000);
+                regulator_enable(coincell);
         }
 
+        regulator_has_full_constraints();
+
         return 0;
 }
-late_initcall(mx51_efikamx_power_init);
+
+static void __init mx51_efikamx_init_late(void)
+{
+        imx51_init_late();
+        mx51_efikamx_power_init();
+}
 
 static void __init mx51_efikamx_init(void)
 {
@@ -292,5 +295,6 @@ MACHINE_START(MX51_EFIKAMX, "Genesi Efika MX (Smarttop)")
         .handle_irq = imx51_handle_irq,
         .timer = &mx51_efikamx_timer,
         .init_machine = mx51_efikamx_init,
+        .init_late = mx51_efikamx_init_late,
         .restart = mx51_efikamx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-mx51_efikasb.c b/arch/arm/mach-imx/mach-mx51_efikasb.c
index 88f837a6cc76..fdbd181b97ef 100644
--- a/arch/arm/mach-imx/mach-mx51_efikasb.c
+++ b/arch/arm/mach-imx/mach-mx51_efikasb.c
@@ -211,22 +211,25 @@ static void mx51_efikasb_power_off(void)
 
 static int __init mx51_efikasb_power_init(void)
 {
-        if (machine_is_mx51_efikasb()) {
-                pwgt1 = regulator_get(NULL, "pwgt1");
-                pwgt2 = regulator_get(NULL, "pwgt2");
-                if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
-                        regulator_enable(pwgt1);
-                        regulator_enable(pwgt2);
-                }
-                gpio_request(EFIKASB_POWEROFF, "poweroff");
-                pm_power_off = mx51_efikasb_power_off;
-
-                regulator_has_full_constraints();
+        pwgt1 = regulator_get(NULL, "pwgt1");
+        pwgt2 = regulator_get(NULL, "pwgt2");
+        if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
+                regulator_enable(pwgt1);
+                regulator_enable(pwgt2);
         }
+        gpio_request(EFIKASB_POWEROFF, "poweroff");
+        pm_power_off = mx51_efikasb_power_off;
+
+        regulator_has_full_constraints();
 
         return 0;
 }
-late_initcall(mx51_efikasb_power_init);
+
+static void __init mx51_efikasb_init_late(void)
+{
+        imx51_init_late();
+        mx51_efikasb_power_init();
+}
 
 /* 01     R1.3 board
    10     R2.0 board */
@@ -287,6 +290,7 @@ MACHINE_START(MX51_EFIKASB, "Genesi Efika MX (Smartbook)")
         .init_irq = mx51_init_irq,
         .handle_irq = imx51_handle_irq,
         .init_machine =  efikasb_board_init,
+        .init_late = mx51_efikasb_init_late,
         .timer = &mx51_efikasb_timer,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index 10c9795934a3..0a40004154f2 100644
--- a/arch/arm/mach-imx/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -694,6 +694,11 @@ static void __init pcm037_reserve(void)
                         MX3_CAMERA_BUF_SIZE);
 }
 
+static void __init pcm037_init_late(void)
+{
+        pcm037_eet_init_devices();
+}
+
 MACHINE_START(PCM037, "Phytec Phycore pcm037")
         /* Maintainer: Pengutronix */
         .atag_offset = 0x100,
@@ -704,5 +709,6 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")
         .handle_irq = imx31_handle_irq,
         .timer = &pcm037_timer,
         .init_machine = pcm037_init,
+        .init_late = pcm037_init_late,
         .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-pcm037_eet.c b/arch/arm/mach-imx/mach-pcm037_eet.c
index 1b7606bef8f4..11ffa81ad17d 100644
--- a/arch/arm/mach-imx/mach-pcm037_eet.c
+++ b/arch/arm/mach-imx/mach-pcm037_eet.c
@@ -160,9 +160,9 @@ static const struct gpio_keys_platform_data
         .rep            = 0, /* No auto-repeat */
 };
 
-static int __init eet_init_devices(void)
+int __init pcm037_eet_init_devices(void)
 {
-        if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)
+        if (pcm037_variant() != PCM037_EET)
                 return 0;
 
         mxc_iomux_setup_multiple_pins(pcm037_eet_pins,
@@ -176,4 +176,3 @@ static int __init eet_init_devices(void)
 
         return 0;
 }
-late_initcall(eet_init_devices);
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c
index 8b4dc20c7c53..feeee17da96b 100644
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@ -237,3 +237,8 @@ void __init imx53_soc_init(void)
         platform_device_register_simple("imx31-audmux", 0, imx53_audmux_res,
                                         ARRAY_SIZE(imx53_audmux_res));
 }
+
+void __init imx51_init_late(void)
+{
+        mx51_neon_fixup();
+}
diff --git a/arch/arm/mach-imx/pcm037.h b/arch/arm/mach-imx/pcm037.h
index d6929721a5fd..7d167690e17d 100644
--- a/arch/arm/mach-imx/pcm037.h
+++ b/arch/arm/mach-imx/pcm037.h
@@ -8,4 +8,10 @@ enum pcm037_board_variant {
 
 extern enum pcm037_board_variant pcm037_variant(void);
 
+#ifdef CONFIG_MACH_PCM037_EET
+int pcm037_eet_init_devices(void);
+#else
+static inline int pcm037_eet_init_devices(void) { return 0; }
+#endif
+
 #endif