1 files changed, 11 insertions, 5 deletions

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index e3e22b3dc5c2..6510e5e7b7e3 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -137,11 +137,17 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
         int ret;
 
-        timer->fclk = clk_get(&timer->pdev->dev, "fck");
-        if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
-                timer->fclk = NULL;
-                dev_err(&timer->pdev->dev, ": No fclk handle.\n");
-                return -EINVAL;
+        /*
+         * FIXME: OMAP1 devices do not use the clock framework for dmtimers so
+         * do not call clk_get() for these devices.
+         */
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
+                timer->fclk = clk_get(&timer->pdev->dev, "fck");
+                if (WARN_ON_ONCE(IS_ERR_OR_NULL(timer->fclk))) {
+                        timer->fclk = NULL;
+                        dev_err(&timer->pdev->dev, ": No fclk handle.\n");
+                        return -EINVAL;
+                }
         }
 
         if (timer->capability & OMAP_TIMER_NEEDS_RESET)