Re: [PATCH RFC 4/8] media: qcom: camss: Prepare CSID for C-PHY support

[David Heidelberg]

On 10/11/2025 12:37, Bryan O'Donoghue wrote:
On 09/11/2025 09:39, David Heidelberg via B4 Relay wrote:
From: David Heidelberg <da...@ixit.cz>
Inherit C-PHY information from CSIPHY, so we can configure CSID
properly.

CSI2_RX_CFG0_PHY_TYPE_SEL must be set to 1, when C-PHY mode is used.

Signed-off-by: David Heidelberg <da...@ixit.cz>
---
  drivers/media/platform/qcom/camss/camss-csid-gen2.c | 1 +
  drivers/media/platform/qcom/camss/camss-csid.c      | 1 +
  drivers/media/platform/qcom/camss/camss-csid.h      | 1 +
  3 files changed, 3 insertions(+)

diff --git a/drivers/media/platform/qcom/camss/camss-csid-gen2.c b/ 
drivers/media/platform/qcom/camss/camss-csid-gen2.c
index 2a1746dcc1c5b..033036ae28a4f 100644
--- a/drivers/media/platform/qcom/camss/camss-csid-gen2.c
+++ b/drivers/media/platform/qcom/camss/camss-csid-gen2.c
@@ -183,6 +183,7 @@ static void __csid_configure_rx(struct csid_device 
*csid,
      val = (lane_cnt - 1) << CSI2_RX_CFG0_NUM_ACTIVE_LANES;
      val |= phy->lane_assign << CSI2_RX_CFG0_DL0_INPUT_SEL;
      val |= phy->csiphy_id << CSI2_RX_CFG0_PHY_NUM_SEL;
+    val |= csid->phy.cphy << CSI2_RX_CFG0_PHY_TYPE_SEL;
      writel_relaxed(val, csid->base + CSID_CSI2_RX_CFG0);
      val = 1 << CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN;
diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/ 
media/platform/qcom/camss/camss-csid.c
index 5284b5857368c..68adea33cc719 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.c
+++ b/drivers/media/platform/qcom/camss/camss-csid.c
@@ -1287,6 +1287,7 @@ static int csid_link_setup(struct media_entity 
*entity,
          csid->phy.csiphy_id = csiphy->id;
          lane_cfg = &csiphy->cfg.csi2->lane_cfg;
+        csid->phy.cphy = lane_cfg->cphy;
          csid->phy.lane_cnt = lane_cfg->num_data;
          csid->phy.lane_assign = csid_get_lane_assign(lane_cfg);
      }
diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/ 
media/platform/qcom/camss/camss-csid.h
index aedc96ed84b2f..a82db31bd2335 100644
--- a/drivers/media/platform/qcom/camss/camss-csid.h
+++ b/drivers/media/platform/qcom/camss/camss-csid.h
@@ -70,6 +70,7 @@ struct csid_phy_config {
      u32 lane_assign;
      u32 en_vc;
      u8 need_vc_update;
+    bool cphy;
  };
  struct csid_device;


I'm not convinced you need another flag for this. It should be possible 
for the CSID to get a pointer to the PHY and interrogate the encoded mode.

I'm not seeing elegant way to do this, if you look below my change 
above, others attributes are taken into csid_phy_config in similar way.

Or maybe I'm not seeing some easy/clean way here?

David


---
bod

--
David Heidelberg