diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-02-16 14:36:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 10:33:47 +0100 |
| commit | 30c730f8f90b08d77a73998d2ee34cf1f56e95cc (patch) | |
| tree | 4b73291db523a77d2ca36a65ba7e0d1a8ff6e56e /arch/arm/mach-mx1 | |
| parent | a2865197a5dad23c619c84f44b7fdf7fdbef3f9c (diff) | |
| download | linux-3.10-30c730f8f90b08d77a73998d2ee34cf1f56e95cc.tar.gz linux-3.10-30c730f8f90b08d77a73998d2ee34cf1f56e95cc.tar.bz2 linux-3.10-30c730f8f90b08d77a73998d2ee34cf1f56e95cc.zip | |
[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-mx1')
| -rw-r--r-- | arch/arm/mach-mx1/clock.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-mx1/mx1ads.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-mx1/clock.c b/arch/arm/mach-mx1/clock.c index 3c464331b87..40a2274380a 100644 --- a/arch/arm/mach-mx1/clock.c +++ b/arch/arm/mach-mx1/clock.c @@ -25,6 +25,7 @@ #include <mach/clock.h> #include <mach/hardware.h> +#include <mach/common.h> #include "crm_regs.h" static int _clk_enable(struct clk *clk) @@ -594,7 +595,7 @@ static struct clk *mxc_clks[] = { &rtc_clk, }; -int __init mxc_clocks_init(unsigned long fref) +int __init mx1_clocks_init(unsigned long fref) { struct clk **clkp; unsigned int reg; @@ -625,5 +626,7 @@ int __init mxc_clocks_init(unsigned long fref) clk_enable(&hclk); clk_enable(&fclk); + mxc_timer_init(&gpt_clk); + return 0; } diff --git a/arch/arm/mach-mx1/mx1ads.c b/arch/arm/mach-mx1/mx1ads.c index be7dd75ebbe..09dc77bb481 100644 --- a/arch/arm/mach-mx1/mx1ads.c +++ b/arch/arm/mach-mx1/mx1ads.c @@ -118,8 +118,7 @@ static void __init mx1ads_init(void) static void __init mx1ads_timer_init(void) { - mxc_clocks_init(32000); - mxc_timer_init("gpt_clk"); + mx1_clocks_init(32000); } struct sys_timer mx1ads_timer = { |