From: Philipp Zabel <p.zabel@pengutronix.de>
To: linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Boris Brezillon <boris.brezillon@collabora.com>,
Ezequiel Garcia <ezequiel@collabora.com>,
Nicolas Dufresne <nicolas@ndufresne.ca>,
Jonas Karlman <jonas@kwiboo.se>,
devicetree@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v3 10/10] media: hantro: allow arbitrary number of clocks
Date: Fri, 31 May 2019 10:55:23 +0200 [thread overview]
Message-ID: <20190531085523.10892-11-p.zabel@pengutronix.de> (raw)
In-Reply-To: <20190531085523.10892-1-p.zabel@pengutronix.de>
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>
---
New in v3.
---
drivers/staging/media/hantro/hantro.h | 6 ++----
drivers/staging/media/hantro/hantro_drv.c | 5 +++++
drivers/staging/media/hantro/imx8m_vpu_hw.c | 10 ++++++----
drivers/staging/media/hantro/rk3288_vpu_hw.c | 8 ++++++--
drivers/staging/media/hantro/rk3399_vpu_hw.c | 12 ++++++++----
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h
index 295a00d59a5f..0a3b2a8b3e67 100644
--- a/drivers/staging/media/hantro/hantro.h
+++ b/drivers/staging/media/hantro/hantro.h
@@ -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 **bases;
void __iomem *enc_base;
void __iomem *dec_base;
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index ef2b29d50100..d9624ee9fdc3 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -688,6 +688,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,
diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c
index fbe84c5f5619..811899e8416a 100644
--- a/drivers/staging/media/hantro/imx8m_vpu_hw.c
+++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c
@@ -266,6 +266,7 @@ static const struct hantro_irq imx8mq_irqs[] = {
{ "g2", NULL /* TODO: imx8m_vpu_g2_irq */ },
};
+static const char * const imx8mq_clk_names[] = { "g1", "g2", "bus" };
static const char * const imx8mq_reg_names[] = { "g1", "g2", "ctrl" };
const struct hantro_variant imx8mq_vpu_variant = {
@@ -278,8 +279,8 @@ const struct hantro_variant imx8mq_vpu_variant = {
.irqs = imx8mq_irqs,
.num_irqs = ARRAY_SIZE(imx8mq_irqs),
.num_irqs = 2,
- .clk_names = { "g1", "g2", "bus" },
- .num_clocks = 3,
+ .clk_names = imx8mq_clk_names,
+ .num_clocks = ARRAY_SIZE(imx8mq_clk_names),
.reg_names = imx8mq_reg_names,
.num_regs = ARRAY_SIZE(imx8mq_reg_names)
};
@@ -290,6 +291,7 @@ static const struct hantro_irq imx8mm_irqs[] = {
{ "h1", imx8mm_vpu_h1_irq },
};
+static const char * const imx8mm_clk_names[] = { "g1", "g2", "h1", "bus" };
static const char * const imx8mm_reg_names[] = { "g1", "g2", "h1", "ctrl" };
const struct hantro_variant imx8mm_vpu_variant = {
@@ -301,8 +303,8 @@ const struct hantro_variant imx8mm_vpu_variant = {
.runtime_resume = imx8mm_runtime_resume,
.irqs = imx8mm_irqs,
.num_irqs = ARRAY_SIZE(imx8mm_irqs),
- .clk_names = { "g1", "g2", "h1", "bus" },
- .num_clocks = 4,
+ .clk_names = imx8mm_clk_names,
+ .num_clocks = ARRAY_SIZE(imx8mm_clk_names),
.reg_names = imx8mm_reg_names,
.num_regs = ARRAY_SIZE(imx8mm_reg_names)
};
diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c
index b4d5e24167db..fe721e0b948d 100644
--- a/drivers/staging/media/hantro/rk3288_vpu_hw.c
+++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c
@@ -165,6 +165,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,
@@ -177,6 +181,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)
};
diff --git a/drivers/staging/media/hantro/rk3399_vpu_hw.c b/drivers/staging/media/hantro/rk3399_vpu_hw.c
index fc52bedf3665..f8400e49bc50 100644
--- a/drivers/staging/media/hantro/rk3399_vpu_hw.c
+++ b/drivers/staging/media/hantro/rk3399_vpu_hw.c
@@ -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,8 +181,8 @@ 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)
};
static const struct hantro_irq rk3328_irqs[] = {
@@ -194,6 +198,6 @@ const struct hantro_variant rk3328_vpu_variant = {
.irqs = rk3328_irqs,
.num_irqs = ARRAY_SIZE(rk3328_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),
};
--
2.20.1
next prev parent reply other threads:[~2019-05-31 8:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-31 8:55 [PATCH v3 00/10] Rename Rockchip VPU driver to Hantro, add initial i.MX8M support Philipp Zabel
2019-05-31 8:55 ` [PATCH v3 01/10] rockchip/vpu: rename from rockchip to hantro Philipp Zabel
2019-06-05 11:22 ` Boris Brezillon
2019-06-06 15:06 ` Boris Brezillon
2019-06-11 11:51 ` Philipp Zabel
2019-05-31 8:55 ` [PATCH v3 02/10] media: hantro: print video device name in addition to device node Philipp Zabel
2019-05-31 8:55 ` [PATCH v3 03/10] media: hantro: add PM runtime resume callback Philipp Zabel
2019-05-31 8:55 ` [PATCH v3 04/10] media: hantro: make irq names configurable Philipp Zabel
2019-06-01 9:07 ` Boris Brezillon
2019-05-31 8:55 ` [PATCH v3 05/10] media: hantro: add support for named register ranges Philipp Zabel
2019-06-01 9:14 ` Boris Brezillon
2019-05-31 8:55 ` [PATCH v3 06/10] media: hantro: add support for separate control block Philipp Zabel
2019-06-01 9:16 ` Boris Brezillon
2019-05-31 8:55 ` [PATCH v3 07/10] media: dt-bindings: Document i.MX8MQ and i.MX8MM VPU bindings Philipp Zabel
2019-06-01 9:18 ` Boris Brezillon
2019-06-11 12:44 ` Philipp Zabel
2019-05-31 8:55 ` [PATCH v3 08/10] media: hantro: add initial i.MX8MQ support Philipp Zabel
2019-06-03 12:45 ` Hans Verkuil
2019-06-03 20:02 ` Boris Brezillon
2019-06-04 10:42 ` Hans Verkuil
2019-06-11 11:55 ` Philipp Zabel
2019-12-01 2:16 ` Adam Ford
2019-05-31 8:55 ` [PATCH v3 09/10] media: hantro: add initial i.MX8MM support (untested) Philipp Zabel
2019-06-03 12:54 ` Hans Verkuil
2019-06-03 18:59 ` Nicolas Dufresne
2019-06-03 18:59 ` Nicolas Dufresne
2019-06-11 11:52 ` Philipp Zabel
2019-05-31 8:55 ` Philipp Zabel [this message]
2019-06-01 9:23 ` [PATCH v3 10/10] media: hantro: allow arbitrary number of clocks Boris Brezillon
2019-06-03 12:40 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190531085523.10892-11-p.zabel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=boris.brezillon@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=ezequiel@collabora.com \
--cc=hverkuil@xs4all.nl \
--cc=jonas@kwiboo.se \
--cc=kernel@pengutronix.de \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=nicolas@ndufresne.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).