diff options
| author | Miguel Vadillo <vadillo@ti.com> | 2011-04-07 08:43:52 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:43:52 +0100 |
| commit | 7640fdf2dfd977c4537c0e7b8077e2a961451cf9 (patch) | |
| tree | 6a940d07646ceb576d85dfd228c4dbc4c0ac8af9 | |
| parent | fb71c880043d91be86657b2b52562926742dc315 (diff) | |
commit 56707db6442abd931b11e3ba59bc0d8239df6a95
syslink: ipu_pm: hack to sofreset iss & fdif
After an iommufault iss and fdif need to be reset
for the proper reuse of both.
The proper api to call is _softreset() but for that
sysc struct in hwmod needs to be enabled but that part
is not ready.
This is hack until the proper fix is done in sysc and
the proper api can be used to softreset.
Change-Id: I7568308bcd49697946a08a1b03b6a846dd0c9f5d
Signed-off-by: Miguel Vadillo <vadillo@ti.com>
Signed-off-by: Juan Gutierrez <jgutierrez@ti.com>
| -rw-r--r-- | drivers/dsp/syslink/ipu_pm/ipu_pm.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/drivers/dsp/syslink/ipu_pm/ipu_pm.c b/drivers/dsp/syslink/ipu_pm/ipu_pm.c index 5ed0d90a293..b19522a2c43 100644 --- a/drivers/dsp/syslink/ipu_pm/ipu_pm.c +++ b/drivers/dsp/syslink/ipu_pm/ipu_pm.c @@ -1,4 +1,5 @@ #define TMP_AUX_CLK_HACK 1 /* should be removed by Nov 13, 2010 */ +#define SR_WA /* * ipu_pm.c * @@ -319,6 +320,10 @@ static bool first_time = 1; /* BIOS flags states for each core in IPU */ static void __iomem *sysm3Idle; static void __iomem *appm3Idle; +#ifdef SR_WA +static void __iomem *issHandle; +static void __iomem *fdifHandle; +#endif /* Ducati Interrupt Capable Gptimers */ static int ipu_timer_list[NUM_IPU_TIMERS] = { @@ -1720,6 +1725,16 @@ static inline int ipu_pm_rel_fdif(struct ipu_pm_object *handle, retval = ipu_pm_module_stop(rcb_p->sub_type); if (retval) return PM_UNSUPPORTED; + +#ifdef SR_WA + /* Make sure the clock domain is in idle if not softreset */ + if ((cm_read_mod_reg(OMAP4430_CM2_CAM_MOD, + OMAP4_CM_CAM_CLKSTCTRL_OFFSET)) & 0x400) { + __raw_writel(__raw_readl(fdifHandle + 0x10) | 0x1, + fdifHandle + 0x10); + } +#endif + params->pm_fdif_counter--; pr_debug("Release FDIF\n"); @@ -1901,10 +1916,19 @@ static inline int ipu_pm_rel_iss(struct ipu_pm_object *handle, retval = ipu_pm_module_stop(rcb_p->sub_type); if (retval) { - pr_err("%s %d Error releasing ISSs\n", __func__, __LINE__); + pr_err("%s %d Error releasing ISS\n", __func__, __LINE__); return PM_UNSUPPORTED; } +#ifdef SR_WA + /* Make sure the clock domain is in idle if not softreset */ + if ((cm_read_mod_reg(OMAP4430_CM2_CAM_MOD, + OMAP4_CM_CAM_CLKSTCTRL_OFFSET)) & 0x100) { + __raw_writel(__raw_readl(issHandle + 0x10) | 0x1, + issHandle + 0x10); + } +#endif + /* FIXME: * disable OPTFCLKEN_CTRLCLK for camera sensors * should be moved to a separate function for @@ -2707,7 +2731,10 @@ int ipu_pm_setup(struct ipu_pm_config *cfg) iounmap(sysm3Idle); goto exit; } - +#ifdef SR_WA + issHandle = ioremap(0x52000000, (sizeof(void) * 1)); + fdifHandle = ioremap(0x4A10A000, (sizeof(void) * 1)); +#endif BLOCKING_INIT_NOTIFIER_HEAD(&ipu_pm_notifier); return retval; @@ -2971,6 +2998,12 @@ int ipu_pm_destroy(void) first_time = 1; iounmap(sysm3Idle); +#ifdef SR_WA + iounmap(issHandle); + iounmap(fdifHandle); + issHandle = NULL; + fdifHandle = NULL; +#endif sysm3Idle = NULL; appm3Idle = NULL; global_rcb = NULL; |