diff options
| author |   Philipp Zabel <p.zabel@pengutronix.de> | 2014-07-18 07:22:35 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-08-21 15:25:18 -0500 |
| commit | ae5abd2561b40a1f046088cd30b900ccde63fbc5 (patch) | |
| tree | 096dcdc913a8463f4bae10e84a4c5e8ce05ff232 /drivers/media/platform/coda.c | |
| parent | [media] omap3isp: resizer: Protect against races when updating crop (diff) | |
| download | linux-dev-ae5abd2561b40a1f046088cd30b900ccde63fbc5.tar.xz linux-dev-ae5abd2561b40a1f046088cd30b900ccde63fbc5.zip | |
[media] coda: fix CODA7541 hardware reset
Do not try to read the CODA960 GDI status register on CODA7541.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/media/platform/coda.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index 3a6d1d2b429e..ec82dec04e31 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -350,19 +350,22 @@ static int coda_hw_reset(struct coda_ctx *ctx) idx = coda_read(dev, CODA_REG_BIT_RUN_INDEX); - timeout = jiffies + msecs_to_jiffies(100); - coda_write(dev, 0x11, CODA9_GDI_BUS_CTRL); - while (coda_read(dev, CODA9_GDI_BUS_STATUS) != 0x77) { - if (time_after(jiffies, timeout)) - return -ETIME; - cpu_relax(); + if (dev->devtype->product == CODA_960) { + timeout = jiffies + msecs_to_jiffies(100); + coda_write(dev, 0x11, CODA9_GDI_BUS_CTRL); + while (coda_read(dev, CODA9_GDI_BUS_STATUS) != 0x77) { + if (time_after(jiffies, timeout)) + return -ETIME; + cpu_relax(); + } } ret = reset_control_reset(dev->rstc); if (ret < 0) return ret; - coda_write(dev, 0x00, CODA9_GDI_BUS_CTRL); + if (dev->devtype->product == CODA_960) + coda_write(dev, 0x00, CODA9_GDI_BUS_CTRL); coda_write(dev, CODA_REG_BIT_BUSY_FLAG, CODA_REG_BIT_BUSY); coda_write(dev, CODA_REG_RUN_ENABLE, CODA_REG_BIT_CODE_RUN); ret = coda_wait_timeout(dev); |