diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-02-16 08:36:49 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 05:33:47 -0400 |
commit | 30c730f8f90b08d77a73998d2ee34cf1f56e95cc (patch) | |
tree | 4b73291db523a77d2ca36a65ba7e0d1a8ff6e56e /arch/arm/mach-mx2/clock_imx27.c | |
parent | a2865197a5dad23c619c84f44b7fdf7fdbef3f9c (diff) |
[ARM] MXC: rework timer/clock initialisation
- rename mxc_clocks_init to architecture specific versions. This
allows us to have more than one architecture compiled in.
- call mxc_timer_init from clock initialisation instead from board
code
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx27.c')
-rw-r--r-- | arch/arm/mach-mx2/clock_imx27.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c index 047e71e6ea9a..7b2c1122d9ab 100644 --- a/arch/arm/mach-mx2/clock_imx27.c +++ b/arch/arm/mach-mx2/clock_imx27.c | |||
@@ -1551,7 +1551,7 @@ static void __init probe_mxc_clocks(void) | |||
1551 | * must be called very early to get information about the | 1551 | * must be called very early to get information about the |
1552 | * available clock rate when the timer framework starts | 1552 | * available clock rate when the timer framework starts |
1553 | */ | 1553 | */ |
1554 | int __init mxc_clocks_init(unsigned long fref) | 1554 | int __init mx27_clocks_init(unsigned long fref) |
1555 | { | 1555 | { |
1556 | u32 cscr; | 1556 | u32 cscr; |
1557 | struct clk **clkp; | 1557 | struct clk **clkp; |
@@ -1593,5 +1593,8 @@ int __init mxc_clocks_init(unsigned long fref) | |||
1593 | #ifdef CONFIG_DEBUG_LL_CONSOLE | 1593 | #ifdef CONFIG_DEBUG_LL_CONSOLE |
1594 | clk_enable(&uart1_clk[0]); | 1594 | clk_enable(&uart1_clk[0]); |
1595 | #endif | 1595 | #endif |
1596 | |||
1597 | mxc_timer_init(&gpt1_clk[0]); | ||
1598 | |||
1596 | return 0; | 1599 | return 0; |
1597 | } | 1600 | } |