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

media: hantro: allow arbitrary number of clocks 



Dynamically allocate clocks and move clock names out of struct
hantro_variant. This lifts the four clock limit and allows to use
ARRAY_SIZE() to fill .num_clocks to reduce the risk of mismatches.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent c330d371

drivers/staging/media/hantro/hantro.h

+2 −4
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include "hantro_hw.h"



#define HANTRO_MAX_CLOCKS		4



#define MPEG2_MB_DIM			16

#define MPEG2_MB_WIDTH(w)		DIV_ROUND_UP(w, MPEG2_MB_DIM)

#define MPEG2_MB_HEIGHT(h)		DIV_ROUND_UP(h, MPEG2_MB_DIM)
@@ -88,7 +86,7 @@ struct hantro_variant { 
	int (*runtime_resume)(struct hantro_dev *vpu);

	const struct hantro_irq *irqs;

	int num_irqs;

	const char *clk_names[HANTRO_MAX_CLOCKS];

	const char * const *clk_names;

	int num_clocks;

	const char * const *reg_names;

	int num_regs;
@@ -182,7 +180,7 @@ struct hantro_dev { 
	struct hantro_func *decoder;

	struct platform_device *pdev;

	struct device *dev;

	struct clk_bulk_data clocks[HANTRO_MAX_CLOCKS];

	struct clk_bulk_data *clocks;

	void __iomem **reg_bases;

	void __iomem *enc_base;

	void __iomem *dec_base;

drivers/staging/media/hantro/hantro_drv.c

+5 −0
Original line number Diff line number Diff line
@@ -687,6 +687,11 @@ static int hantro_probe(struct platform_device *pdev) 


	INIT_DELAYED_WORK(&vpu->watchdog_work, hantro_watchdog);



	vpu->clocks = devm_kcalloc(&pdev->dev, vpu->variant->num_clocks,

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

	if (!vpu->clocks)

		return -ENOMEM;



	for (i = 0; i < vpu->variant->num_clocks; i++)

		vpu->clocks[i].id = vpu->variant->clk_names[i];

	ret = devm_clk_bulk_get(&pdev->dev, vpu->variant->num_clocks,

drivers/staging/media/hantro/rk3288_vpu_hw.c

+6 −2
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ static const struct hantro_irq rk3288_irqs[] = { 
	{ "vdpu", rk3288_vdpu_irq },

};



static const char * const rk3288_clk_names[] = {

	"aclk", "hclk"

};



const struct hantro_variant rk3288_vpu_variant = {

	.enc_offset = 0x0,

	.enc_fmts = rk3288_vpu_enc_fmts,
@@ -178,6 +182,6 @@ const struct hantro_variant rk3288_vpu_variant = { 
	.irqs = rk3288_irqs,

	.num_irqs = ARRAY_SIZE(rk3288_irqs),

	.init = rk3288_vpu_hw_init,

	.clk_names = {"aclk", "hclk"},

	.num_clocks = 2

	.clk_names = rk3288_clk_names,

	.num_clocks = ARRAY_SIZE(rk3288_clk_names)

};

drivers/staging/media/hantro/rk3399_vpu_hw.c

+6 −2
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ static const struct hantro_irq rk3399_irqs[] = { 
	{ "vdpu", rk3399_vdpu_irq },

};



static const char * const rk3399_clk_names[] = {

	"aclk", "hclk"

};



const struct hantro_variant rk3399_vpu_variant = {

	.enc_offset = 0x0,

	.enc_fmts = rk3399_vpu_enc_fmts,
@@ -177,6 +181,6 @@ const struct hantro_variant rk3399_vpu_variant = { 
	.irqs = rk3399_irqs,

	.num_irqs = ARRAY_SIZE(rk3399_irqs),

	.init = rk3399_vpu_hw_init,

	.clk_names = {"aclk", "hclk"},

	.num_clocks = 2

	.clk_names = rk3399_clk_names,

	.num_clocks = ARRAY_SIZE(rk3399_clk_names)

};