Update clock names to make them consistent with existing platform i.e
sc8280xp. Rename gcc_cam_hf_axi to gcc_axi_hf and add gcc_axi_sf.
Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com>
---
drivers/media/platform/qcom/camss/camss.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index a85e9df0f301..b1358457c66e 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -1443,12 +1443,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
.regulators = {},
.clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe0",
- "vfe0_axi", "gcc_cam_hf_axi" },
+ "vfe0_axi", "gcc_axi_hf", "gcc_axi_sf" },
.clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
{ 80000000 },
{ 0 },
{ 380000000, 510000000, 637000000, 760000000 },
{ 0 },
+ { 0 },
{ 0 } },
.reg = { "vfe0" },
@@ -1468,12 +1469,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
.regulators = {},
.clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe1",
- "vfe1_axi", "gcc_cam_hf_axi" },
+ "vfe1_axi", "gcc_axi_hf", "gcc_axi_sf" },
.clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
{ 80000000 },
{ 0 },
{ 380000000, 510000000, 637000000, 760000000 },
{ 0 },
+ { 0 },
{ 0 } },
.reg = { "vfe1" },
@@ -1493,12 +1495,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
.regulators = {},
.clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe2",
- "vfe2_axi", "gcc_cam_hf_axi" },
+ "vfe2_axi", "gcc_axi_hf", "gcc_axi_sf" },
.clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
{ 80000000 },
{ 0 },
{ 380000000, 510000000, 637000000, 760000000 },
{ 0 },
+ { 0 },
{ 0 } },
.reg = { "vfe2" },
@@ -1516,11 +1519,12 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
/* VFE3 (lite) */
{
.clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
- "vfe_lite0", "gcc_cam_hf_axi" },
+ "vfe_lite0", "gcc_axi_hf", "gcc_axi_sf" },
.clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
{ 80000000 },
{ 0 },
{ 320000000, 400000000, 480000000, 600000000 },
+ { 0 },
{ 0 } },
.regulators = {},
@@ -1537,11 +1541,12 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
/* VFE4 (lite) */
{
.clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
- "vfe_lite1", "gcc_cam_hf_axi" },
+ "vfe_lite1", "gcc_axi_hf", "gcc_axi_sf" },
.clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
{ 80000000 },
{ 0 },
{ 320000000, 400000000, 480000000, 600000000 },
+ { 0 },
{ 0 } },
.regulators = {},
--
2.25.1
On 21/01/2025 18:07, Vikram Sharma wrote:
> Update clock names to make them consistent with existing platform i.e
> sc8280xp. Rename gcc_cam_hf_axi to gcc_axi_hf and add gcc_axi_sf.
>
> Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com>
> ---
> drivers/media/platform/qcom/camss/camss.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index a85e9df0f301..b1358457c66e 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -1443,12 +1443,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
> .regulators = {},
>
> .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe0",
> - "vfe0_axi", "gcc_cam_hf_axi" },
> + "vfe0_axi", "gcc_axi_hf", "gcc_axi_sf" },
> .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> { 80000000 },
> { 0 },
> { 380000000, 510000000, 637000000, 760000000 },
> { 0 },
> + { 0 },
> { 0 } },
>
> .reg = { "vfe0" },
> @@ -1468,12 +1469,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
> .regulators = {},
>
> .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe1",
> - "vfe1_axi", "gcc_cam_hf_axi" },
> + "vfe1_axi", "gcc_axi_hf", "gcc_axi_sf" },
> .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> { 80000000 },
> { 0 },
> { 380000000, 510000000, 637000000, 760000000 },
> { 0 },
> + { 0 },
> { 0 } },
>
> .reg = { "vfe1" },
> @@ -1493,12 +1495,13 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
> .regulators = {},
>
> .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe2",
> - "vfe2_axi", "gcc_cam_hf_axi" },
> + "vfe2_axi", "gcc_axi_hf", "gcc_axi_sf" },
> .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> { 80000000 },
> { 0 },
> { 380000000, 510000000, 637000000, 760000000 },
> { 0 },
> + { 0 },
> { 0 } },
>
> .reg = { "vfe2" },
> @@ -1516,11 +1519,12 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
> /* VFE3 (lite) */
> {
> .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
> - "vfe_lite0", "gcc_cam_hf_axi" },
> + "vfe_lite0", "gcc_axi_hf", "gcc_axi_sf" },
> .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> { 80000000 },
> { 0 },
> { 320000000, 400000000, 480000000, 600000000 },
> + { 0 },
> { 0 } },
>
> .regulators = {},
> @@ -1537,11 +1541,12 @@ static const struct camss_subdev_resources vfe_res_7280[] = {
> /* VFE4 (lite) */
> {
> .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
> - "vfe_lite1", "gcc_cam_hf_axi" },
> + "vfe_lite1", "gcc_axi_hf", "gcc_axi_sf" },
> .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> { 80000000 },
> { 0 },
> { 320000000, 400000000, 480000000, 600000000 },
> + { 0 },
> { 0 } },
>
> .regulators = {},
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
© 2016 - 2025 Red Hat, Inc.