openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Tero Kristo <t-kristo@ti.com>
Tested-by: Nishanth Menon <nm@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
Tero Kristo 2013-08-02 14:32:30 +03:00 committed by Mike Turquette
parent 149c09d3a6
commit 3e04915791
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/mach-omap2/io.c
View File

@ -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)
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)