[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>

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 217d719625cec699f60269039699a26575558dd3..2e422dde074ee4e048b3f730a93f78816510ad30 100644 (file)
--- 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 3296115525d7b637a1c746fbc10428ac3751e085..bf8a65726107bca3738ea10929901f38182a2ff0 100644 (file)
--- 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;