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=1794329151; b=OnrR+FdsGuEdp5LzH9ZkAKF6oYpxxRywnhGKslYKbLv6/EcPDhuXYCMWQCvfYgaM2SvT FXzQNNJUXhRpX2RXr/qalbnLgvWBFxFxogmavHUSHrB7SrGRYbCqLIr6BlQh5n40+LLI2 D3xPO5RXLBCFHubnTng45qlWXqDA+MDSNr/oFdZiwGxLqGu8+5JQUe7zFgAK1DgFmMGPu Kg+A5oQ9siK0isIY4M6C7HS7X59jUoIXzum/WyHTPnG+a7oyTw7rMq6VzjFly+py5jz3n /HWMa2LQyZmeUZiQEUV8ADunjupEUsTUUD6Hhb1TAjqqFqUYt6etY5RrOgK/5u5AF7Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794329151; 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=XRzIciZUNbcuO3hEcz72XNAsCcYy+opiqQFtMCok9bU=; b=av8d29D2Hhw2s9I2lpBxBME5uR3HpLFWE7Tys2PEr7ghNflQBZMaQR8nkHu3vD9cKBIn pD+aNOvCmPLL2OYhw4OlbWBgj06Jy4YRiB4DcSBFcRPsMh2Uy3IcmuRafUFECQcQb5QVR 3pp51iS5J896ic9AkS6HSwSANIzZ//1w0sBYg3AdDjTgMvN9C9rJnDfh/mM4bCEQW1+K7 tAgKiEQmbG9P+DhSxn9t86ngBCkWJJeNaHBos1shWU7UtTbhH9wv9sLQ8Im9g7L1wWR2D hD8bp2gAzXtgcKTU5x0tl2flcwLRFESp5w3dXYeHSfcjG+mNWo5ahFEWW1ZN/5mZaHQ== 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=NkTi+8oH; 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 855C3606A320 for ; Tue, 10 Nov 2026 16:45:51 +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=NkTi+8oH Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85A2C1F0089F; Tue, 10 Nov 2026 16:45:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794329151; bh=XRzIciZUNbcuO3hEcz72XNAsCcYy+opiqQFtMCok9bU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NkTi+8oHNSJDt1CJ5XZ3KeG+vsh2ascSxhsXgy+yrxrxiDahUNztE8Fq79e6cfdZ2 zN1BpH2j6lcacV0xYguM0dq+AaELPFMkaZAfLeyPiQsiFjlpn4o0uRUHdbMnsEZs9c MpoWHleh+zsaVlih19xWY66SYfRMr0JG5r0y9ew+8wcX40lcn5UqAc3g/xOcthCSGB syLNbJGNzreDMyv8YKAGx2LPbfFfd83evWaitbPC6xZJ5hnec3J06WRHiazbZAKmtB elM9i1GTV16ZVf8+Z0BhrwCvMId9zle0Rqbo0o6ifISRjMVLLtqQ4vwYjTcpVC6F1q nV21REKJgbyzg== 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.12.y 1/2] media: rockchip: rga: use clk_bulk api Date: Tue, 10 Nov 2026 11:45:48 -0500 Message-ID: <20261110164539.2563202-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107051846-failed-6.12-a875c43dd95e@kernel.org> References: <20261107051846-failed-6.12-a875c43dd95e@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 de532b7ecd74c..7b2842d959255 100644 --- a/drivers/media/platform/rockchip/rga/rga.c +++ b/drivers/media/platform/rockchip/rga/rga.c @@ -704,48 +704,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)) { @@ -777,23 +739,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; } @@ -941,7 +892,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; } @@ -950,7 +901,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 8105bb2efe570..6c3c9f3f71584 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 @@ -76,9 +77,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