Re: [PATCH v3 5/5] media: qcom: camss: csid: Rename en_vc to en_port
From: Loic Poulain
Date: Tue Apr 07 2026 - 09:32:05 EST
On Tue, Apr 7, 2026 at 12:35 PM <bod@xxxxxxxxxx> wrote:
>
> From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
>
> The en_vc mask has always also been an en_port mask. Name the variable for
> what it does a bitmask of ports. When implementing v4l2 subdev streams it
> probably makes more sense to have tuples for port/vc mappings. Such a
> change right now feels like putting the cart before the horse.
>
> Sanitise the name in the interregnum.
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Reviewed-by: Loic Poulain <loic.poulain@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/qcom/camss/camss-csid-340.c | 2 +-
> drivers/media/platform/qcom/camss/camss-csid-680.c | 2 +-
> drivers/media/platform/qcom/camss/camss-csid-gen2.c | 4 ++--
> drivers/media/platform/qcom/camss/camss-csid-gen3.c | 6 +++---
> drivers/media/platform/qcom/camss/camss-csid.c | 10 +++++-----
> drivers/media/platform/qcom/camss/camss-csid.h | 2 +-
> 6 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-340.c b/drivers/media/platform/qcom/camss/camss-csid-340.c
> index 0231985746edf..6827d76bef5dc 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-340.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid-340.c
> @@ -120,7 +120,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
>
> /* Loop through all enabled ports and configure a stream for each */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++) {
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> __csid_configure_rdi_stream(csid, enable, i, 0);
> __csid_ctrl_rdi(csid, enable, i);
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-680.c b/drivers/media/platform/qcom/camss/camss-csid-680.c
> index edf01ba79907d..e530639456ee1 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-680.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid-680.c
> @@ -292,7 +292,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
>
> /* Loop through all enabled ports and configure a stream for each */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++) {
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> __csid_configure_rdi_stream(csid, enable, i, 0);
> __csid_configure_rx(csid, &csid->phy, 0);
> __csid_ctrl_rdi(csid, enable, i);
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-gen2.c b/drivers/media/platform/qcom/camss/camss-csid-gen2.c
> index eadcb2f7e3aaa..0e0c44d118a59 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-gen2.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid-gen2.c
> @@ -329,7 +329,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
>
> /* Loop through all enabled ports and configure a stream for each */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++)
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> if (tg->enabled)
> __csid_configure_testgen(csid, enable, i, 0);
>
> @@ -370,7 +370,7 @@ static irqreturn_t csid_isr(int irq, void *dev)
>
> /* Read and clear IRQ status for each enabled RDI channel */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++)
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> val = readl_relaxed(csid->base + CSID_CSI2_RDIN_IRQ_STATUS(i));
> writel_relaxed(val, csid->base + CSID_CSI2_RDIN_IRQ_CLEAR(i));
> }
> diff --git a/drivers/media/platform/qcom/camss/camss-csid-gen3.c b/drivers/media/platform/qcom/camss/camss-csid-gen3.c
> index ed5c5766efd36..cb6ca470dafa8 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid-gen3.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid-gen3.c
> @@ -215,7 +215,7 @@ static void csid_configure_stream(struct csid_device *csid, u8 enable)
>
> /* Loop through all enabled ports and configure a stream for each */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++)
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> __csid_configure_rdi_stream(csid, enable, i, 0);
> __csid_configure_rx(csid, &csid->phy, 0);
> __csid_ctrl_rdi(csid, enable, i);
> @@ -263,7 +263,7 @@ static irqreturn_t csid_isr(int irq, void *dev)
>
> /* Read and clear IRQ status for each enabled RDI channel */
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++)
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> val = readl(csid->base + CSID_CSI2_RDIN_IRQ_STATUS(i));
> writel(val, csid->base + CSID_CSI2_RDIN_IRQ_CLEAR(i));
>
> @@ -309,7 +309,7 @@ static int csid_reset(struct csid_device *csid)
> writel(1, csid->base + CSID_TOP_IRQ_MASK);
>
> for (i = 0; i < MSM_CSID_MAX_SRC_STREAMS; i++)
> - if (csid->phy.en_vc & BIT(i)) {
> + if (csid->phy.en_port & BIT(i)) {
> writel(BIT(BUF_DONE_IRQ_STATUS_RDI_OFFSET + i),
> csid->base + CSID_BUF_DONE_IRQ_CLEAR);
> writel(IRQ_CMD_CLEAR, csid->base + CSID_IRQ_CMD);
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> index ed1820488c987..71a40c2cb350b 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> @@ -1278,21 +1278,21 @@ static int csid_link_setup(struct media_entity *entity,
> csid->phy.lane_cnt = lane_cfg->num_data;
> csid->phy.lane_assign = csid_get_lane_assign(lane_cfg);
> }
> - /* Decide which virtual channels to enable based on which source pads are enabled */
> + /* Decide which ports to enable based on which source pads are enabled */
> if (local->flags & MEDIA_PAD_FL_SOURCE) {
> struct v4l2_subdev *sd = media_entity_to_v4l2_subdev(entity);
> struct csid_device *csid = v4l2_get_subdevdata(sd);
> struct device *dev = csid->camss->dev;
>
> if (flags & MEDIA_LNK_FL_ENABLED)
> - csid->phy.en_vc |= BIT(local->index - 1);
> + csid->phy.en_port |= BIT(local->index - 1);
> else
> - csid->phy.en_vc &= ~BIT(local->index - 1);
> + csid->phy.en_port &= ~BIT(local->index - 1);
>
> csid->phy.need_vc_update = true;
>
> - dev_dbg(dev, "%s: Enabled CSID virtual channels mask 0x%x\n",
> - __func__, csid->phy.en_vc);
> + dev_dbg(dev, "%s: Enabled CSID ports mask 0x%x\n",
> + __func__, csid->phy.en_port);
> }
>
> return 0;
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index aedc96ed84b2f..b227923ca5c15 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -68,7 +68,7 @@ struct csid_phy_config {
> u8 csiphy_id;
> u8 lane_cnt;
> u32 lane_assign;
> - u32 en_vc;
> + u32 en_port;
> u8 need_vc_update;
> };
>
>
> --
> 2.52.0
>