Skip to content

Commit

Permalink
ARM: OMAP2+: Move common part of late init into common function
Browse files Browse the repository at this point in the history
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Ruslan Bilovol authored and Tony Lindgren committed Apr 8, 2013
1 parent 31880c3 commit 4ed12be
Showing 1 changed file with 15 additions and 18 deletions.
33 changes: 15 additions & 18 deletions arch/arm/mach-omap2/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,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)
{
Expand All @@ -408,8 +414,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();
}
Expand Down Expand Up @@ -438,8 +443,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();
}
Expand Down Expand Up @@ -511,48 +515,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();
}
Expand Down Expand Up @@ -604,8 +602,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();
}
Expand Down

0 comments on commit 4ed12be

Please sign in to comment.