|
@@ -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(tcd->clk);
|
|
|
+ clk_disable_unprepare(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_enable(tcd->clk);
|
|
|
+ clk_prepare_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_enable(tcd->clk);
|
|
|
+ clk_prepare_enable(tcd->clk);
|
|
|
|
|
|
/* slow clock, count up to RC, then irq and stop */
|
|
|
__raw_writel(timer_clock | ATMEL_TC_CPCSTOP
|
|
@@ -265,6 +265,7 @@ static int __init tcb_clksrc_init(void)
|
|
|
int best_divisor_idx = -1;
|
|
|
int clk32k_divisor_idx = -1;
|
|
|
int i;
|
|
|
+ int ret;
|
|
|
|
|
|
tc = atmel_tc_alloc(CONFIG_ATMEL_TCB_CLKSRC_BLOCK, clksrc.name);
|
|
|
if (!tc) {
|
|
@@ -275,7 +276,11 @@ static int __init tcb_clksrc_init(void)
|
|
|
pdev = tc->pdev;
|
|
|
|
|
|
t0_clk = tc->clk[0];
|
|
|
- clk_enable(t0_clk);
|
|
|
+ ret = clk_prepare_enable(t0_clk);
|
|
|
+ if (ret) {
|
|
|
+ pr_debug("can't enable T0 clk\n");
|
|
|
+ goto err_free_tc;
|
|
|
+ }
|
|
|
|
|
|
/* How fast will we be counting? Pick something over 5 MHz. */
|
|
|
rate = (u32) clk_get_rate(t0_clk);
|
|
@@ -313,7 +318,11 @@ static int __init tcb_clksrc_init(void)
|
|
|
/* tclib will give us three clocks no matter what the
|
|
|
* underlying platform supports.
|
|
|
*/
|
|
|
- clk_enable(tc->clk[1]);
|
|
|
+ ret = clk_prepare_enable(tc->clk[1]);
|
|
|
+ if (ret) {
|
|
|
+ pr_debug("can't enable T1 clk\n");
|
|
|
+ goto err_disable_t0;
|
|
|
+ }
|
|
|
/* setup both channel 0 & 1 */
|
|
|
tcb_setup_dual_chan(tc, best_divisor_idx);
|
|
|
}
|
|
@@ -325,5 +334,12 @@ static int __init tcb_clksrc_init(void)
|
|
|
setup_clkevents(tc, clk32k_divisor_idx);
|
|
|
|
|
|
return 0;
|
|
|
+
|
|
|
+err_disable_t0:
|
|
|
+ clk_disable_unprepare(t0_clk);
|
|
|
+
|
|
|
+err_free_tc:
|
|
|
+ atmel_tc_free(tc);
|
|
|
+ return ret;
|
|
|
}
|
|
|
arch_initcall(tcb_clksrc_init);
|