Signed-off-by: Ruslan Bilovol <ruslan.bilo...@ti.com>
---
 arch/arm/mach-omap2/io.c |   33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 2c3fdd6..ace87c8 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -379,6 +379,12 @@ 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();
+}
+
 #ifdef CONFIG_SOC_OMAP2420
 void __init omap2420_init_early(void)
 {
@@ -402,8 +408,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();
 }
@@ -432,8 +437,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();
 }
@@ -505,48 +509,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();
 }
@@ -598,8 +596,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();
 }
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to