Commit 6a846f7d authored by Detlev Casanova's avatar Detlev Casanova Committed by Hans Verkuil
Browse files

media: rkvdec: Enable all clocks without naming them 



For other variants, the clock names and number will differ.

There is no need to keep track of the clock names in the driver so drop
them to avoid having a list for each variant.

Tested-by: Diederik de Haas <didi.debian@cknow.org>  # Rock 5B
Reviewed-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarDetlev Casanova <detlev.casanova@collabora.com>
Signed-off-by: default avatarNicolas Dufresne <nicolas.dufresne@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent f9c7b7de

drivers/media/platform/rockchip/rkvdec/rkvdec.c

+6 −20
Original line number Diff line number Diff line
@@ -1312,15 +1312,10 @@ static const struct of_device_id of_rkvdec_match[] = { 
};

MODULE_DEVICE_TABLE(of, of_rkvdec_match);



static const char * const rkvdec_clk_names[] = {

	"axi", "ahb", "cabac", "core"

};



static int rkvdec_probe(struct platform_device *pdev)

{

	const struct rkvdec_variant *variant;

	struct rkvdec_dev *rkvdec;

	unsigned int i;

	int ret, irq;



	variant = of_device_get_match_data(&pdev->dev);
@@ -1337,19 +1332,12 @@ static int rkvdec_probe(struct platform_device *pdev) 
	mutex_init(&rkvdec->vdev_lock);

	INIT_DELAYED_WORK(&rkvdec->watchdog_work, rkvdec_watchdog_func);



	rkvdec->clocks = devm_kcalloc(&pdev->dev, ARRAY_SIZE(rkvdec_clk_names),

				      sizeof(*rkvdec->clocks), GFP_KERNEL);

	if (!rkvdec->clocks)

		return -ENOMEM;



	for (i = 0; i < ARRAY_SIZE(rkvdec_clk_names); i++)

		rkvdec->clocks[i].id = rkvdec_clk_names[i];



	ret = devm_clk_bulk_get(&pdev->dev, ARRAY_SIZE(rkvdec_clk_names),

				rkvdec->clocks);

	if (ret)

	ret = devm_clk_bulk_get_all_enabled(&pdev->dev, &rkvdec->clocks);

	if (ret < 0)

		return ret;



	rkvdec->num_clocks = ret;



	rkvdec->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(rkvdec->regs))

		return PTR_ERR(rkvdec->regs);
@@ -1427,16 +1415,14 @@ static int rkvdec_runtime_resume(struct device *dev) 
{

	struct rkvdec_dev *rkvdec = dev_get_drvdata(dev);



	return clk_bulk_prepare_enable(ARRAY_SIZE(rkvdec_clk_names),

				       rkvdec->clocks);

	return clk_bulk_prepare_enable(rkvdec->num_clocks, rkvdec->clocks);

}



static int rkvdec_runtime_suspend(struct device *dev)

{

	struct rkvdec_dev *rkvdec = dev_get_drvdata(dev);



	clk_bulk_disable_unprepare(ARRAY_SIZE(rkvdec_clk_names),

				   rkvdec->clocks);

	clk_bulk_disable_unprepare(rkvdec->num_clocks, rkvdec->clocks);

	return 0;

}

#endif

drivers/media/platform/rockchip/rkvdec/rkvdec.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct rkvdec_dev { 
	struct v4l2_m2m_dev *m2m_dev;

	struct device *dev;

	struct clk_bulk_data *clocks;

	unsigned int num_clocks;

	void __iomem *regs;

	struct mutex vdev_lock; /* serializes ioctls */

	struct delayed_work watchdog_work;