1 files changed, 86 insertions, 25 deletions

diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 3b0cfeb33d05..54ed4e6e429e 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -42,9 +42,11 @@
 #include <linux/pm_runtime.h>
 
 #include <plat/dmtimer.h>
+#include <plat/omap-pm.h>
 
 #include <mach/hardware.h>
 
+static u32 omap_reserved_systimers;
 static LIST_HEAD(omap_timer_list);
 static DEFINE_SPINLOCK(dm_timer_lock);
 
@@ -133,17 +135,22 @@ static void omap_dm_timer_reset(struct omap_dm_timer *timer)
 
 int omap_dm_timer_prepare(struct omap_dm_timer *timer)
 {
-        struct dmtimer_platform_data *pdata = timer->pdev->dev.platform_data;
         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 (pdata->needs_manual_reset)
+        if (timer->capability & OMAP_TIMER_NEEDS_RESET)
                 omap_dm_timer_reset(timer);
 
         ret = omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_32_KHZ);
@@ -152,6 +159,21 @@ int omap_dm_timer_prepare(struct omap_dm_timer *timer)
         return ret;
 }
 
+static inline u32 omap_dm_timer_reserved_systimer(int id)
+{
+        return (omap_reserved_systimers & (1 << (id - 1))) ? 1 : 0;
+}
+
+int omap_dm_timer_reserve_systimer(int id)
+{
+        if (omap_dm_timer_reserved_systimer(id))
+                return -ENODEV;
+
+        omap_reserved_systimers |= (1 << (id - 1));
+
+        return 0;
+}
+
 struct omap_dm_timer *omap_dm_timer_request(void)
 {
         struct omap_dm_timer *timer = NULL, *t;
@@ -325,10 +347,9 @@ int omap_dm_timer_start(struct omap_dm_timer *timer)
 
         omap_dm_timer_enable(timer);
 
-        if (timer->loses_context) {
-                u32 ctx_loss_cnt_after =
-                        timer->get_context_loss_count(&timer->pdev->dev);
-                if (ctx_loss_cnt_after != timer->ctx_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON)) {
+                if (omap_pm_get_dev_context_loss_count(&timer->pdev->dev) !=
+                                timer->ctx_loss_count)
                         omap_timer_restore_context(timer);
         }
 
@@ -347,20 +368,18 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_start);
 int omap_dm_timer_stop(struct omap_dm_timer *timer)
 {
         unsigned long rate = 0;
-        struct dmtimer_platform_data *pdata;
 
         if (unlikely(!timer))
                 return -EINVAL;
 
-        pdata = timer->pdev->dev.platform_data;
-        if (!pdata->needs_manual_reset)
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET))
                 rate = clk_get_rate(timer->fclk);
 
         __omap_dm_timer_stop(timer, timer->posted, rate);
 
-        if (timer->loses_context && timer->get_context_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON))
                 timer->ctx_loss_count =
-                        timer->get_context_loss_count(&timer->pdev->dev);
+                        omap_pm_get_dev_context_loss_count(&timer->pdev->dev);
 
         /*
          * Since the register values are computed and written within
@@ -378,6 +397,8 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_stop);
 int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
 {
         int ret;
+        char *parent_name = NULL;
+        struct clk *fclk, *parent;
         struct dmtimer_platform_data *pdata;
 
         if (unlikely(!timer))
@@ -388,7 +409,49 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
         if (source < 0 || source >= 3)
                 return -EINVAL;
 
-        ret = pdata->set_timer_src(timer->pdev, source);
+        /*
+         * FIXME: Used for OMAP1 devices only because they do not currently
+         * use the clock framework to set the parent clock. To be removed
+         * once OMAP1 migrated to using clock framework for dmtimers
+         */
+        if (pdata->set_timer_src)
+                return pdata->set_timer_src(timer->pdev, source);
+
+        fclk = clk_get(&timer->pdev->dev, "fck");
+        if (IS_ERR_OR_NULL(fclk)) {
+                pr_err("%s: fck not found\n", __func__);
+                return -EINVAL;
+        }
+
+        switch (source) {
+        case OMAP_TIMER_SRC_SYS_CLK:
+                parent_name = "timer_sys_ck";
+                break;
+
+        case OMAP_TIMER_SRC_32_KHZ:
+                parent_name = "timer_32k_ck";
+                break;
+
+        case OMAP_TIMER_SRC_EXT_CLK:
+                parent_name = "timer_ext_ck";
+                break;
+        }
+
+        parent = clk_get(&timer->pdev->dev, parent_name);
+        if (IS_ERR_OR_NULL(parent)) {
+                pr_err("%s: %s not found\n", __func__, parent_name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        ret = clk_set_parent(fclk, parent);
+        if (IS_ERR_VALUE(ret))
+                pr_err("%s: failed to set %s as parent\n", __func__,
+                        parent_name);
+
+        clk_put(parent);
+out:
+        clk_put(fclk);
 
         return ret;
 }
@@ -431,10 +494,9 @@ int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
 
         omap_dm_timer_enable(timer);
 
-        if (timer->loses_context) {
-                u32 ctx_loss_cnt_after =
-                        timer->get_context_loss_count(&timer->pdev->dev);
-                if (ctx_loss_cnt_after != timer->ctx_loss_count)
+        if (!(timer->capability & OMAP_TIMER_ALWON)) {
+                if (omap_pm_get_dev_context_loss_count(&timer->pdev->dev) !=
+                                timer->ctx_loss_count)
                         omap_timer_restore_context(timer);
         }
 
@@ -674,13 +736,12 @@ static int __devinit omap_dm_timer_probe(struct platform_device *pdev)
 
         timer->id = pdev->id;
         timer->irq = irq->start;
-        timer->reserved = pdata->reserved;
+        timer->reserved = omap_dm_timer_reserved_systimer(timer->id);
         timer->pdev = pdev;
-        timer->loses_context = pdata->loses_context;
-        timer->get_context_loss_count = pdata->get_context_loss_count;
+        timer->capability = pdata->timer_capability;
 
         /* Skip pm_runtime_enable for OMAP1 */
-        if (!pdata->needs_manual_reset) {
+        if (!(timer->capability & OMAP_TIMER_NEEDS_RESET)) {
                 pm_runtime_enable(&pdev->dev);
                 pm_runtime_irq_safe(&pdev->dev);
         }