diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2019-06-12 05:39:12 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-06-12 10:41:03 -0400 |
| commit | b86b8473d52f307de1b9a3295492a87e6d119160 (patch) | |
| tree | 8505269b9a9adbb0f28402bd2a208332dea55107 /drivers/staging/media/hantro/rk3288_vpu_hw.c | |
| parent | c330d371137fca9190a83f68bba2af7f64d205a0 (diff) | |
| download | linux-b86b8473d52f307de1b9a3295492a87e6d119160.tar.bz2 | |
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: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/staging/media/hantro/rk3288_vpu_hw.c')
| -rw-r--r-- | drivers/staging/media/hantro/rk3288_vpu_hw.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c index c5473bc1ac29..bcacc4f51093 100644 --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c @@ -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) }; |