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

1 files changed, 63 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index e1f9c6fc0414..8d014ba04abc 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -350,6 +350,13 @@ void __init omap2420_init_early(void)
         omap_hwmod_init_postsetup();
         omap2420_clk_init();
 }
+
+void __init omap2420_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap2_pm_init();
+}
 #endif
 
 #ifdef CONFIG_SOC_OMAP2430
@@ -365,6 +372,13 @@ void __init omap2430_init_early(void)
         omap_hwmod_init_postsetup();
         omap2430_clk_init();
 }
+
+void __init omap2430_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap2_pm_init();
+}
 #endif
 
 /*
@@ -419,6 +433,48 @@ void __init ti81xx_init_early(void)
         omap_hwmod_init_postsetup();
         omap3xxx_clk_init();
 }
+
+void __init omap3_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
+
+void __init omap3430_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
+
+void __init omap35xx_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
+
+void __init omap3630_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
+
+void __init am35xx_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
+
+void __init ti81xx_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap3_pm_init();
+}
 #endif
 
 #ifdef CONFIG_ARCH_OMAP4
@@ -435,6 +491,13 @@ void __init omap4430_init_early(void)
         omap_hwmod_init_postsetup();
         omap4xxx_clk_init();
 }
+
+void __init omap4430_init_late(void)
+{
+        omap_mux_late_init();
+        omap2_common_pm_late_init();
+        omap4_pm_init();
+}
 #endif
 
 void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,