From: Loic Poulain <loic.poulain@oss.qualcomm.com>
To: Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Loic Poulain <loic.poulain@oss.qualcomm.com>,
Frank Li <Frank.Li@nxp.com>
Subject: [PATCH v4 3/4] media: qcom: camss: Drop top_ahb/ahb/axi from QCM2290 subdevice clocks
Date: Fri, 31 Jul 2026 10:54:36 +0200 [thread overview]
Message-ID: <20260731-camss-version-v4-3-be8b716a8c4d@oss.qualcomm.com> (raw)
In-Reply-To: <20260731-camss-version-v4-0-be8b716a8c4d@oss.qualcomm.com>
Remove the top_ahb, ahb and axi clocks from QCM2290 subdevice clock
lists. These clocks are now handled centrally as global CAMSS PM clocks
and are automatically enabled when CAMSS is runtime resumed.
This avoids redundant clock references in individual subdevices and
ensures consistent clock management across the CAMSS pipeline.
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Loic Poulain <loic.poulain@oss.qualcomm.com>
---
drivers/media/platform/qcom/camss/camss.c | 38 ++++++++++---------------------
1 file changed, 12 insertions(+), 26 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 8827613d34fc77d43d865e1bd05aa0cc14a4cfca..f688d11990a71aa6d745db1fdcebefe5a5119ca3 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -688,10 +688,8 @@ static const struct camss_subdev_resources csiphy_res_2290[] = {
{ .supply = "vdd-csiphy-1p2", .init_load_uA = 26700 },
{ .supply = "vdd-csiphy-1p8", .init_load_uA = 2600 }
},
- .clock = { "top_ahb", "ahb", "csiphy0", "csiphy0_timer" },
- .clock_rate = { { 0 },
- { 0 },
- { 240000000, 341330000, 384000000 },
+ .clock = { "csiphy0", "csiphy0_timer" },
+ .clock_rate = { { 240000000, 341330000, 384000000 },
{ 100000000, 200000000, 268800000 } },
.reg = { "csiphy0" },
.interrupt = { "csiphy0" },
@@ -708,10 +706,8 @@ static const struct camss_subdev_resources csiphy_res_2290[] = {
{ .supply = "vdd-csiphy-1p2", .init_load_uA = 26700 },
{ .supply = "vdd-csiphy-1p8", .init_load_uA = 2600 }
},
- .clock = { "top_ahb", "ahb", "csiphy1", "csiphy1_timer" },
- .clock_rate = { { 0 },
- { 0 },
- { 240000000, 341330000, 384000000 },
+ .clock = { "csiphy1", "csiphy1_timer" },
+ .clock_rate = { { 240000000, 341330000, 384000000 },
{ 100000000, 200000000, 268800000 } },
.reg = { "csiphy1" },
.interrupt = { "csiphy1" },
@@ -727,10 +723,8 @@ static const struct camss_subdev_resources csid_res_2290[] = {
/* CSID0 */
{
.regulators = {},
- .clock = { "top_ahb", "ahb", "csi0", "vfe0_cphy_rx", "vfe0" },
- .clock_rate = { { 0 },
- { 0 },
- { 192000000, 240000000, 384000000, 426400000 },
+ .clock = { "csi0", "vfe0_cphy_rx", "vfe0" },
+ .clock_rate = { { 192000000, 240000000, 384000000, 426400000 },
{ 0 },
{ 0 } },
.reg = { "csid0" },
@@ -745,10 +739,8 @@ static const struct camss_subdev_resources csid_res_2290[] = {
/* CSID1 */
{
.regulators = {},
- .clock = { "top_ahb", "ahb", "csi1", "vfe1_cphy_rx", "vfe1" },
- .clock_rate = { { 0 },
- { 0 },
- { 192000000, 240000000, 384000000, 426400000 },
+ .clock = { "csi1", "vfe1_cphy_rx", "vfe1" },
+ .clock_rate = { { 192000000, 240000000, 384000000, 426400000 },
{ 0 },
{ 0 } },
.reg = { "csid1" },
@@ -765,11 +757,8 @@ static const struct camss_subdev_resources vfe_res_2290[] = {
/* VFE0 */
{
.regulators = {},
- .clock = { "top_ahb", "ahb", "axi", "vfe0", "camnoc_rt_axi", "camnoc_nrt_axi" },
- .clock_rate = { { 0 },
- { 0 },
- { 0 },
- { 19200000, 153600000, 192000000, 256000000, 384000000, 460800000 },
+ .clock = { "vfe0", "camnoc_rt_axi", "camnoc_nrt_axi" },
+ .clock_rate = { { 19200000, 153600000, 192000000, 256000000, 384000000, 460800000 },
{ 0 },
{ 0 }, },
.reg = { "vfe0" },
@@ -785,11 +774,8 @@ static const struct camss_subdev_resources vfe_res_2290[] = {
/* VFE1 */
{
.regulators = {},
- .clock = { "top_ahb", "ahb", "axi", "vfe1", "camnoc_rt_axi", "camnoc_nrt_axi" },
- .clock_rate = { { 0 },
- { 0 },
- { 0 },
- { 19200000, 153600000, 192000000, 256000000, 384000000, 460800000 },
+ .clock = { "vfe1", "camnoc_rt_axi", "camnoc_nrt_axi" },
+ .clock_rate = { { 19200000, 153600000, 192000000, 256000000, 384000000, 460800000 },
{ 0 },
{ 0 }, },
.reg = { "vfe1" },
--
2.34.1
next prev parent reply other threads:[~2026-07-31 8:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-31 8:54 [PATCH v4 0/4] media: qcom: camss: Report CAMSS hardware version via media controller Loic Poulain
2026-07-31 8:54 ` [PATCH v4 1/4] media: qcom: camss: Add PM clock support and integrate with runtime PM Loic Poulain
2026-07-31 8:54 ` [PATCH v4 2/4] media: qcom: camss: Add PM clock definitions for QCM2290 Loic Poulain
2026-07-31 8:54 ` Loic Poulain [this message]
2026-07-31 8:54 ` [PATCH v4 4/4] media: qcom: camss: Report hardware version via media controller Loic Poulain
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=20260731-camss-version-v4-3-be8b716a8c4d@oss.qualcomm.com \
--to=loic.poulain@oss.qualcomm.com \
--cc=Frank.Li@nxp.com \
--cc=bryan.odonoghue@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=vladimir.zapolskiy@linaro.org \
/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
all inboxes | Powered by JetHome®