Commit d7f26849 authored by Eugen Hristev's avatar Eugen Hristev Committed by Mauro Carvalho Chehab
Browse files

media: atmel: fix the ispck initialization 



The runtime enabling of the ISPCK (internally clocks the pipeline inside
the ISC) has to be done after the pm_runtime for the ISC dev has been
started.

After the commit by Mauro:
the ISC failed to probe with the error:

atmel-sama5d2-isc f0008000.isc: failed to enable ispck: -13
atmel-sama5d2-isc: probe of f0008000.isc failed with error -13

This is because the enabling of the ispck is done too early in the probe,
and the PM runtime returns invalid request.
Thus, moved this clock enabling after pm_runtime_idle is called.

The ISPCK is required only for sama5d2 type of ISC.
Thus, add a bool inside the isc struct that is platform dependent.
For the sama7g5-isc, the enabling of the ISPCK is wrong and does not make
sense. Removed it from the sama7g5 probe. In sama7g5-isc, there is only
one clock, the MCK, which also clocks the internal pipeline of the ISC.

Adapted the clk_prepare and clk_unprepare to request the runtime PM
for both clocks (MCK and ISPCK) in case of sama5d2-isc, and the single
clock (MCK) in case of sama7g5-isc.

Fixes: dd97908e ("media: atmel: properly get pm_runtime")
Signed-off-by: default avatarEugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9d45ccf7

drivers/media/platform/atmel/atmel-isc-base.c

+11 −14
Original line number Diff line number Diff line
@@ -123,11 +123,9 @@ static int isc_clk_prepare(struct clk_hw *hw) 
	struct isc_clk *isc_clk = to_isc_clk(hw);

	int ret;



	if (isc_clk->id == ISC_ISPCK) {

	ret = pm_runtime_resume_and_get(isc_clk->dev);

	if (ret < 0)

		return ret;

	}



	return isc_wait_clk_stable(hw);

}
@@ -138,7 +136,6 @@ static void isc_clk_unprepare(struct clk_hw *hw) 


	isc_wait_clk_stable(hw);



	if (isc_clk->id == ISC_ISPCK)

	pm_runtime_put_sync(isc_clk->dev);

}
@@ -186,15 +183,12 @@ static int isc_clk_is_enabled(struct clk_hw *hw) 
	u32 status;

	int ret;



	if (isc_clk->id == ISC_ISPCK) {

	ret = pm_runtime_resume_and_get(isc_clk->dev);

	if (ret < 0)

		return 0;

	}



	regmap_read(isc_clk->regmap, ISC_CLKSR, &status);



	if (isc_clk->id == ISC_ISPCK)

	pm_runtime_put_sync(isc_clk->dev);



	return status & ISC_CLK(isc_clk->id) ? 1 : 0;
@@ -325,6 +319,9 @@ static int isc_clk_register(struct isc_device *isc, unsigned int id) 
	const char *parent_names[3];

	int num_parents;



	if (id == ISC_ISPCK && !isc->ispck_required)

		return 0;



	num_parents = of_clk_get_parent_count(np);

	if (num_parents < 1 || num_parents > 3)

		return -EINVAL;

drivers/media/platform/atmel/atmel-isc.h

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ struct isc_reg_offsets { 
 * @hclock:		Hclock clock input (refer datasheet)

 * @ispck:		iscpck clock (refer datasheet)

 * @isc_clks:		ISC clocks

 * @ispck_required:	ISC requires ISP Clock initialization

 * @dcfg:		DMA master configuration, architecture dependent

 *

 * @dev:		Registered device driver
@@ -252,6 +253,7 @@ struct isc_device { 
	struct clk		*hclock;

	struct clk		*ispck;

	struct isc_clk		isc_clks[2];

	bool			ispck_required;

	u32			dcfg;



	struct device		*dev;

drivers/media/platform/atmel/atmel-sama5d2-isc.c

+21 −18
Original line number Diff line number Diff line
@@ -454,6 +454,9 @@ static int atmel_isc_probe(struct platform_device *pdev) 
	/* sama5d2-isc - 8 bits per beat */

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;



	/* sama5d2-isc : ISPCK is required and mandatory */

	isc->ispck_required = true;



	ret = isc_pipeline_init(isc);

	if (ret)

		return ret;
@@ -476,22 +479,6 @@ static int atmel_isc_probe(struct platform_device *pdev) 
		dev_err(dev, "failed to init isc clock: %d\n", ret);

		goto unprepare_hclk;

	}



	isc->ispck = isc->isc_clks[ISC_ISPCK].clk;



	ret = clk_prepare_enable(isc->ispck);

	if (ret) {

		dev_err(dev, "failed to enable ispck: %d\n", ret);

		goto unprepare_hclk;

	}



	/* ispck should be greater or equal to hclock */

	ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));

	if (ret) {

		dev_err(dev, "failed to set ispck rate: %d\n", ret);

		goto unprepare_clk;

	}



	ret = v4l2_device_register(dev, &isc->v4l2_dev);

	if (ret) {

		dev_err(dev, "unable to register v4l2 device.\n");
@@ -546,19 +533,35 @@ static int atmel_isc_probe(struct platform_device *pdev) 
	pm_runtime_enable(dev);

	pm_request_idle(dev);



	isc->ispck = isc->isc_clks[ISC_ISPCK].clk;



	ret = clk_prepare_enable(isc->ispck);

	if (ret) {

		dev_err(dev, "failed to enable ispck: %d\n", ret);

		goto cleanup_subdev;

	}



	/* ispck should be greater or equal to hclock */

	ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));

	if (ret) {

		dev_err(dev, "failed to set ispck rate: %d\n", ret);

		goto unprepare_clk;

	}



	regmap_read(isc->regmap, ISC_VERSION + isc->offsets.version, &ver);

	dev_info(dev, "Microchip ISC version %x\n", ver);



	return 0;



unprepare_clk:

	clk_disable_unprepare(isc->ispck);



cleanup_subdev:

	isc_subdev_cleanup(isc);



unregister_v4l2_device:

	v4l2_device_unregister(&isc->v4l2_dev);



unprepare_clk:

	clk_disable_unprepare(isc->ispck);

unprepare_hclk:

	clk_disable_unprepare(isc->hclock);

drivers/media/platform/atmel/atmel-sama7g5-isc.c

+4 −18
Original line number Diff line number Diff line
@@ -447,6 +447,9 @@ static int microchip_xisc_probe(struct platform_device *pdev) 
	/* sama7g5-isc RAM access port is full AXI4 - 32 bits per beat */

	isc->dcfg = ISC_DCFG_YMBSIZE_BEATS32 | ISC_DCFG_CMBSIZE_BEATS32;



	/* sama7g5-isc : ISPCK does not exist, ISC is clocked by MCK */

	isc->ispck_required = false;



	ret = isc_pipeline_init(isc);

	if (ret)

		return ret;
@@ -470,25 +473,10 @@ static int microchip_xisc_probe(struct platform_device *pdev) 
		goto unprepare_hclk;

	}



	isc->ispck = isc->isc_clks[ISC_ISPCK].clk;



	ret = clk_prepare_enable(isc->ispck);

	if (ret) {

		dev_err(dev, "failed to enable ispck: %d\n", ret);

		goto unprepare_hclk;

	}



	/* ispck should be greater or equal to hclock */

	ret = clk_set_rate(isc->ispck, clk_get_rate(isc->hclock));

	if (ret) {

		dev_err(dev, "failed to set ispck rate: %d\n", ret);

		goto unprepare_clk;

	}



	ret = v4l2_device_register(dev, &isc->v4l2_dev);

	if (ret) {

		dev_err(dev, "unable to register v4l2 device.\n");

		goto unprepare_clk;

		goto unprepare_hclk;

	}



	ret = xisc_parse_dt(dev, isc);
@@ -550,8 +538,6 @@ static int microchip_xisc_probe(struct platform_device *pdev) 
unregister_v4l2_device:

	v4l2_device_unregister(&isc->v4l2_dev);



unprepare_clk:

	clk_disable_unprepare(isc->ispck);

unprepare_hclk:

	clk_disable_unprepare(isc->hclock);