Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae5abd25 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: fix CODA7541 hardware reset 



Do not try to read the CODA960 GDI status register on CODA7541.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent cd73bb6c

drivers/media/platform/coda.c

+10 −7
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ static int coda_hw_reset(struct coda_ctx *ctx) 


	idx = coda_read(dev, CODA_REG_BIT_RUN_INDEX);



	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) {
@@ -357,11 +358,13 @@ static int coda_hw_reset(struct coda_ctx *ctx) 
				return -ETIME;

			cpu_relax();

		}

	}



	ret = reset_control_reset(dev->rstc);

	if (ret < 0)

		return ret;



	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);