summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Vadillo <vadillo@ti.com>2011-02-15 18:03:25 -0600
committerSebastien Jan <s-jan@ti.com>2011-12-20 16:52:41 +0100
commit8ca97b3e48a4620a0a44e5d759ebd871b56b8aa8 (patch)
treec44ff581ddba7caabb65af5d35f4e2cae36e29aa
parentdebadf56e1cfa3e547b9ae77f85657231c30ed34 (diff)
syslink: ipu_pm: remove gptimer 9 as requestable
gptimer 4 and 9 are used by IPU as ticks for both M3 cores thus remove it from the list of requestable resources by IPU resource manager. Change-Id: I228bf5a656508c89c8c6deaa02404fc8359d75b1 Signed-off-by: Miguel Vadillo <vadillo@ti.com>
-rw-r--r--drivers/dsp/syslink/ipu_pm/ipu_pm.c1
-rw-r--r--drivers/dsp/syslink/ipu_pm/ipu_pm.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dsp/syslink/ipu_pm/ipu_pm.c b/drivers/dsp/syslink/ipu_pm/ipu_pm.c
index a81123238d3c..2f0da6d6ff35 100644
--- a/drivers/dsp/syslink/ipu_pm/ipu_pm.c
+++ b/drivers/dsp/syslink/ipu_pm/ipu_pm.c
@@ -329,7 +329,6 @@ static void __iomem *fdifHandle;
static struct clk *clk_opt_iss;
/* Ducati Interrupt Capable Gptimers */
static int ipu_timer_list[NUM_IPU_TIMERS] = {
- GP_TIMER_9,
GP_TIMER_11};
/* I2C spinlock assignment mapping table */
diff --git a/drivers/dsp/syslink/ipu_pm/ipu_pm.h b/drivers/dsp/syslink/ipu_pm/ipu_pm.h
index 88a9cb4dbd97..383007132e35 100644
--- a/drivers/dsp/syslink/ipu_pm/ipu_pm.h
+++ b/drivers/dsp/syslink/ipu_pm/ipu_pm.h
@@ -134,7 +134,7 @@
#define GP_TIMER_4 4
#define GP_TIMER_9 9
#define GP_TIMER_11 11
-#define NUM_IPU_TIMERS 2
+#define NUM_IPU_TIMERS 1
#define I2C_SL_INVAL -1
#define I2C_1_SL 0