diff options
| author | Tero Kristo <t-kristo@ti.com> | 2013-08-02 14:32:30 +0300 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-01-17 12:37:31 -0800 |
| commit | 3e049157911ad0126b6e21460251f84fb38aad63 (patch) | |
| tree | 943ba0669c9f49cd0a2513b6bf7682db64b1dae6 /arch/arm/mach-omap2/io.c | |
| parent | 149c09d3a61dcb90b9cc55beafc70f06e80389f1 (diff) | |
| download | blackbird-op-linux-3e049157911ad0126b6e21460251f84fb38aad63.tar.gz blackbird-op-linux-3e049157911ad0126b6e21460251f84fb38aad63.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index f28399f7ed4f..b8097fe498ec 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -488,21 +488,29 @@ void __init omap3_init_early(void) void __init omap3430_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3430_dt_clk_init; } void __init omap35xx_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3430_dt_clk_init; } void __init omap3630_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = omap3630_dt_clk_init; } void __init am35xx_init_early(void) { omap3_init_early(); + if (of_have_populated_dt()) + omap_clk_soc_init = am35xx_dt_clk_init; } void __init ti81xx_init_early(void) @@ -520,7 +528,10 @@ void __init ti81xx_init_early(void) omap3xxx_clockdomains_init(); omap3xxx_hwmod_init(); 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) |
