From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794330550; b=eEA4t7V7DmFTGnOV6G1fLtkSKYPWFOJzKhvWuJRYP3AiU9MN+Mv9Gh/+rJrNCebh/rSV 2ETHzBI+VVFUbaCL2rgNk1ZIOuaZJLt4oBYPRuEZrgwzG4u50KL2RIYxB7FogWmKu9r8x XcETKDyvmLzVX0URhe8CSkQ024MQKqqlVae2hSDqnuQMR1gaMYSPWag3kAKt4DhQQgVNn WEPm/AnUxtDCXNOBhUgucgx/OFE11MYzVo/zFE02xrdESnWGO0fxCrPVLAxgTXu3V4cYj 2lRmlbyXMmJ2gy0p1z4gCvBH3gTTbqOizmrq7WfWmoQPp2qlulprbiYwnwDQcN75qlg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794330550; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=mRJUFngw1DBYza/ebhzSCG2KHOe7bKoCemr54FjhFls=; b=zYGtgtbYd3Twfau3GzpcQAOrcAiVE0HpIe5gRg0+hJn2qdAY5J19PfNXyQjUnVLtA570 OV7qSAw38p8D2gMyh9E7Gf5WeV6aamYCgeKpEfl/aLxsLuJjTO3q9jsZ4Bwtz/Xkwjj3R DQD8phaIckMyvp5RrwLXnjS/nuGrMucaT5Pbdu8mJ9Xf21mrQ3gHkqBLyf8EFStgI2iNr mKz/d04MMr8LaWLUmO4MOoDNZ9CCWSm8Wnyh+JTEU9ZUe3ADtofTvBYyd87KPyPnBbb9o DB6GxpH6fXuq1i7jsLIIN2cRqbmDiCZzQ9+E7ryhs9JdTDllnHOHKF6xuoYZ98cM8ug== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=AhxRLy3A; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 917C0606A31C for ; Tue, 10 Nov 2026 17:09:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=AhxRLy3A Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE1DD1F008A2; Tue, 10 Nov 2026 17:09:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794330550; bh=mRJUFngw1DBYza/ebhzSCG2KHOe7bKoCemr54FjhFls=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AhxRLy3A0NzeQhUB30GFP0Eqzf5Dlw00gUKyAGwc2x6JbBgyHY0/D59jw1uATNfTJ UF4RSDAv0N9kEYYEhTtbASSnUF7DUmyoJ0BjB2hKe0RtIrv0lpioYNi2o35uyORYNY FQa2MKPPzpt9KLs2xJdjYpvmvNr/W4VDTz5oMupHvGylmEFfRfQkdtnzRtMYpgFnVO 5Tl6QjOIMY6UwzzSGsd929vSQEoOPOQEnPzGO8w8hy5DiqrIGpGMx6sgUG9+d3l8hP 7flwYJLTQ/rUdsGbp2caLJDIcZUcVMBrZCHlZyi5QBP6ed6JaGDdTe487BYa4OTWEd htXgdYnhjbQdA== From: Sasha Levin To: stable@vger.kernel.org Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= , Nicolas Dufresne , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1.y 2/3] media: rockchip: rga: use clk_bulk api Date: Tue, 10 Nov 2026 12:09:06 -0500 Message-ID: <20261110170859.2632294-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261110170859.2632294-1-sashal@kernel.org> References: <20261107054358-failed-6.1-a875c43dd95e@kernel.org> <20261110170859.2632294-1-sashal@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Sven Püschel [ Upstream commit a2a4f69fd2e333bacd17d1788eb5211cb6f373cc ] Use the clk_bulk API to avoid code duplication for each of the three clocks. Reviewed-by: Nicolas Dufresne Signed-off-by: Sven Püschel Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil Stable-dep-of: a875c43dd95e ("media: rockchip: rga: quiesce IRQ before releasing m2m state") Signed-off-by: Sasha Levin --- drivers/media/platform/rockchip/rga/rga.c | 65 +++-------------------- drivers/media/platform/rockchip/rga/rga.h | 6 +-- 2 files changed, 11 insertions(+), 60 deletions(-) diff --git a/drivers/media/platform/rockchip/rga/rga.c b/drivers/media/platform/rockchip/rga/rga.c index 4c4e8eabdbdbf..7cc80e11d9d00 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -693,48 +693,10 @@ static const struct video_device rga_videodev = { .device_caps = V4L2_CAP_VIDEO_M2M | 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)) { @@ -766,23 +728,12 @@ 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_all(rga->dev, &rga->clks); + if (ret < 0) { + dev_err(rga->dev, "failed to get clocks\n"); + return ret; } + rga->num_clks = ret; return 0; } @@ -946,7 +897,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(rga->num_clks, rga->clks); return 0; } @@ -955,7 +906,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(rga->num_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 5fa9d2f366dc4..0825622526c7b 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 #include #include #include @@ -68,9 +69,8 @@ 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; + int num_clks; struct rockchip_rga_version version; /* vfd lock */ -- 2.53.0