Commit fa7014f5 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap4iss: Relax usleep ranges 



Allow the system to merge CPU wakeups by specifying different minimum
and maximum usleep values.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 05b1b986

drivers/staging/media/omap4iss/iss.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/media/omap4iss/iss_csi2.c

+2 −2
Original line number Diff line number Diff line
@@ -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;