summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/da8xx-dt.c
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2018-01-19 21:20:22 -0600
committerSekhar Nori <nsekhar@ti.com>2018-02-19 16:25:15 +0530
commit96c081735d5197d9d4fa0b6ce84cffa3bb197474 (patch)
tree54606e24a0afc246be11cb3f80f0560c2ccbe323 /arch/arm/mach-davinci/da8xx-dt.c
parent4b785cc55e85e8be065a38ce9df29a2c32c7956a (diff)
downloadlwn-96c081735d5197d9d4fa0b6ce84cffa3bb197474.tar.gz
lwn-96c081735d5197d9d4fa0b6ce84cffa3bb197474.zip
ARM: davinci: move davinci_clk_init() to init_time
This moves the call of davinci_clk_init() from map_io to init_time for all boards. This is the proper place to init clocks. This is also done in preparation for moving to the common clock framework. dm646x is a special case because we need to handle different ref_clk rates depending on which board is being used. The clock init in this case is modified to set the rate before registering the clocks instead of using davinci_set_refclk_rate() to recalculate the entire clock tree after all of the clocks are registered. Also, the cpu_clks field is removed from struct davinci_soc_info since it is no longer needed. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/da8xx-dt.c')
-rw-r--r--arch/arm/mach-davinci/da8xx-dt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 779e8ce887c3..ab199f4b9ce4 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -96,7 +96,7 @@ static const char *const da850_boards_compat[] __initconst = {
DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x")
.map_io = da850_init,
- .init_time = davinci_timer_init,
+ .init_time = da850_init_time,
.init_machine = da850_init_machine,
.dt_compat = da850_boards_compat,
.init_late = davinci_init_late,