Commit 3e049157 authored by Tero Kristo's avatar Tero Kristo Committed by Mike Turquette

ARM: OMAP3: use DT clock init if DT data is available

OMAP3 platforms support both DT and non-DT boot at the moment, make
the clock init work according to the used setup.
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 149c09d3
...@@ -488,21 +488,29 @@ void __init omap3_init_early(void) ...@@ -488,21 +488,29 @@ void __init omap3_init_early(void)
void __init omap3430_init_early(void) void __init omap3430_init_early(void)
{ {
omap3_init_early(); omap3_init_early();
if (of_have_populated_dt())
omap_clk_soc_init = omap3430_dt_clk_init;
} }
void __init omap35xx_init_early(void) void __init omap35xx_init_early(void)
{ {
omap3_init_early(); omap3_init_early();
if (of_have_populated_dt())
omap_clk_soc_init = omap3430_dt_clk_init;
} }
void __init omap3630_init_early(void) void __init omap3630_init_early(void)
{ {
omap3_init_early(); omap3_init_early();
if (of_have_populated_dt())
omap_clk_soc_init = omap3630_dt_clk_init;
} }
void __init am35xx_init_early(void) void __init am35xx_init_early(void)
{ {
omap3_init_early(); omap3_init_early();
if (of_have_populated_dt())
omap_clk_soc_init = am35xx_dt_clk_init;
} }
void __init ti81xx_init_early(void) void __init ti81xx_init_early(void)
...@@ -520,7 +528,10 @@ void __init ti81xx_init_early(void) ...@@ -520,7 +528,10 @@ void __init ti81xx_init_early(void)
omap3xxx_clockdomains_init(); omap3xxx_clockdomains_init();
omap3xxx_hwmod_init(); omap3xxx_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = omap3xxx_clk_init; if (of_have_populated_dt())
omap_clk_soc_init = ti81xx_dt_clk_init;
else
omap_clk_soc_init = omap3xxx_clk_init;
} }
void __init omap3_init_late(void) void __init omap3_init_late(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment