[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <43caf038367d00217d11237e54c82240c3caea5a.camel@ndufresne.ca>
Date: Wed, 24 Dec 2025 09:48:35 -0500
From: Nicolas Dufresne <nicolas@...fresne.ca>
To: Sven Püschel <s.pueschel@...gutronix.de>, Jacob Chen
<jacob-chen@...wrt.com>, Ezequiel Garcia <ezequiel@...guardiasur.com.ar>,
Mauro Carvalho Chehab
<mchehab@...nel.org>, Heiko Stuebner <heiko@...ech.de>, Rob Herring
<robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley
<conor+dt@...nel.org>
Cc: linux-media@...r.kernel.org, linux-rockchip@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
devicetree@...r.kernel.org, kernel@...gutronix.de
Subject: Re: [PATCH v2 04/22] media: rockchip: rga: use clk_bulk api
Le mercredi 03 décembre 2025 à 16:52 +0100, Sven Püschel a écrit :
> Use the clk_bulk API to avoid code duplication for each of the three
> clocks.
>
> Signed-off-by: Sven Püschel <s.pueschel@...gutronix.de>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@...labora.com>
> ---
> drivers/media/platform/rockchip/rga/rga.c | 64 ++++---------------------------
> drivers/media/platform/rockchip/rga/rga.h | 5 +--
> 2 files changed, 9 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c
> index 43f6a8d993811..ef568b3758380 100644
> --- a/drivers/media/platform/rockchip/rga/rga.c
> +++ b/drivers/media/platform/rockchip/rga/rga.c
> @@ -698,48 +698,10 @@ static const struct video_device rga_videodev = {
> .device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING,
> };
>
> -static int rga_enable_clocks(struct rockchip_rga *rga)
> -{
> - int ret;
> -
> - ret = clk_prepare_enable(rga->sclk);
> - if (ret) {
> - dev_err(rga->dev, "Cannot enable rga sclk: %d\n", ret);
> - return ret;
> - }
> -
> - ret = clk_prepare_enable(rga->aclk);
> - if (ret) {
> - dev_err(rga->dev, "Cannot enable rga aclk: %d\n", ret);
> - goto err_disable_sclk;
> - }
> -
> - ret = clk_prepare_enable(rga->hclk);
> - if (ret) {
> - dev_err(rga->dev, "Cannot enable rga hclk: %d\n", ret);
> - goto err_disable_aclk;
> - }
> -
> - return 0;
> -
> -err_disable_aclk:
> - clk_disable_unprepare(rga->aclk);
> -err_disable_sclk:
> - clk_disable_unprepare(rga->sclk);
> -
> - return ret;
> -}
> -
> -static void rga_disable_clocks(struct rockchip_rga *rga)
> -{
> - clk_disable_unprepare(rga->sclk);
> - clk_disable_unprepare(rga->hclk);
> - clk_disable_unprepare(rga->aclk);
> -}
> -
> static int rga_parse_dt(struct rockchip_rga *rga)
> {
> struct reset_control *core_rst, *axi_rst, *ahb_rst;
> + int ret;
>
> core_rst = devm_reset_control_get(rga->dev, "core");
> if (IS_ERR(core_rst)) {
> @@ -771,22 +733,10 @@ static int rga_parse_dt(struct rockchip_rga *rga)
> udelay(1);
> reset_control_deassert(ahb_rst);
>
> - rga->sclk = devm_clk_get(rga->dev, "sclk");
> - if (IS_ERR(rga->sclk)) {
> - dev_err(rga->dev, "failed to get sclk clock\n");
> - return PTR_ERR(rga->sclk);
> - }
> -
> - rga->aclk = devm_clk_get(rga->dev, "aclk");
> - if (IS_ERR(rga->aclk)) {
> - dev_err(rga->dev, "failed to get aclk clock\n");
> - return PTR_ERR(rga->aclk);
> - }
> -
> - rga->hclk = devm_clk_get(rga->dev, "hclk");
> - if (IS_ERR(rga->hclk)) {
> - dev_err(rga->dev, "failed to get hclk clock\n");
> - return PTR_ERR(rga->hclk);
> + ret = devm_clk_bulk_get(rga->dev, ARRAY_SIZE(rga->clks), rga->clks);
> + if (ret) {
> + dev_err(rga->dev, "failed to get clocks\n");
> + return ret;
> }
>
> return 0;
> @@ -935,7 +885,7 @@ static int __maybe_unused rga_runtime_suspend(struct device *dev)
> {
> struct rockchip_rga *rga = dev_get_drvdata(dev);
>
> - rga_disable_clocks(rga);
> + clk_bulk_disable_unprepare(ARRAY_SIZE(rga->clks), rga->clks);
>
> return 0;
> }
> @@ -944,7 +894,7 @@ static int __maybe_unused rga_runtime_resume(struct device *dev)
> {
> struct rockchip_rga *rga = dev_get_drvdata(dev);
>
> - return rga_enable_clocks(rga);
> + return clk_bulk_prepare_enable(ARRAY_SIZE(rga->clks), rga->clks);
> }
>
> static const struct dev_pm_ops rga_pm = {
> diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/platform/rockchip/rga/rga.h
> index 72a28b120fabf..a922fac0c01a3 100644
> --- a/drivers/media/platform/rockchip/rga/rga.h
> +++ b/drivers/media/platform/rockchip/rga/rga.h
> @@ -6,6 +6,7 @@
> #ifndef __RGA_H__
> #define __RGA_H__
>
> +#include <linux/clk.h>
> #include <linux/platform_device.h>
> #include <media/videobuf2-v4l2.h>
> #include <media/v4l2-ctrls.h>
> @@ -81,9 +82,7 @@ struct rockchip_rga {
> struct device *dev;
> struct regmap *grf;
> void __iomem *regs;
> - struct clk *sclk;
> - struct clk *aclk;
> - struct clk *hclk;
> + struct clk_bulk_data clks[3];
> struct rockchip_rga_version version;
>
> /* vfd lock */
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists