diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-04-21 15:44:55 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-23 17:03:18 +0200 |
| commit | fa7014f569b2a38b926792a9b9021df0af0556e9 (patch) | |
| tree | c9199b938d92070b6cb29a82a3378810ab9080f5 | |
| parent | [media] omap4iss: Use a common macro for all sleep-based poll loops (diff) | |
| download | linux-fa7014f569b2a38b926792a9b9021df0af0556e9.tar.xz linux-fa7014f569b2a38b926792a9b9021df0af0556e9.zip | |
[media] omap4iss: Relax usleep ranges
Allow the system to merge CPU wakeups by specifying different minimum
and maximum usleep values.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
| -rw-r--r-- | drivers/staging/media/omap4iss/iss.c | 2 | ||||
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_csi2.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index 217d719625ce..2e422dde074e 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -741,7 +741,7 @@ static int iss_reset(struct iss_device *iss) timeout = iss_poll_condition_timeout( !(iss_reg_read(iss, OMAP4_ISS_MEM_TOP, ISS_HL_SYSCONFIG) & - ISS_HL_SYSCONFIG_SOFTRESET), 1000, 10, 10); + ISS_HL_SYSCONFIG_SOFTRESET), 1000, 10, 100); if (timeout) { dev_err(iss->dev, "ISS reset timeout\n"); return -ETIMEDOUT; diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c index 3296115525d7..bf8a65726107 100644 --- a/drivers/staging/media/omap4iss/iss_csi2.c +++ b/drivers/staging/media/omap4iss/iss_csi2.c @@ -500,7 +500,7 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2) timeout = iss_poll_condition_timeout( iss_reg_read(csi2->iss, csi2->regs1, CSI2_SYSSTATUS) & - CSI2_SYSSTATUS_RESET_DONE, 500, 100, 100); + CSI2_SYSSTATUS_RESET_DONE, 500, 100, 200); if (timeout) { dev_err(csi2->iss->dev, "CSI2: Soft reset timeout!\n"); return -EBUSY; @@ -511,7 +511,7 @@ int omap4iss_csi2_reset(struct iss_csi2_device *csi2) timeout = iss_poll_condition_timeout( iss_reg_read(csi2->iss, csi2->phy->phy_regs, REGISTER1) & - REGISTER1_RESET_DONE_CTRLCLK, 10000, 100, 100); + REGISTER1_RESET_DONE_CTRLCLK, 10000, 100, 500); if (timeout) { dev_err(csi2->iss->dev, "CSI2: CSI2_96M_FCLK reset timeout!\n"); return -EBUSY; |