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

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

[media] coda: split firmware version check out of coda_hw_init 



This adds a new function coda_check_firmware that does the firmware
version checks so that this can be done only once from coda_probe
instead of every time the runtime pm framework resumes the coda.

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 1e172731

drivers/media/platform/coda.c

+37 −5
Original line number Diff line number Diff line
@@ -3195,7 +3195,6 @@ static bool coda_firmware_supported(u32 vernum) 


static int coda_hw_init(struct coda_dev *dev)

{

	u16 product, major, minor, release;

	u32 data;

	u16 *p;

	int i, ret;
@@ -3276,17 +3275,40 @@ static int coda_hw_init(struct coda_dev *dev) 
	coda_write(dev, data, CODA_REG_BIT_CODE_RESET);

	coda_write(dev, CODA_REG_RUN_ENABLE, CODA_REG_BIT_CODE_RUN);



	/* Load firmware */

	clk_disable_unprepare(dev->clk_ahb);

	clk_disable_unprepare(dev->clk_per);



	return 0;



err_clk_ahb:

	clk_disable_unprepare(dev->clk_per);

err_clk_per:

	return ret;

}



static int coda_check_firmware(struct coda_dev *dev)

{

	u16 product, major, minor, release;

	u32 data;

	int ret;



	ret = clk_prepare_enable(dev->clk_per);

	if (ret)

		goto err_clk_per;



	ret = clk_prepare_enable(dev->clk_ahb);

	if (ret)

		goto err_clk_ahb;



	coda_write(dev, 0, CODA_CMD_FIRMWARE_VERNUM);

	coda_write(dev, CODA_REG_BIT_BUSY_FLAG, CODA_REG_BIT_BUSY);

	coda_write(dev, 0, CODA_REG_BIT_RUN_INDEX);

	coda_write(dev, 0, CODA_REG_BIT_RUN_COD_STD);

	coda_write(dev, CODA_COMMAND_FIRMWARE_GET, CODA_REG_BIT_RUN_COMMAND);

	if (coda_wait_timeout(dev)) {

		clk_disable_unprepare(dev->clk_per);

		clk_disable_unprepare(dev->clk_ahb);

		v4l2_err(&dev->v4l2_dev, "firmware get command error\n");

		return -EIO;

		ret = -EIO;

		goto err_run_cmd;

	}



	if (dev->devtype->product == CODA_960) {
@@ -3326,6 +3348,8 @@ static int coda_hw_init(struct coda_dev *dev) 


	return 0;



err_run_cmd:

	clk_disable_unprepare(dev->clk_ahb);

err_clk_ahb:

	clk_disable_unprepare(dev->clk_per);

err_clk_per:
@@ -3366,6 +3390,10 @@ static void coda_fw_callback(const struct firmware *fw, void *context) 
			return;

		}



		ret = coda_check_firmware(dev);

		if (ret < 0)

			return;



		pm_runtime_put_sync(&dev->plat_dev->dev);

	} else {

		/*
@@ -3377,6 +3405,10 @@ static void coda_fw_callback(const struct firmware *fw, void *context) 
			v4l2_err(&dev->v4l2_dev, "HW initialization failed\n");

			return;

		}



		ret = coda_check_firmware(dev);

		if (ret < 0)

			return;

	}



	dev->vfd.fops	= &coda_fops,