diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-02-16 16:36:49 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 12:33:47 +0300 |
| commit | 30c730f8f90b08d77a73998d2ee34cf1f56e95cc (patch) | |
| tree | 4b73291db523a77d2ca36a65ba7e0d1a8ff6e56e /arch/arm/mach-mx3/clock.c | |
| parent | a2865197a5dad23c619c84f44b7fdf7fdbef3f9c (diff) | |
| download | linux-30c730f8f90b08d77a73998d2ee34cf1f56e95cc.tar.xz | |
[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-mx3/clock.c')
| -rw-r--r-- | arch/arm/mach-mx3/clock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index 8486ea46d6c1..8b41facb391b 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c @@ -25,6 +25,7 @@ #include <linux/io.h> #include <mach/clock.h> #include <mach/hardware.h> +#include <mach/common.h> #include <asm/div64.h> #include "crm_regs.h" @@ -1071,7 +1072,7 @@ static struct clk *mxc_clks[] = { &iim_clk, }; -int __init mxc_clocks_init(unsigned long fref) +int __init mx31_clocks_init(unsigned long fref) { u32 reg; struct clk **clkp; @@ -1121,6 +1122,8 @@ int __init mxc_clocks_init(unsigned long fref) __raw_writel(reg, MXC_CCM_PMCR1); } + mxc_timer_init(&ipg_clk); + return 0; } |