From nobody Thu Dec 25 02:02:15 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8CEEE33A71F for ; Wed, 3 Dec 2025 15:54:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777249; cv=none; b=J5vngYm8+xdGLlJdqdzDwqU3iPkppFori+FnHYXilkpRExelqrcjm5vqsH1L+M7/e1xPsnLjN5gXATHrTG15QmUrxT/UYs6PK2Pq3QhJHGHxqZVSZBDO+GQnSFOlIEo1+pKVb5cekjTgq6NEAvqT5t8ShaHYhPZgUdxsQsARZ3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764777249; c=relaxed/simple; bh=91K69kTgFVyqoZdNHEA1NXAnIQwM6WFuUF+QYV8K9xs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q2SIJfBx6ZXrLVwwk7SoF0HFFQjoKuUAKoEzkAY7aPaVvpoH5YkhrOkLqDuvstWnlvO/VivmrWABWf/YkPTNRPM/Fk1Sj5M1pPN5V68BW/fohLyRVUbwNA/co987q6Jm30BTznbpGt64/saLKUtkQoyyO/fOH9sIWeWPUd+n6rQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=peter.mobile.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vQpAc-0007dW-S2; Wed, 03 Dec 2025 16:53:34 +0100 From: =?utf-8?q?Sven_P=C3=BCschel?= Date: Wed, 03 Dec 2025 16:52:26 +0100 Subject: [PATCH v2 04/22] media: rockchip: rga: use clk_bulk api Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251203-spu-rga3-v2-4-989a67947f71@pengutronix.de> References: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> In-Reply-To: <20251203-spu-rga3-v2-0-989a67947f71@pengutronix.de> To: Jacob Chen , Ezequiel Garcia , Mauro Carvalho Chehab , Heiko Stuebner , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, kernel@pengutronix.de, =?utf-8?q?Sven_P=C3=BCschel?= X-Mailer: b4 0.14.3 X-SA-Exim-Connect-IP: 2a0a:edc0:0:900:1d::77 X-SA-Exim-Mail-From: s.pueschel@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Use the clk_bulk API to avoid code duplication for each of the three clocks. Signed-off-by: Sven P=C3=BCschel Reviewed-by: Nicolas Dufresne --- 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/plat= form/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 =3D { .device_caps =3D V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING, }; =20 -static int rga_enable_clocks(struct rockchip_rga *rga) -{ - int ret; - - ret =3D clk_prepare_enable(rga->sclk); - if (ret) { - dev_err(rga->dev, "Cannot enable rga sclk: %d\n", ret); - return ret; - } - - ret =3D clk_prepare_enable(rga->aclk); - if (ret) { - dev_err(rga->dev, "Cannot enable rga aclk: %d\n", ret); - goto err_disable_sclk; - } - - ret =3D 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; =20 core_rst =3D 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); =20 - rga->sclk =3D 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 =3D 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 =3D 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 =3D 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; } =20 return 0; @@ -935,7 +885,7 @@ static int __maybe_unused rga_runtime_suspend(struct de= vice *dev) { struct rockchip_rga *rga =3D dev_get_drvdata(dev); =20 - rga_disable_clocks(rga); + clk_bulk_disable_unprepare(ARRAY_SIZE(rga->clks), rga->clks); =20 return 0; } @@ -944,7 +894,7 @@ static int __maybe_unused rga_runtime_resume(struct dev= ice *dev) { struct rockchip_rga *rga =3D dev_get_drvdata(dev); =20 - return rga_enable_clocks(rga); + return clk_bulk_prepare_enable(ARRAY_SIZE(rga->clks), rga->clks); } =20 static const struct dev_pm_ops rga_pm =3D { diff --git a/drivers/media/platform/rockchip/rga/rga.h b/drivers/media/plat= form/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__ =20 +#include #include #include #include @@ -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; =20 /* vfd lock */ --=20 2.52.0