media: qcom: camss: Rename camss-vfe-780.c to camss-vfe-gen3.c

Rename the file camss-vfe-780.c to camss-vfe-gen3.c to enable
reuse of VFE logic across multiple SoCs.

The lemans(sa8775p) SoC includes VFE 690, which is very similar
to VFE 780, with only minor differences in register bitfields.
Rename prepares the codebase for supporting additional SoCs
without duplicating VFE logic.

Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
index 928167c4a8d952521519e28334ce08e99a5fefb5..23960d02877de132b63ebfe88affe55576256829 100644 (file)
--- a/drivers/media/platform/qcom/camss/Makefile
+++ b/drivers/media/platform/qcom/camss/Makefile
@@ -21,7 +21,7 @@ qcom-camss-objs += \
                camss-vfe-340.o \
                camss-vfe-480.o \
                camss-vfe-680.o \
-               camss-vfe-780.o \
+               camss-vfe-gen3.o \
                camss-vfe-gen1.o \
                camss-vfe.o \
                camss-video.o \

diff --git a/drivers/media/platform/qcom/camss/camss-vfe-780.c b/drivers/media/platform/qcom/camss/camss-vfe-gen3.c
similarity index 96%
rename from drivers/media/platform/qcom/camss/camss-vfe-780.c
rename to drivers/media/platform/qcom/camss/camss-vfe-gen3.c
index b9812d70f91bceb47240e905bb8f7d6c2beb2f45..93d16b0951e993ae9e0338392355d0eb9ab0ae05 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe-780.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe-gen3.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module v780 (SM8550)
+ * Qualcomm MSM Camera Subsystem - VFE (Video Front End) Module gen3
  *
  * Copyright (c) 2024 Qualcomm Technologies, Inc.
  */
@@ -113,14 +113,14 @@ static inline void vfe_reg_update_clear(struct vfe_device *vfe,
        camss_reg_update(vfe->camss, vfe->id, port_id, true);
 }
 
-static const struct camss_video_ops vfe_video_ops_780 = {
+static const struct camss_video_ops vfe_video_ops_gen3 = {
        .queue_buffer = vfe_queue_buffer_v2,
        .flush_buffers = vfe_flush_buffers,
 };
 
 static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
 {
-       vfe->video_ops = vfe_video_ops_780;
+       vfe->video_ops = vfe_video_ops_gen3;
 }
 
 static void vfe_global_reset(struct vfe_device *vfe)
@@ -140,7 +140,7 @@ static int vfe_halt(struct vfe_device *vfe)
        return 0;
 }
 
-const struct vfe_hw_ops vfe_ops_780 = {
+const struct vfe_hw_ops vfe_ops_gen3 = {
        .global_reset = vfe_global_reset,
        .hw_version = vfe_hw_version,
        .isr = vfe_isr,

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.h b/drivers/media/platform/qcom/camss/camss-vfe.h
index 9b138849caca015bade5d98fcf34014ff4833ea0..0300efdb1c46f8ba6aad204e36dd62380515bea7 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.h
+++ b/drivers/media/platform/qcom/camss/camss-vfe.h
@@ -245,7 +245,7 @@ extern const struct vfe_hw_ops vfe_ops_170;
 extern const struct vfe_hw_ops vfe_ops_340;
 extern const struct vfe_hw_ops vfe_ops_480;
 extern const struct vfe_hw_ops vfe_ops_680;
-extern const struct vfe_hw_ops vfe_ops_780;
+extern const struct vfe_hw_ops vfe_ops_gen3;
 
 int vfe_get(struct vfe_device *vfe);
 void vfe_put(struct vfe_device *vfe);

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index d4433121be0759e50866d1dc83d00a0ef12c0e7f..149c3c98294c709eecce8a66eb327e638b5a203b 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -2505,7 +2505,7 @@ static const struct camss_subdev_resources vfe_res_8550[] = {
                        .is_lite = false,
                        .has_pd = true,
                        .pd_name = "ife0",
-                       .hw_ops = &vfe_ops_780,
+                       .hw_ops = &vfe_ops_gen3,
                        .formats_rdi = &vfe_formats_rdi_845,
                        .formats_pix = &vfe_formats_pix_845
                }
@@ -2529,7 +2529,7 @@ static const struct camss_subdev_resources vfe_res_8550[] = {
                        .is_lite = false,
                        .has_pd = true,
                        .pd_name = "ife1",
-                       .hw_ops = &vfe_ops_780,
+                       .hw_ops = &vfe_ops_gen3,
                        .formats_rdi = &vfe_formats_rdi_845,
                        .formats_pix = &vfe_formats_pix_845
                }
@@ -2553,7 +2553,7 @@ static const struct camss_subdev_resources vfe_res_8550[] = {
                        .is_lite = false,
                        .has_pd = true,
                        .pd_name = "ife2",
-                       .hw_ops = &vfe_ops_780,
+                       .hw_ops = &vfe_ops_gen3,
                        .formats_rdi = &vfe_formats_rdi_845,
                        .formats_pix = &vfe_formats_pix_845
                }
@@ -2575,7 +2575,7 @@ static const struct camss_subdev_resources vfe_res_8550[] = {
                .vfe = {
                        .line_num = 4,
                        .is_lite = true,
-                       .hw_ops = &vfe_ops_780,
+                       .hw_ops = &vfe_ops_gen3,
                        .formats_rdi = &vfe_formats_rdi_845,
                        .formats_pix = &vfe_formats_pix_845
                }
@@ -2597,7 +2597,7 @@ static const struct camss_subdev_resources vfe_res_8550[] = {
                .vfe = {
                        .line_num = 4,
                        .is_lite = true,
-                       .hw_ops = &vfe_ops_780,
+                       .hw_ops = &vfe_ops_gen3,
                        .formats_rdi = &vfe_formats_rdi_845,
                        .formats_pix = &vfe_formats_pix_845
                }