[PATCH v3 1/9] media: qcom: camss: Rename camss-csid-780.c to camss-csid-gen3.c
Bryan O'Donoghue
bryan.odonoghue at linaro.org
Mon Jul 28 06:44:45 PDT 2025
On 03/07/2025 18:19, Vikram Sharma wrote:
> Rename the file camss-csid-780.c to camss-csid-gen3.c to enable
> reuse of CSID logic across multiple SoCs.
>
> The SA8775P SoC includes CSID 690, which is functionally very
> similar to CSID 780, with only minor differences in register
> bitfields. This rename prepares the codebase for supporting
> additional SoCs without duplicating CSID logic.
>
> Signed-off-by: Vikram Sharma <quic_vikramsa at quicinc.com>
> ---
> drivers/media/platform/qcom/camss/Makefile | 2 +-
> .../qcom/camss/{camss-csid-780.c => camss-csid-gen3.c} | 8 +++++---
> .../qcom/camss/{camss-csid-780.h => camss-csid-gen3.h} | 9 +++++----
> drivers/media/platform/qcom/camss/camss-csid.h | 2 +-
> drivers/media/platform/qcom/camss/camss.c | 10 +++++-----
> 5 files changed, 17 insertions(+), 14 deletions(-)
> rename drivers/media/platform/qcom/camss/{camss-csid-780.c => camss-csid-gen3.c} (98%)
> rename drivers/media/platform/qcom/camss/{camss-csid-780.h => camss-csid-gen3.h} (84%)
>
> diff --git a/drivers/media/platform/qcom/camss/Makefile b/drivers/media/platform/qcom/camss/Makefile
> index d26a9c24a430..ee869e69521a 100644
> --- a/drivers/media/platform/qcom/camss/Makefile
> +++ b/drivers/media/platform/qcom/camss/Makefile
> @@ -8,7 +8,7 @@ qcom-camss-objs += \
> camss-csid-4-7.o \
> camss-csid-680.o \
> camss-csid-gen2.o \
> - camss-csid-780.o \
> + camss-csid-gen3.o \
> camss-csiphy-2ph-1-0.o \
> camss-csiphy-3ph-1-0.o \
> camss-csiphy.o \
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-780.c b/drivers/media/platform/qcom/camss/camss-csid-gen3.c
> similarity index 98%
> rename from drivers/media/platform/qcom/camss/camss-csid-780.c
> rename to drivers/media/platform/qcom/camss/camss-csid-gen3.c
> index 4c720d177731..0941152ec301 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-780.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid-gen3.c
> @@ -4,6 +4,8 @@
> *
> * Copyright (c) 2024 Qualcomm Technologies, Inc.
> */
> +
> +
Dead newlines.
> #include <linux/completion.h>
> #include <linux/delay.h>
> #include <linux/interrupt.h>
> @@ -13,7 +15,7 @@
>
> #include "camss.h"
> #include "camss-csid.h"
> -#include "camss-csid-780.h"
> +#include "camss-csid-gen3.h"
>
> #define CSID_IO_PATH_CFG0(csid) (0x4 * (csid))
> #define OUTPUT_IFE_EN 0x100
> @@ -259,7 +261,7 @@ static irqreturn_t csid_isr(int irq, void *dev)
>
> if (buf_done_val & BIT(BUF_DONE_IRQ_STATUS_RDI_OFFSET + i)) {
> /*
> - * For Titan 780, bus done and RUP IRQ have been moved to
> + * For Titan Gen3, bus done and RUP IRQ have been moved to
> * CSID from VFE. Once CSID received bus done, need notify
> * VFE of this event. Trigger VFE to handle bus done process.
> */
> @@ -325,7 +327,7 @@ static void csid_subdev_init(struct csid_device *csid)
> csid->testgen.nmodes = CSID_PAYLOAD_MODE_DISABLED;
> }
>
> -const struct csid_hw_ops csid_ops_780 = {
> +const struct csid_hw_ops csid_ops_gen3 = {
> .configure_stream = csid_configure_stream,
> .configure_testgen_pattern = csid_configure_testgen_pattern,
> .hw_version = csid_hw_version,
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-780.h b/drivers/media/platform/qcom/camss/camss-csid-gen3.h
> similarity index 84%
> rename from drivers/media/platform/qcom/camss/camss-csid-780.h
> rename to drivers/media/platform/qcom/camss/camss-csid-gen3.h
> index a990c66a60ff..e6298042ae74 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-780.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid-gen3.h
> @@ -1,13 +1,13 @@
> /* SPDX-License-Identifier: GPL-2.0 */
> /*
> - * camss-csid-780.h
> + * camss-csid-gen3.h
> *
> * Qualcomm MSM Camera Subsystem - CSID (CSI Decoder) Module Generation 3
> *
> * Copyright (c) 2024 Qualcomm Technologies, Inc.
> */
> -#ifndef __QC_MSM_CAMSS_CSID_780_H__
> -#define __QC_MSM_CAMSS_CSID_780_H__
> +#ifndef __QC_MSM_CAMSS_CSID_GEN3_H__
> +#define __QC_MSM_CAMSS_CSID_GEN3_H__
>
> #define DECODE_FORMAT_UNCOMPRESSED_8_BIT 0x1
> #define DECODE_FORMAT_UNCOMPRESSED_10_BIT 0x2
> @@ -18,8 +18,9 @@
> #define DECODE_FORMAT_UNCOMPRESSED_24_BIT 0x7
> #define DECODE_FORMAT_PAYLOAD_ONLY 0xf
>
> +
another dead newline
> #define PLAIN_FORMAT_PLAIN8 0x0 /* supports DPCM, UNCOMPRESSED_6/8_BIT */
> #define PLAIN_FORMAT_PLAIN16 0x1 /* supports DPCM, UNCOMPRESSED_10/16_BIT */
> #define PLAIN_FORMAT_PLAIN32 0x2 /* supports UNCOMPRESSED_20_BIT */
>
> -#endif /* __QC_MSM_CAMSS_CSID_780_H__ */
> +#endif /* __QC_MSM_CAMSS_CSID_GEN3_H__ */
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index 9dc826d8c8f6..62273ca9f199 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -215,7 +215,7 @@ extern const struct csid_hw_ops csid_ops_4_1;
> extern const struct csid_hw_ops csid_ops_4_7;
> extern const struct csid_hw_ops csid_ops_680;
> extern const struct csid_hw_ops csid_ops_gen2;
> -extern const struct csid_hw_ops csid_ops_780;
> +extern const struct csid_hw_ops csid_ops_gen3;
>
> /*
> * csid_is_lite - Check if CSID is CSID lite.
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 06f42875702f..1431e08dc04a 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -2285,7 +2285,7 @@ static const struct camss_subdev_resources csid_res_8550[] = {
> .csid = {
> .is_lite = false,
> .parent_dev_ops = &vfe_parent_dev_ops,
> - .hw_ops = &csid_ops_780,
> + .hw_ops = &csid_ops_gen3,
> .formats = &csid_formats_gen2
> }
> },
> @@ -2300,7 +2300,7 @@ static const struct camss_subdev_resources csid_res_8550[] = {
> .csid = {
> .is_lite = false,
> .parent_dev_ops = &vfe_parent_dev_ops,
> - .hw_ops = &csid_ops_780,
> + .hw_ops = &csid_ops_gen3,
> .formats = &csid_formats_gen2
> }
> },
> @@ -2315,7 +2315,7 @@ static const struct camss_subdev_resources csid_res_8550[] = {
> .csid = {
> .is_lite = false,
> .parent_dev_ops = &vfe_parent_dev_ops,
> - .hw_ops = &csid_ops_780,
> + .hw_ops = &csid_ops_gen3,
> .formats = &csid_formats_gen2
> }
> },
> @@ -2330,7 +2330,7 @@ static const struct camss_subdev_resources csid_res_8550[] = {
> .csid = {
> .is_lite = true,
> .parent_dev_ops = &vfe_parent_dev_ops,
> - .hw_ops = &csid_ops_780,
> + .hw_ops = &csid_ops_gen3,
> .formats = &csid_formats_gen2
> }
> },
> @@ -2345,7 +2345,7 @@ static const struct camss_subdev_resources csid_res_8550[] = {
> .csid = {
> .is_lite = true,
> .parent_dev_ops = &vfe_parent_dev_ops,
> - .hw_ops = &csid_ops_780,
> + .hw_ops = &csid_ops_gen3,
> .formats = &csid_formats_gen2
> }
> }
I can fix those newlines, no need for a v4.
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue at linaro.org>
More information about the linux-arm-kernel
mailing list