Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non...

[~andy/linux] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index e210fa830f8d7d076fdec7a23202bdab8b1a2089..09abf99e9e57bcc68af773e32cd1c26253144f1d 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -394,6 +394,13 @@ static void __init omap_hwmod_init_postsetup(void)
        omap_pm_if_early_init();
 }
 
+static void __init omap_common_late_init(void)
+{
+       omap_mux_late_init();
+       omap2_common_pm_late_init();
+       omap_soc_device_init();
+}
+
 #ifdef CONFIG_SOC_OMAP2420
 void __init omap2420_init_early(void)
 {
@@ -417,8 +424,7 @@ void __init omap2420_init_early(void)
 
 void __init omap2420_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap2_pm_init();
        omap2_clk_enable_autoidle_all();
 }
@@ -447,8 +453,7 @@ void __init omap2430_init_early(void)
 
 void __init omap2430_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap2_pm_init();
        omap2_clk_enable_autoidle_all();
 }
@@ -520,48 +525,42 @@ void __init ti81xx_init_early(void)
 
 void __init omap3_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
 
 void __init omap3430_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
 
 void __init omap35xx_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
 
 void __init omap3630_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
 
 void __init am35xx_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
 
 void __init ti81xx_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap3_pm_init();
        omap2_clk_enable_autoidle_all();
 }
@@ -613,8 +612,7 @@ void __init omap4430_init_early(void)
 
 void __init omap4430_init_late(void)
 {
-       omap_mux_late_init();
-       omap2_common_pm_late_init();
+       omap_common_late_init();
        omap4_pm_init();
        omap2_clk_enable_autoidle_all();
 }