omap: remoteproc: use gptimer 4 and 9 as ipu clk

Enable gptimer 4 and 9 to be used as ipu clk. Gptimers will
be requested when calling rproc_start() and released them
when calling rproc_stop(), also when hibernating ipu the
gptimers will be stop/start to ensure proper pm functionality.

The gptimer numbers are configurable, currently 4 will be used
by ipu_c0 and 9 by ipu_c1.

Change-Id: I9424991e34e786ab2f57a1dc625ae801290fd7b6
Reported-by: Paul Hunt <hunt@ti.com>
Signed-off-by: Miguel Vadillo <vadillo@ti.com>

3 files changed, 39 insertions, 14 deletions

diff --git a/arch/arm/mach-omap2/remoteproc44xx.c b/arch/arm/mach-omap2/remoteproc44xx.c
index f87a2809716..7549798ff81 100644
--- a/arch/arm/mach-omap2/remoteproc44xx.c
+++ b/arch/arm/mach-omap2/remoteproc44xx.c
@@ -37,10 +37,10 @@ static inline int proc44x_start(struct device *dev, u32 start_addr)
                                                 to_platform_device(dev));
         int ret = 0;
 
-        /* Enable the Timer that would be used by co-processor */
-        if (obj->timer_id >= 0) {
+        /* Enable the Timer that would be used by co-processor for HIB/WD*/
+        if (obj->timer_hib_id >= 0) {
                 obj->dmtimer =
-                        omap_dm_timer_request_specific(obj->timer_id);
+                        omap_dm_timer_request_specific(obj->timer_hib_id);
                 if (!obj->dmtimer) {
                         ret = -EBUSY;
                         goto err_start;
@@ -50,6 +50,19 @@ static inline int proc44x_start(struct device *dev, u32 start_addr)
                 omap_dm_timer_set_source(obj->dmtimer, OMAP_TIMER_SRC_SYS_CLK);
         }
 
+        /* Enable the Timer that would be used by co-processor as Clock*/
+        if (obj->timer_clk_id >= 0) {
+                obj->dmtimer_clk =
+                        omap_dm_timer_request_specific(obj->timer_clk_id);
+                if (!obj->dmtimer_clk) {
+                        ret = -EBUSY;
+                        goto err_start;
+                }
+
+                omap_dm_timer_set_source(obj->dmtimer_clk,
+                                                        OMAP_TIMER_SRC_SYS_CLK);
+        }
+
         ret = omap_device_enable(pdev);
         if (ret)
                 goto err_start;
@@ -80,6 +93,11 @@ static inline int proc44x_stop(struct device *dev)
                 obj->dmtimer = NULL;
         }
 
+        if (obj->dmtimer_clk) {
+                        omap_dm_timer_free(obj->dmtimer_clk);
+                        obj->dmtimer_clk = NULL;
+        }
+
         obj->state = OMAP_RPROC_STOPPED;
         return ret;
 }
@@ -98,6 +116,8 @@ static inline int proc44x_sleep(struct device *dev)
 
                 if (obj->dmtimer)
                         omap_dm_timer_stop(obj->dmtimer);
+                if (obj->dmtimer_clk)
+                        omap_dm_timer_stop(obj->dmtimer_clk);
         }
 
         obj->state = OMAP_RPROC_HIBERNATING;
@@ -113,6 +133,8 @@ static inline int proc44x_wakeup(struct device *dev)
 
         if (obj->dmtimer)
                 omap_dm_timer_start(obj->dmtimer);
+        if (obj->dmtimer_clk)
+                omap_dm_timer_start(obj->dmtimer_clk);
 
         ret = omap_device_enable(pdev);
         if (ret)
@@ -164,27 +186,26 @@ static struct omap_rproc_platform_data omap4_rproc_data[] = {
                 .name = "tesla",
                 .ops = &omap4_tesla_ops,
                 .oh_name = "dsp_c0",
-                .timer_id = 5,
+                .timer_clk_id = 5,
+                .timer_hib_id = -1,
         },
         {
                 .name = "ducati-proc0",
                 .ops = &omap4_ducati0_ops,
                 .oh_name = "ipu_c0",
+                .timer_clk_id = 4,
 #ifdef CONFIG_SYSLINK_IPU_SELF_HIBERNATION
-                .timer_id = 3,
+                .timer_hib_id = 3,
 #else
-                .timer_id = -1,
+                .timer_hib_id = -1,
 #endif
         },
         {
                 .name = "ducati-proc1",
                 .ops = &omap4_ducati1_ops,
                 .oh_name = "ipu_c1",
-#ifdef CONFIG_SYSLINK_IPU_SELF_HIBERNATION
-                .timer_id = 4,
-#else
-                .timer_id = -1,
-#endif
+                .timer_clk_id = 9,
+                .timer_hib_id = -1,
 
         },
 };
diff --git a/arch/arm/plat-omap/include/plat/remoteproc.h b/arch/arm/plat-omap/include/plat/remoteproc.h
index 3c579927416..5ed9bc8376d 100644
--- a/arch/arm/plat-omap/include/plat/remoteproc.h
+++ b/arch/arm/plat-omap/include/plat/remoteproc.h
@@ -90,7 +90,8 @@ struct omap_rproc_platform_data {
         struct omap_rproc_ops *ops;
         char *name;
         char *oh_name;
-        int timer_id;
+        int timer_hib_id;
+        int timer_clk_id;
 };
 
 struct omap_rproc {
@@ -102,8 +103,10 @@ struct omap_rproc {
         int minor;
         struct blocking_notifier_head   notifier;
         struct mutex lock;
-        int timer_id;
+        int timer_hib_id;
+        int timer_clk_id;
         struct omap_dm_timer *dmtimer;
+        struct omap_dm_timer *dmtimer_clk;
         struct list_head event_list;
         spinlock_t event_lock;
 };
diff --git a/arch/arm/plat-omap/remoteproc.c b/arch/arm/plat-omap/remoteproc.c
index 3b544bfefaf..4f66af4e7e9 100644
--- a/arch/arm/plat-omap/remoteproc.c
+++ b/arch/arm/plat-omap/remoteproc.c
@@ -418,7 +418,8 @@ static int omap_rproc_probe(struct platform_device *pdev)
         atomic_set(&rproc->count, 0);
         rproc->name = pdata->name;
 
-        rproc->timer_id = pdata->timer_id;
+        rproc->timer_clk_id = pdata->timer_clk_id;
+        rproc->timer_hib_id = pdata->timer_hib_id;
 
         mutex_init(&rproc->lock);
         BLOCKING_INIT_NOTIFIER_HEAD(&rproc->notifier);