|
@@ -100,7 +100,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
|
|
|
|| tcd->clkevt.mode == CLOCK_EVT_MODE_ONESHOT) {
|
|
|
__raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
|
|
|
__raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
|
|
|
- clk_disable_unprepare(tcd->clk);
|
|
|
+ clk_disable(tcd->clk);
|
|
|
}
|
|
|
|
|
|
switch (m) {
|
|
@@ -109,7 +109,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
|
|
|
* of oneshot, we get lower overhead and improved accuracy.
|
|
|
*/
|
|
|
case CLOCK_EVT_MODE_PERIODIC:
|
|
|
- clk_prepare_enable(tcd->clk);
|
|
|
+ clk_enable(tcd->clk);
|
|
|
|
|
|
/* slow clock, count up to RC, then irq and restart */
|
|
|
__raw_writel(timer_clock
|
|
@@ -126,7 +126,7 @@ static void tc_mode(enum clock_event_mode m, struct clock_event_device *d)
|
|
|
break;
|
|
|
|
|
|
case CLOCK_EVT_MODE_ONESHOT:
|
|
|
- clk_prepare_enable(tcd->clk);
|
|
|
+ clk_enable(tcd->clk);
|
|
|
|
|
|
/* slow clock, count up to RC, then irq and stop */
|
|
|
__raw_writel(timer_clock | ATMEL_TC_CPCSTOP
|
|
@@ -194,7 +194,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
|
|
|
ret = clk_prepare_enable(t2_clk);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
- clk_disable_unprepare(t2_clk);
|
|
|
+ clk_disable(t2_clk);
|
|
|
|
|
|
clkevt.regs = tc->regs;
|
|
|
clkevt.clk = t2_clk;
|