aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-03-06 16:30:18 +0900
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-12 22:19:43 +0100
commit12bb16d2308c8590f836df78a1462d1c9421e06a (patch)
tree40d3a5f62bf70fbc9268909ea7fb49f641b2a061 /arch/arm
parentARM: mach-shmobile: rename clk_init() to shmobile_clk_init() (diff)
downloadlinux-dev-12bb16d2308c8590f836df78a1462d1c9421e06a.tar.xz
linux-dev-12bb16d2308c8590f836df78a1462d1c9421e06a.zip
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 <damm@opensource.se> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/board-mackerel.c6
1 files 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 = {