aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-mackerel.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-03-06 02:30:18 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-12 17:19:43 -0400
commit12bb16d2308c8590f836df78a1462d1c9421e06a (patch)
tree40d3a5f62bf70fbc9268909ea7fb49f641b2a061 /arch/arm/mach-shmobile/board-mackerel.c
parent6b6a4c067cefe04eb0a0e7d1cace16ae727c6295 (diff)
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/mach-shmobile/board-mackerel.c')
-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)
1348 struct clk *clk; 1348 struct clk *clk;
1349 int ret; 1349 int ret;
1350 1350
1351 /* External clock source */
1352 clk_set_rate(&sh7372_dv_clki_clk, 27000000);
1353
1351 sh7372_pinmux_init(); 1354 sh7372_pinmux_init();
1352 1355
1353 /* enable SCIFA0 */ 1356 /* enable SCIFA0 */
@@ -1555,9 +1558,6 @@ static void __init mackerel_timer_init(void)
1555{ 1558{
1556 sh7372_clock_init(); 1559 sh7372_clock_init();
1557 shmobile_timer.init(); 1560 shmobile_timer.init();
1558
1559 /* External clock source */
1560 clk_set_rate(&sh7372_dv_clki_clk, 27000000);
1561} 1561}
1562 1562
1563static struct sys_timer mackerel_timer = { 1563static struct sys_timer mackerel_timer = {