ARM: OMAP2+: Remove hard-coded test on timer ID

Currently, when configuring the clock-events and clock-source timers
for OMAP2+ devices, we check whether the timer ID is 12 before
attempting to set the parent clock for the timer.

This test was added for OMAP3 general purpose devices (no security
features enabled) that a 12th timer available but unlike the other
timers only has a single functional clock source. Calling
clk_set_parent() for this 12th timer would always return an error
because there is only one choice for a parent clock. Therefore,
this hard-coded timer ID test was added.

To avoid this timer ID test, simply check to see if the timer's current
parent clock is the desired parent clock and only call clk_set_parent()
if this is not the case.

Also if clk_get() fails, then use PTR_ERR() to return the error code.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 7d67d21fe52c3d47edf6178917b53662417e4e81..760a02618178f9defabc12d22120a55ca6a1c87b 100644 (file)
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -225,6 +225,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
        struct device_node *np;
        struct omap_hwmod *oh;
        struct resource irq, mem;
+       struct clk *src;
        int r = 0;
 
        if (of_have_populated_dt()) {
@@ -279,24 +280,24 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
        /* After the dmtimer is using hwmod these clocks won't be needed */
        timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh));
        if (IS_ERR(timer->fclk))
-               return -ENODEV;
+               return PTR_ERR(timer->fclk);
+
+       src = clk_get(NULL, fck_source);
+       if (IS_ERR(src))
+               return PTR_ERR(src);
 
-       /* FIXME: Need to remove hard-coded test on timer ID */
-       if (gptimer_id != 12) {
-               struct clk *src;
-
-               src = clk_get(NULL, fck_source);
-               if (IS_ERR(src)) {
-                       r = -EINVAL;
-               } else {
-                       r = clk_set_parent(timer->fclk, src);
-                       if (r < 0)
-                               pr_warn("%s: %s cannot set source\n",
-                                       __func__, oh->name);
+       if (clk_get_parent(timer->fclk) != src) {
+               r = clk_set_parent(timer->fclk, src);
+               if (r < 0) {
+                       pr_warn("%s: %s cannot set source\n", __func__,
+                               oh->name);
                        clk_put(src);
+                       return r;
                }
        }
 
+       clk_put(src);
+
        omap_hwmod_setup_one(oh_name);
        omap_hwmod_enable(oh);
        __omap_dm_timer_init_regs(timer);