From 12bb16d2308c8590f836df78a1462d1c9421e06a Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 6 Mar 2012 16:30:18 +0900 Subject: [PATCH] ARM: mach-shmobile: Move sh7372 Mackerel external clk setup Move the board specific external clock setting for sh7372 Mackerel from machine_desc->sys_timer->init() to machine_desc->init_machine(). This is ground work for shmobile timer code consolidation. Signed-off-by: Magnus Damm Signed-off-by: Rafael J. Wysocki --- arch/arm/mach-shmobile/board-mackerel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index de51c07b8686..b0740c82d70b 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -1348,6 +1348,9 @@ static void __init mackerel_init(void) struct clk *clk; int ret; + /* External clock source */ + clk_set_rate(&sh7372_dv_clki_clk, 27000000); + sh7372_pinmux_init(); /* enable SCIFA0 */ @@ -1555,9 +1558,6 @@ static void __init mackerel_timer_init(void) { sh7372_clock_init(); shmobile_timer.init(); - - /* External clock source */ - clk_set_rate(&sh7372_dv_clki_clk, 27000000); } static struct sys_timer mackerel_timer = { -- 2.20.1