diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 15:36:08 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 15:36:08 -0500 |
| commit | 8c3b2296f1aa13d7504d2c09bc819cef3759562a (patch) | |
| tree | ab97efb5785f77ed83292c97ba9e5909cfee8fba /arch/arm/mach-mxs/timer.c | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| parent | e1482a1708e48add8d2f4ecc949885e0e552d9e8 (diff) | |
Merge branch 'imx/clk' into next/clk
* imx/clk:
ARM: mxs: select HAVE_CLK_PREPARE for clock
clk: add config option HAVE_CLK_PREPARE into Kconfig
ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
video: mxsfb: convert to clk_prepare/clk_unprepare
serial: mxs-auart: convert to clk_prepare/clk_unprepare
net: flexcan: convert to clk_prepare/clk_unprepare
mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
dma: mxs-dma: convert to clk_prepare/clk_unprepare
net: fec: add clk_prepare/clk_unprepare
ARM: mxs: convert platform code to clk_prepare/clk_unprepare
clk: add helper functions clk_prepare_enable and clk_disable_unprepare
Diffstat (limited to 'arch/arm/mach-mxs/timer.c')
| -rw-r--r-- | arch/arm/mach-mxs/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c index cace0d2e5a55..564a63279f18 100644 --- a/arch/arm/mach-mxs/timer.c +++ b/arch/arm/mach-mxs/timer.c | |||
| @@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) | |||
| 245 | 245 | ||
| 246 | void __init mxs_timer_init(struct clk *timer_clk, int irq) | 246 | void __init mxs_timer_init(struct clk *timer_clk, int irq) |
| 247 | { | 247 | { |
| 248 | clk_enable(timer_clk); | 248 | clk_prepare_enable(timer_clk); |
| 249 | 249 | ||
| 250 | /* | 250 | /* |
| 251 | * Initialize timers to a known state | 251 | * Initialize timers to a known state |