summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/io.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-02-24 17:51:05 +0100
committerTero Kristo <t-kristo@ti.com>2014-07-02 14:47:32 +0200
commit69a1e7a1feb5bac44a5a76380768596a12a33050 (patch)
treeb58585df4bdf1b70ebbee405834edb0a601fabb4 /arch/arm/mach-omap2/io.c
parentARM: OMAP2: PRM: add support for OMAP2 specific clock providers (diff)
downloadlinux-69a1e7a1feb5bac44a5a76380768596a12a33050.tar.xz
linux-69a1e7a1feb5bac44a5a76380768596a12a33050.zip
ARM: OMAP2: clock: use DT clock boot if available
Otherwise legacy boot clock data is used. This patch also includes the clock data files to the base dtsi files. Signed-off-by: Tero Kristo <t-kristo@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
-rw-r--r--arch/arm/mach-omap2/io.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 8f559450c876..80bf63359c24 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -53,6 +53,7 @@
#include "prm2xxx.h"
#include "prm3xxx.h"
#include "prm44xx.h"
+#include "opp2xxx.h"
/*
* omap_clk_soc_init: points to a function that does the SoC-specific
@@ -410,7 +411,12 @@ void __init omap2420_init_early(void)
omap242x_clockdomains_init();
omap2420_hwmod_init();
omap_hwmod_init_postsetup();
- omap_clk_soc_init = omap2420_clk_init;
+ if (of_have_populated_dt()) {
+ omap_clk_soc_init = omap2420_dt_clk_init;
+ rate_table = omap2420_rate_table;
+ } else {
+ omap_clk_soc_init = omap2420_clk_init;
+ }
}
void __init omap2420_init_late(void)
@@ -439,7 +445,12 @@ void __init omap2430_init_early(void)
omap243x_clockdomains_init();
omap2430_hwmod_init();
omap_hwmod_init_postsetup();
- omap_clk_soc_init = omap2430_clk_init;
+ if (of_have_populated_dt()) {
+ omap_clk_soc_init = omap2430_dt_clk_init;
+ rate_table = omap2430_rate_table;
+ } else {
+ omap_clk_soc_init = omap2430_clk_init;
+ }
}
void __init omap2430_init_late(void)