ARM: OMAP2+: Initialize SoC PM later

There's no need to probe devices until at module_init time and we
currently have at least PM trying to use I2C for PMICs early on.

As only a part of the SoC init_early is SoC specific, we only need to call
the SoC specific PM init function. And we can modify omap2_common_pm_late_init()
so it becomes a late_initcall().

Note that this changes am335x to call omap2_clk_enable_autoidle_all() that
seems to be missing currently.

Cc: Keerthy <j-keerthy@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 9 insertions, 58 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 6ce60a478409..bb8e0bb7ef5d 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -422,11 +422,6 @@ static void __init __maybe_unused omap_hwmod_init_postsetup(void)
         omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state);
 }
 
-static void __init __maybe_unused omap_common_late_init(void)
-{
-        omap2_common_pm_late_init();
-}
-
 #ifdef CONFIG_SOC_OMAP2420
 void __init omap2420_init_early(void)
 {
@@ -447,9 +442,7 @@ void __init omap2420_init_early(void)
 
 void __init omap2420_init_late(void)
 {
-        omap_common_late_init();
-        omap2_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap2_pm_init;
 }
 #endif
 
@@ -473,9 +466,7 @@ void __init omap2430_init_early(void)
 
 void __init omap2430_init_late(void)
 {
-        omap_common_late_init();
-        omap2_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap2_pm_init;
 }
 #endif
 
@@ -526,43 +517,12 @@ void __init am35xx_init_early(void)
 
 void __init omap3_init_late(void)
 {
-        omap_common_late_init();
-        omap3_pm_init();
-        omap2_clk_enable_autoidle_all();
-}
-
-void __init omap3430_init_late(void)
-{
-        omap_common_late_init();
-        omap3_pm_init();
-        omap2_clk_enable_autoidle_all();
-}
-
-void __init omap35xx_init_late(void)
-{
-        omap_common_late_init();
-        omap3_pm_init();
-        omap2_clk_enable_autoidle_all();
-}
-
-void __init omap3630_init_late(void)
-{
-        omap_common_late_init();
-        omap3_pm_init();
-        omap2_clk_enable_autoidle_all();
-}
-
-void __init am35xx_init_late(void)
-{
-        omap_common_late_init();
-        omap3_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap3_pm_init;
 }
 
 void __init ti81xx_init_late(void)
 {
-        omap_common_late_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap_pm_nop_init;
 }
 #endif
 
@@ -618,8 +578,7 @@ void __init am33xx_init_early(void)
 
 void __init am33xx_init_late(void)
 {
-        omap_common_late_init();
-        amx3_common_pm_init();
+        omap_pm_soc_init = amx3_common_pm_init;
 }
 #endif
 
@@ -642,9 +601,7 @@ void __init am43xx_init_early(void)
 
 void __init am43xx_init_late(void)
 {
-        omap_common_late_init();
-        omap2_clk_enable_autoidle_all();
-        amx3_common_pm_init();
+        omap_pm_soc_init = amx3_common_pm_init;
 }
 #endif
 
@@ -672,9 +629,7 @@ void __init omap4430_init_early(void)
 
 void __init omap4430_init_late(void)
 {
-        omap_common_late_init();
-        omap4_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap4_pm_init;
 }
 #endif
 
@@ -700,9 +655,7 @@ void __init omap5_init_early(void)
 
 void __init omap5_init_late(void)
 {
-        omap_common_late_init();
-        omap4_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap4_pm_init;
 }
 #endif
 
@@ -725,9 +678,7 @@ void __init dra7xx_init_early(void)
 
 void __init dra7xx_init_late(void)
 {
-        omap_common_late_init();
-        omap4_pm_init();
-        omap2_clk_enable_autoidle_all();
+        omap_pm_soc_init = omap4_pm_init;
 }
 #endif