|
@@ -226,10 +226,10 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void __init mxs_timer_init(struct device_node *np)
|
|
|
+static int __init mxs_timer_init(struct device_node *np)
|
|
|
{
|
|
|
struct clk *timer_clk;
|
|
|
- int irq;
|
|
|
+ int irq, ret;
|
|
|
|
|
|
mxs_timrot_base = of_iomap(np, 0);
|
|
|
WARN_ON(!mxs_timrot_base);
|
|
@@ -237,10 +237,12 @@ static void __init mxs_timer_init(struct device_node *np)
|
|
|
timer_clk = of_clk_get(np, 0);
|
|
|
if (IS_ERR(timer_clk)) {
|
|
|
pr_err("%s: failed to get clk\n", __func__);
|
|
|
- return;
|
|
|
+ return PTR_ERR(timer_clk);
|
|
|
}
|
|
|
|
|
|
- clk_prepare_enable(timer_clk);
|
|
|
+ ret = clk_prepare_enable(timer_clk);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
/*
|
|
|
* Initialize timers to a known state
|
|
@@ -278,11 +280,19 @@ static void __init mxs_timer_init(struct device_node *np)
|
|
|
mxs_timrot_base + HW_TIMROT_FIXED_COUNTn(1));
|
|
|
|
|
|
/* init and register the timer to the framework */
|
|
|
- mxs_clocksource_init(timer_clk);
|
|
|
- mxs_clockevent_init(timer_clk);
|
|
|
+ ret = mxs_clocksource_init(timer_clk);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
+
|
|
|
+ ret = mxs_clockevent_init(timer_clk);
|
|
|
+ if (ret)
|
|
|
+ return ret;
|
|
|
|
|
|
/* Make irqs happen */
|
|
|
irq = irq_of_parse_and_map(np, 0);
|
|
|
- setup_irq(irq, &mxs_timer_irq);
|
|
|
+ if (irq <= 0)
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ return setup_irq(irq, &mxs_timer_irq);
|
|
|
}
|
|
|
-CLOCKSOURCE_OF_DECLARE(mxs, "fsl,timrot", mxs_timer_init);
|
|
|
+CLOCKSOURCE_OF_DECLARE_RET(mxs, "fsl,timrot", mxs_timer_init);
|