media: camss: Add support for C-PHY configuration on Qualcomm platforms
Subsystems (4)
v9 cover media: camss: Add support for C-PHY configuration on Qualcomm platforms
Note: WIP tag added, as not everything from the previous review round has been addressed.
This patch series extends the Qualcomm CAMSS (Camera Subsystem), including CSID and CSIPHY components, to support C-PHY mode configuration.
Modern smartphone cameras increasingly rely on MIPI C-PHY rather than D-PHY, thanks to its higher data throughput and signal efficiency. As a result, many OEMs adopt C-PHY interfaces for main (rear) cameras on Qualcomm-based devices.
Until now, mainline Linux lacked C-PHY configuration support for Qualcomm chipsets, preventing bring-up of primary camera sensors on several Snapdragon platforms. This series closes that gap.
- Introduces C-PHY configuration support for the CAMSS driver stack, covering both CSID and CSIPHY blocks.
- Successfully enables C-PHY operation on the Snapdragon 845 platform.
- Tested on OnePlus 6 and 6T phones running mainline Linux, using the Sony IMX519 main camera sensor.
- The new configuration allows other chipsets versionsto enable C-PHY by simply adding corresponding sensor driver support and csiphy initialization data, following the example set for sdm845.
With this patch series, mainline Linux gains working C-PHY support for Snapdragon 845, paving the way for improved main camera functionality across many Qualcomm-based devices. The groundwork also simplifies future enablement efforts for additional SoCs and sensors.
Until merged, the series will be also available at:
https://codeberg.org/sdm845/linux/commits/branch/b4/qcom-cphy
---
Changes in v9:
- Dropped Cc and Fixes tag for "csiphy-3ph: Fix lane mask calculation" and reordered the commit.
(Vladimir)
- Link to v8: https://lore.kernel.org/r/[email protected]
Changes in v8:
- Refactor the for cycle in csiphy_is_gen2 same way as csiphy_get_lane_mask(). (Frank)
- Dropped T-b/R-b/A-b from
"media: qcom: camss: Account for C-PHY when calculating link frequency" as I did refactored the commit to not rely on csiphy_id. (Wenmeng)
- csiphy_get_lane_mask calculation fix. (Wenmeng)
- csiphy_lanes_enable now uses csiphy_get_lane_mask. (Wenmeng)
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- Move logic out of switch. (Frank)
- Change csid cphy knob to phy_sel using enum. (Bryan, Frank)
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- lanes_enable now uses WARN_ONCE instead of return values. (Sakari)
- Dropped Kodiak patch until it gets better documented.
- Document the 3ph C-PHY sdm845 registers a bit.
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Split first patch enabling C-PHY part into last patch. (Bryan)
- Fix the camss_get_link_freq crash. (Cory)
- Dropped patch whitelisting C-PHY, instead use nullptr check. (Bryan)
- Dropped A-b/R-b from
"media: qcom: camss: Initialize lanes after lane configuration is available" and changed Petr to Co-developed by and owned the patch.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Documented cphy parametr to camss_get_link_freq.
- Use BIT() macro for lane_mask. (Bryan)
- Correct lane_mask calculation. (Kieran + me)
- Removed comment for the D/C-PHY sequences init. (Bryan)
- Pass &csid->phy for calculate freq. (Bryan)
- Added missing cphy description to camss_get_link_freq. (kernel test robot)
- Gen2 v1.1 MIPI CSI-2 CPHY init hex to lowercase.
- Added back missed commit with improved electrical for sdm845 3ph.
- NOT addressed yet:
- Proliferating special cases in switch statements on a per-SoC basis is verboten.
- is it possible to set clock_lane to say 0xff in DT ?
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Make lanes_enable return sucess or error, since I couldn't move the configuration to the _init.
- Dropped R-b tags on
"media: qcom: camss: Initialize lanes after lane configuration is available" as I changed formatting.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- This is still WIP patch series, thus I wanted to publish already changed parts to get feedback regarding to the direction of patchset.
- When switch to using odd bits, zeroed val which was left unitialized in v1.
- Accidentally missed archs added back in the commit moving lane regs to new location.
- Remove commit with reverting check for only D-PHY is supported and adjusted the check to also account for C-PHY.
- Documented link frequency calculation with defines. (Casey)
- Changed the cphy boolean to phy_cfg enum in the camss/camss-csiphy. (Brian)
- Added patch for csiphy-3ph enablement for sm7280 from Luca as I'm meanwhile trying to bring up the C-PHY sensor on FairPhone 5.
- Merged these two commits together
csiphy-3ph: Enable sdm845 C-PHY sequence
csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 CPHY init
merged R-b.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
David Heidelberg (9):
media: qcom: camss: csiphy-3ph: Fix lane mask calculation
media: qcom: camss: csiphy: Introduce PHY configuration
media: qcom: camss: csiphy-3ph: Use odd bits for configuring C-PHY lanes
media: qcom: camss: Prepare CSID for C-PHY support
media: qcom: camss: Initialize lanes after lane configuration is available
media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
media: qcom: camss: csiphy-3ph: Update Gen2 v1.1 MIPI CSI-2 C-PHY init
media: qcom: camss: Account for C-PHY when calculating link frequency
media: qcom: camss: Enable C-PHY where available
.../media/platform/qcom/camss/camss-csid-gen2.c | 1 + drivers/media/platform/qcom/camss/camss-csid.c | 11 +- drivers/media/platform/qcom/camss/camss-csid.h | 6 + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 229 ++++++++++++++++----- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 +- drivers/media/platform/qcom/camss/camss-csiphy.h | 2 + drivers/media/platform/qcom/camss/camss.c | 33 ++- drivers/media/platform/qcom/camss/camss.h | 2 +- 8 files changed, 229 insertions(+), 61 deletions(-)
---
base-commit: abe651837cb394f76d738a7a747322fca3bf17ba
change-id: 20251109-qcom-cphy-bb8cbda1c644
Best regards,
Signature · 1 line
David Heidelberg <[email protected]>
PATCH RESEND v9 1/9 media: qcom: camss: csiphy-3ph: Fix lane mask calculation
The lane mask must be multiplied by 2, but this was accidentally omitted.
--- drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +1 -1
@@ -1114,17 +1114,17 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,static u8 csiphy_get_lane_mask (struct csiphy_lanes_cfg *lane_cfg) {u8 lane_mask;int i; lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ;for (i =0 ; i < lane_cfg->num_data; i++) - lane_mask |=1 << lane_cfg->data[i].pos; + lane_mask |=BIT (lane_cfg->data[i].pos *2 );return lane_mask; }static bool csiphy_is_gen2 (u32 version) {bool ret = false;
Signature · 1 line
2.53.0
Re: [PATCH RESEND v9 1/9] media: qcom: camss: csiphy-3ph: Fix lane mask calculation
Quoted 6 lines · David Heidelberg
The lane mask must be multiplied by 2, but this was accidentally omitted.
Reviewed-by Vladimir Zapolskiy <[email protected]>Suggested-by Nihal Kumar Gupta <[email protected]>Signed-off-by David Heidelberg <[email protected]>---
Quoted 30 lines
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +1
-2@@ -1114,17 +1114,17 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,static u8 csiphy_get_lane_mask (struct csiphy_lanes_cfg *lane_cfg) {u8 lane_mask;int i; lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ;for (i =0 ; i < lane_cfg->num_data; i++) - lane_mask |=1 << lane_cfg->data[i].pos; + lane_mask |=BIT (lane_cfg->data[i].pos *2 );return lane_mask; }static bool csiphy_is_gen2 (u32 version) {bool ret = false; --2.53.0
PATCH RESEND v9 2/9 media: qcom: camss: csiphy: Introduce PHY configuration
In reply to David HeidelbergRead PHY configuration from the device-tree bus-type and save it into the csiphy structure for later use.
For C-PHY, skip clock line configuration, as there is none.
--- drivers/media/platform/qcom/camss/camss-csiphy.h | 2 ++ drivers/media/platform/qcom/camss/camss.c | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy.h +2 -0
@@ -25,21 +25,23 @@struct csiphy_lane {u8 pos;u8 pol; };/** * struct csiphy_lanes_cfg - CSIPHY lanes configuration +* @phy_cfg: interface selection (C-PHY or D-PHY) * @num_data: number of data lanes * @data: data lanes configuration * @clk: clock lane configuration (only for D-PHY) */ struct csiphy_lanes_cfg { +enum v4l2_mbus_type phy_cfg;int num_data;struct csiphy_lane *data;struct csiphy_lane clk; };struct csiphy_csi2_cfg {struct csiphy_lanes_cfg lane_cfg; };
drivers/media/platform/qcom/camss/camss.c +6 -2
@@ -4761,19 +4761,23 @@ static int camss_parse_endpoint_node(struct device *dev,if (vep.bus_type !=V4L2_MBUS_CSI2_DPHY ) {dev_err (dev,"Unsupported bus type %d\n" , vep.bus_type);return -EINVAL ; } csd->interface.csiphy_id = vep.base.port; mipi_csi2 = &vep.bus.mipi_csi2; - lncfg->clk.pos = mipi_csi2->clock_lane; - lncfg->clk.pol = mipi_csi2->lane_polarities[0 ]; lncfg->num_data = mipi_csi2->num_data_lanes; + lncfg->phy_cfg = vep.bus_type; + +if (lncfg->phy_cfg !=V4L2_MBUS_CSI2_CPHY ) { + lncfg->clk.pos = mipi_csi2->clock_lane; + lncfg->clk.pol = mipi_csi2->lane_polarities[0 ]; + } lncfg->data =devm_kcalloc (dev, lncfg->num_data,sizeof (*lncfg->data),GFP_KERNEL );if (!lncfg->data)return -ENOMEM ;for (i =0 ; i < lncfg->num_data; i++) {
Signature · 1 line
2.53.0
PATCH RESEND v9 3/9 media: qcom: camss: csiphy-3ph: Use odd bits for configuring C-PHY lanes
In reply to David HeidelbergSo far, only D-PHY mode was supported, which uses even bits when enabling or masking lanes. For C-PHY configuration, the hardware instead requires using the odd bits.
Since there can be unrecognized configuration allow returning failure.
--- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +16 -9
@@ -9,16 +9,17 @@*/ #include "camss.h" #include "camss-csiphy.h" #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/media-bus-format.h> #define CSIPHY_3PH_LNn_CFG1 (n) (0x000 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG1_SWI_REC_DLY_PRG (BIT(7) | BIT(6))#define CSIPHY_3PH_LNn_CFG2 (n) (0x004 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG2_LP_REC_EN_INT BIT(3)#define CSIPHY_3PH_LNn_CFG3 (n) (0x008 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG4 (n) (0x00c + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS 0xa4
@@ -1108,23 +1109,32 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,writel_relaxed (val, csiphy->base + r->reg_addr);if (r->delay_us)udelay (r->delay_us); } }static u8 csiphy_get_lane_mask (struct csiphy_lanes_cfg *lane_cfg) { -u8 lane_mask; -int i; +u8 lane_mask =0 ; +u8 offset =0 ; - lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; +switch (lane_cfg->phy_cfg) { +case V4L2_MBUS_CSI2_CPHY : + offset =1 ; +break ; +case V4L2_MBUS_CSI2_DPHY : + lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; +break ; +default : +break ; + } -for (i =0 ; i < lane_cfg->num_data; i++) - lane_mask |=BIT (lane_cfg->data[i].pos *2 ); +for (int i =0 ; i < lane_cfg->num_data; i++) + lane_mask |=BIT ((lane_cfg->data[i].pos *2 ) + offset);return lane_mask; }static bool csiphy_is_gen2 (u32 version) {bool ret = false;
@@ -1155,20 +1165,17 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;struct csiphy_device_regs *regs = csiphy->regs;u8 settle_cnt;u8 val;int i; settle_cnt =csiphy_settle_cnt_calc (link_freq, csiphy->timer_clk_rate); - val =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; -for (i =0 ; i < c->num_data; i++) - val |=BIT (c->data[i].pos *2 ); - + val =csiphy_get_lane_mask (c);writel_relaxed (val, csiphy->base +CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (regs->offset,5 )); val =CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B ;writel_relaxed (val, csiphy->base +CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (regs->offset,6 )); val =0x02 ;
Signature · 1 line
2.53.0
Re: [PATCH RESEND v9 3/9] media: qcom: camss: csiphy-3ph: Use odd bits for configuring C-PHY lanes
Quoted 10 lines · David Heidelberg
So far, only D-PHY mode was supported, which uses even bits when enabling or masking lanes. For C-PHY configuration, the hardware instead requires using the odd bits.
Since there can be unrecognized configuration allow returning failure.
Acked-by Cory Keitz <[email protected]>Reviewed-by Bryan O'Donoghue <[email protected]>Signed-off-by David Heidelberg <[email protected]>---
Quoted 89 lines
.../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +16
-10@@ -9,16 +9,17 @@*/ #include "camss.h" #include "camss-csiphy.h" #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/media-bus-format.h> #define CSIPHY_3PH_LNn_CFG1 (n) (0x000 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG1_SWI_REC_DLY_PRG (BIT(7) | BIT(6))#define CSIPHY_3PH_LNn_CFG2 (n) (0x004 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG2_LP_REC_EN_INT BIT(3)#define CSIPHY_3PH_LNn_CFG3 (n) (0x008 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG4 (n) (0x00c + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS 0xa4@@ -1108,23 +1109,32 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,writel_relaxed (val, csiphy->base + r->reg_addr);if (r->delay_us)udelay (r->delay_us); } }static u8 csiphy_get_lane_mask (struct csiphy_lanes_cfg *lane_cfg) { -u8 lane_mask; -int i; +u8 lane_mask =0 ; +u8 offset =0 ; - lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; +switch (lane_cfg->phy_cfg) { +case V4L2_MBUS_CSI2_CPHY : + offset =1 ; +break ; +case V4L2_MBUS_CSI2_DPHY : + lane_mask =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; +break ; +default : +break ; + } -for (i =0 ; i < lane_cfg->num_data; i++) - lane_mask |=BIT (lane_cfg->data[i].pos *2 ); +for (int i =0 ; i < lane_cfg->num_data; i++) + lane_mask |=BIT ((lane_cfg->data[i].pos *2 ) + offset);return lane_mask; }static bool csiphy_is_gen2 (u32 version) {bool ret = false;@@ -1155,20 +1165,17 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;struct csiphy_device_regs *regs = csiphy->regs;u8 settle_cnt;u8 val;int i; settle_cnt =csiphy_settle_cnt_calc (link_freq, csiphy->timer_clk_rate); - val =CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE ; -for (i =0 ; i < c->num_data; i++) - val |=BIT (c->data[i].pos *2 ); - + val =csiphy_get_lane_mask (c);writel_relaxed (val, csiphy->base +CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (regs->offset,5 )); val =CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B ;writel_relaxed (val, csiphy->base +CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (regs->offset,6 )); val =0x02 ; --2.53.0
PATCH RESEND v9 4/9 media: qcom: camss: Prepare CSID for C-PHY support
In reply to David HeidelbergInherit 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.
--- drivers/media/platform/qcom/camss/camss-csid-gen2.c | 1 + drivers/media/platform/qcom/camss/camss-csid.c | 5 +++++ drivers/media/platform/qcom/camss/camss-csid.h | 6 ++++++ 3 files changed, 12 insertions(+)
drivers/media/platform/qcom/camss/camss-csid-gen2.c +1 -0
@@ -178,16 +178,17 @@ static void __csid_configure_rx(struct csid_device *csid,int val;if (!lane_cnt) lane_cnt =4 ; 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.phy_sel <<CSI2_RX_CFG0_PHY_TYPE_SEL ;writel_relaxed (val, csid->base +CSID_CSI2_RX_CFG0 ); val =1 <<CSI2_RX_CFG1_PACKET_ECC_CORRECTION_EN ;if (vc >3 ) val |=1 <<CSI2_RX_CFG1_VC_MODE ; val |=1 <<CSI2_RX_CFG1_MISR_EN ;writel_relaxed (val, csid->base +CSID_CSI2_RX_CFG1 ); }
drivers/media/platform/qcom/camss/camss-csid.c +5 -0
@@ -1286,16 +1286,21 @@ static int csid_link_setup(struct media_entity *entity,/* do no allow a link from CSIPHY to CSID */ if (!csiphy->cfg.csi2)return -EPERM ; csid->phy.csiphy_id = csiphy->id; lane_cfg = &csiphy->cfg.csi2->lane_cfg; csid->phy.lane_cnt = lane_cfg->num_data; +if (lane_cfg->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) + csid->phy.phy_sel =CSID_PHY_SEL_CPHY ; +else + csid->phy.phy_sel =CSID_PHY_SEL_DPHY ; + csid->phy.lane_assign =csid_get_lane_assign (lane_cfg, lane_cfg->num_data); csid->tpg_linked = false; } }/* Decide which virtual channels 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);
drivers/media/platform/qcom/camss/camss-csid.h +6 -0
@@ -39,16 +39,21 @@ enum csid_testgen_mode {CSID_PAYLOAD_MODE_USER_SPECIFIED =6 ,CSID_PAYLOAD_MODE_NUM_SUPPORTED_GEN1 =6 ,/* excluding disabled */ CSID_PAYLOAD_MODE_COMPLEX_PATTERN =7 ,CSID_PAYLOAD_MODE_COLOR_BOX =8 ,CSID_PAYLOAD_MODE_COLOR_BARS =9 , CSID_PAYLOAD_MODE_NUM_SUPPORTED_GEN2 = 9, /* excluding disabled */ }; +enum csid_phy_sel { +CSID_PHY_SEL_DPHY =0 , +CSID_PHY_SEL_CPHY =1 +}; +struct csid_format_info {u32 code;u8 data_type;u8 decode_format;u8 bpp;u8 spp;/* bus samples per pixel */ };
@@ -65,16 +70,17 @@ struct csid_testgen_config { };struct csid_phy_config {u8 csiphy_id;u8 lane_cnt;u32 lane_assign;u32 en_vc;u8 need_vc_update; +enum csid_phy_sel phy_sel; };struct csid_device ;struct csid_hw_ops {/* * configure_stream - Configures and starts CSID input stream * @csid: CSID device
Signature · 1 line
2.53.0
PATCH RESEND v9 5/9 media: qcom: camss: Initialize lanes after lane configuration is available
In reply to David HeidelbergThe lanes must not be initialized before the driver has access to the lane configuration, as it depends on whether D-PHY or C-PHY mode is in use. Move the lane initialization to csiphy_lanes_enable which is called when the configuration structures are available.
--- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 131 +++++++++++++++------ 1 file changed, 93 insertions(+), 38 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +93 -38
@@ -1163,16 +1163,108 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, s64 link_freq, u8 lane_mask) {struct csiphy_lanes_cfg *c = &cfg->csi2->lane_cfg;struct csiphy_device_regs *regs = csiphy->regs;u8 settle_cnt;u8 val;int i; +switch (csiphy->camss->res->version) { +case CAMSS_845 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sdm845[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_2290 : +case CAMSS_6150 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_qcm2290[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_qcm2290); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_6350 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sm6350[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sm6350); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_7280 : +case CAMSS_8250 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sm8250[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8250); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_8280XP : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sc8280xp[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sc8280xp); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_X1E80100 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_x1e80100[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_x1e80100); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_8550 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sm8550[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8550); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_8650 : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sm8650[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8650); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +case CAMSS_8300 : +case CAMSS_8775P : +if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { + regs->lane_regs = &lane_regs_sa8775p[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sa8775p); + }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { + regs->lane_regs =NULL ; + regs->lane_array_size =0 ; + } +break ; +default : +break ; + } + +if (!regs->lane_regs) +WARN_ONCE (1 ,"Missing lane_regs definition!\n" ); + settle_cnt =csiphy_settle_cnt_calc (link_freq, csiphy->timer_clk_rate); val =csiphy_get_lane_mask (c);writel_relaxed (val, csiphy->base +CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (regs->offset,5 )); val =CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B ; writel_relaxed(val, csiphy->base +
@@ -1215,63 +1307,26 @@ static int csiphy_init(struct csiphy_device *csiphy)struct device *dev = csiphy->camss->dev;struct csiphy_device_regs *regs; regs =devm_kmalloc (dev,sizeof (*regs),GFP_KERNEL );if (!regs)return -ENOMEM ; csiphy->regs = regs; - regs->offset =0x800 ; regs->common_status_offset =0xb0 ;switch (csiphy->camss->res->version) { -case CAMSS_845 : - regs->lane_regs = &lane_regs_sdm845[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845); -break ; -case CAMSS_2290 : -case CAMSS_6150 : - regs->lane_regs = &lane_regs_qcm2290[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_qcm2290); -break ; -case CAMSS_6350 : - regs->lane_regs = &lane_regs_sm6350[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sm6350); -break ; -case CAMSS_7280 : -case CAMSS_8250 : - regs->lane_regs = &lane_regs_sm8250[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8250); -break ; -case CAMSS_8280XP : - regs->lane_regs = &lane_regs_sc8280xp[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sc8280xp); -break ;case CAMSS_X1E80100 : - regs->lane_regs = &lane_regs_x1e80100[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_x1e80100); - regs->offset =0x1000 ; -break ;case CAMSS_8550 : - regs->lane_regs = &lane_regs_sm8550[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8550); - regs->offset =0x1000 ; -break ;case CAMSS_8650 : - regs->lane_regs = &lane_regs_sm8650[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sm8650); regs->offset =0x1000 ;break ; -case CAMSS_8300 : -case CAMSS_8775P : - regs->lane_regs = &lane_regs_sa8775p[0 ]; - regs->lane_array_size =ARRAY_SIZE (lane_regs_sa8775p); -break ;default : + regs->offset =0x800 ;break ; }return 0 ; }const struct csiphy_hw_ops csiphy_ops_3ph_1_0 = { .get_lane_mask = csiphy_get_lane_mask,
Signature · 1 line
2.53.0
PATCH RESEND v9 6/9 media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
In reply to David HeidelbergAdd a PHY configuration sequence for the sdm845 which uses a Qualcomm Gen 2 version 1.1 CSI-2 PHY.
The PHY can be configured as two phase or three phase in C-PHY or D-PHY mode. This configuration supports three-phase C-PHY mode.
--- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 78 +++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +76 -2
@@ -45,16 +45,23 @@#define CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (offset, n) ((offset) + 0x4 * (n))#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B BIT(0)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn (offset, common_status_offset, n) \ ((offset) + (common_status_offset) + 0x4 * (n)) +#define CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (n) \ + (0x0100 + ((n) * 0x4)) +#define CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (n) \ + (0x0300 + ((n) * 0x4)) +#define CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (n) \ + (0x0500 + ((n) * 0x4)) +#define CSIPHY_DEFAULT_PARAMS 0#define CSIPHY_LANE_ENABLE 1#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3#define CSIPHY_DNP_PARAMS 4#define CSIPHY_2PH_REGS 5#define CSIPHY_3PH_REGS 6#define CSIPHY_SKEW_CAL 7
@@ -141,16 +148,17 @@ csiphy_lane_regs lane_regs_sa8775p[] = { {0x0460, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x065C, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 2PH */ +/* 5 entries: clock + 4 lanes */ static const struct csiphy_lane_regs lane_regs_sdm845[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014 ,0x60 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},
@@ -215,16 +223,82 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS}, {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, }; +/* GEN2 1.0 3PH */ +/* 3 entries: 3 lanes (C-PHY) */ +static const struct +csiphy_lane_regs lane_regs_sdm845_3ph[] = { + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + +}; +/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -1169,18 +1243,18 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,int i;switch (csiphy->camss->res->version) {case CAMSS_845 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_sdm845[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { - regs->lane_regs =NULL ; - regs->lane_array_size =0 ; + regs->lane_regs = &lane_regs_sdm845_3ph[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845_3ph); }break ;case CAMSS_2290 :case CAMSS_6150 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_qcm2290[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_qcm2290); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) {
Signature · 1 line
2.53.0
Re: [PATCH RESEND v9 6/9] media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 5 lines · David Heidelberg
Add a PHY configuration sequence for the sdm845 which uses a Qualcomm Gen 2 version 1.1 CSI-2 PHY.
The PHY can be configured as two phase or three phase in C-PHY or D-PHY mode.
too much or, according to my understand D-PHY use 2 phase, C-PHY use 3 phase?
The PHY can be configured as two phase (D-PHY) or three phase (C-PHY) ?
Frank
Quoted 162 lines
This configuration supports three-phase C-PHY mode.
Acked-by Cory Keitz <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 78 +++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +76
-3@@ -45,16 +45,23 @@#define CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (offset, n) ((offset) + 0x4 * (n))#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B BIT(0)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn (offset, common_status_offset, n) \ ((offset) + (common_status_offset) + 0x4 * (n)) +#define CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (n) \ + (0x0100 + ((n) * 0x4)) +#define CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (n) \ + (0x0300 + ((n) * 0x4)) +#define CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (n) \ + (0x0500 + ((n) * 0x4)) +#define CSIPHY_DEFAULT_PARAMS 0#define CSIPHY_LANE_ENABLE 1#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3#define CSIPHY_DNP_PARAMS 4#define CSIPHY_2PH_REGS 5#define CSIPHY_3PH_REGS 6#define CSIPHY_SKEW_CAL 7@@ -141,16 +148,17 @@ csiphy_lane_regs lane_regs_sa8775p[] = { {0x0460, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x065C, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 2PH */ +/* 5 entries: clock + 4 lanes */ static const struct csiphy_lane_regs lane_regs_sdm845[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014 ,0x60 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},@@ -215,16 +223,82 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS}, {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, }; +/* GEN2 1.0 3PH */ +/* 3 entries: 3 lanes (C-PHY) */ +static const struct +csiphy_lane_regs lane_regs_sdm845_3ph[] = { + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + +}; +/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -1169,18 +1243,18 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,int i;switch (csiphy->camss->res->version) {case CAMSS_845 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_sdm845[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { - regs->lane_regs =NULL ; - regs->lane_array_size =0 ; + regs->lane_regs = &lane_regs_sdm845_3ph[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845_3ph); }break ;case CAMSS_2290 :case CAMSS_6150 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_qcm2290[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_qcm2290); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { --2.53.0
Re: [PATCH RESEND v9 6/9] media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 11 lines · Frank Li
Quoted 5 lines · David Heidelberg
Add a PHY configuration sequence for the sdm845 which uses a Qualcomm Gen 2 version 1.1 CSI-2 PHY.
The PHY can be configured as two phase or three phase in C-PHY or D-PHY mode.
too much or, according to my understand D-PHY use 2 phase, C-PHY use 3 phase?
The PHY can be configured as two phase (D-PHY) or three phase (C-PHY) ?
Yes, I'll address the wrong wording in the next version then :)
Quoted 165 lines
Frank
Quoted 162 lines
This configuration supports three-phase C-PHY mode.
Acked-by Cory Keitz <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 78 +++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +76
-3@@ -45,16 +45,23 @@#define CSIPHY_3PH_CMN_CSI_COMMON_CTRLn (offset, n) ((offset) + 0x4 * (n))#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_COMMON_PWRDN_B BIT(0)#define CSIPHY_3PH_CMN_CSI_COMMON_CTRL6_SHOW_REV_ID BIT(1)#define CSIPHY_3PH_CMN_CSI_COMMON_STATUSn (offset, common_status_offset, n) \ ((offset) + (common_status_offset) + 0x4 * (n)) +#define CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (n) \ + (0x0100 + ((n) * 0x4)) +#define CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (n) \ + (0x0300 + ((n) * 0x4)) +#define CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (n) \ + (0x0500 + ((n) * 0x4)) +#define CSIPHY_DEFAULT_PARAMS 0#define CSIPHY_LANE_ENABLE 1#define CSIPHY_SETTLE_CNT_LOWER_BYTE 2#define CSIPHY_SETTLE_CNT_HIGHER_BYTE 3#define CSIPHY_DNP_PARAMS 4#define CSIPHY_2PH_REGS 5#define CSIPHY_3PH_REGS 6#define CSIPHY_SKEW_CAL 7@@ -141,16 +148,17 @@ csiphy_lane_regs lane_regs_sa8775p[] = { {0x0460, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0464, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x065C, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0xFD, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 2PH */ +/* 5 entries: clock + 4 lanes */ static const struct csiphy_lane_regs lane_regs_sdm845[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014 ,0x60 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0028, 0x00, 0x00, CSIPHY_DNP_PARAMS},@@ -215,16 +223,82 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0608, 0x00, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {0x060C, 0x00, 0x00, CSIPHY_DNP_PARAMS}, {0x0610, 0x52, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0638, 0xFE, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, }; +/* GEN2 1.0 3PH */ +/* 3 entries: 3 lanes (C-PHY) */ +static const struct +csiphy_lane_regs lane_regs_sdm845_3ph[] = { + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (8 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (9 ),0x7f ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (10 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (11 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (17 ),0x12 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (24 ),0x02 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (51 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (25 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR (55 ),0x51 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + +}; +/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034 ,0x0F ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x001C ,0x0A ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0014, 0x60, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -1169,18 +1243,18 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,int i;switch (csiphy->camss->res->version) {case CAMSS_845 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_sdm845[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { - regs->lane_regs =NULL ; - regs->lane_array_size =0 ; + regs->lane_regs = &lane_regs_sdm845_3ph[0 ]; + regs->lane_array_size =ARRAY_SIZE (lane_regs_sdm845_3ph); }break ;case CAMSS_2290 :case CAMSS_6150 :if (c->phy_cfg ==V4L2_MBUS_CSI2_DPHY ) { regs->lane_regs = &lane_regs_qcm2290[0 ]; regs->lane_array_size =ARRAY_SIZE (lane_regs_qcm2290); }else if (c->phy_cfg ==V4L2_MBUS_CSI2_CPHY ) { --2.53.0
Signature · 1 line
David Heidelberg
Bryan O'Donoghue
maintainerRe: [PATCH RESEND v9 6/9] media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 5 lines · David Heidelberg
Quoted 4 lines · Frank Li
Quoted 3 lines · David Heidelberg
Add a PHY configuration sequence for the sdm845 which uses a Qualcomm Gen 2 version 1.1 CSI-2 PHY.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
The PHY can be configured as two phase or three phase in C-PHY or D-PHY mode.
too much or, according to my understand D-PHY use 2 phase, C-PHY use 3 phase?
The PHY can be configured as two phase (D-PHY) or three phase (C-PHY) ?
Yes, I'll address the wrong wording in the next version then 🙂
Can you look at what's required to convert to the new driver ?
I think some Linux plumbing to represent cphy v dphy to the phy subsystem might be nice, plus differentiating inside of the new driver and camss with media-graph used to find the PHY.
---
bod
Re: [PATCH RESEND v9 6/9] media: qcom: camss: csiphy-3ph: Add Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 8 lines · Bryan O'Donoghue
Quoted 7 lines · David Heidelberg
Quoted 6 lines · Frank Li
Quoted 5 lines · David Heidelberg
Add a PHY configuration sequence for the sdm845 which uses a Qualcomm Gen 2 version 1.1 CSI-2 PHY.
The PHY can be configured as two phase or three phase in C-PHY or D-PHY mode.
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
too much or, according to my understand D-PHY use 2 phase, C-PHY use 3 phase?
The PHY can be configured as two phase (D-PHY) or three phase (C-PHY) ?
Yes, I'll address the wrong wording in the next version then 🙂
Can you look at what's required to convert to the new driver ?
Hello Bryan,
If someone is interested in sponsoring my work, I'd be happy to spend more time on C-PHY-related development. Otherwise, the best I can realistically do is address minor polish and nitpicks on this generally reviewed series.
I'm always happy to see improvements to existing kernel structures. However, if pursuing those improvements delays C-PHY adoption in Linux mobile phones, it works against my current goals.
Please let me know either way, so I know whether I should continue looking into the existing code.
Thanks,
David
Quoted 5 lines
I think some Linux plumbing to represent cphy v dphy to the phy subsystem might be nice, plus differentiating inside of the new driver and camss with media- graph used to find the PHY.
---
bod
Signature · 1 line
David Heidelberg
PATCH RESEND v9 7/9 media: qcom: camss: csiphy-3ph: Update Gen2 v1.1 MIPI CSI-2 C-PHY init
In reply to David HeidelbergThese values should improve C-PHY behaviour. Should match most recent Qualcomm code.
--- .../media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +9 -10
@@ -227,19 +227,19 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 3PH */ /* 3 entries: 3 lanes (C-PHY) */ static const struct csiphy_lane_regs lane_regs_sdm845_3ph[] = { - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x63 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xac ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0xa5 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -247,19 +247,19 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},
@@ -267,36 +267,35 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(9), 0x7f, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - };/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS},
Signature · 1 line
2.53.0
Re: [PATCH RESEND v9 7/9] media: qcom: camss: csiphy-3ph: Update Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 2 lines · David Heidelberg
These values should improve C-PHY behaviour. Should match most recent Qualcomm code.
Any reference? where recent Qualcomm code? do you know the real reason?
Frank
Quoted 102 lines
Acked-by Cory Keitz <[email protected]>Suggested-by Konrad Dybcio <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- .../media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +9
-11@@ -227,19 +227,19 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 3PH */ /* 3 entries: 3 lanes (C-PHY) */ static const struct csiphy_lane_regs lane_regs_sdm845_3ph[] = { - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x63 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xac ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0xa5 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -247,19 +247,19 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -267,36 +267,35 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(9), 0x7f, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - };/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS}, --2.53.0
Re: [PATCH RESEND v9 7/9] media: qcom: camss: csiphy-3ph: Update Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 5 lines · Frank Li
Quoted 2 lines · David Heidelberg
These values should improve C-PHY behaviour. Should match most recent Qualcomm code.
Any reference? where recent Qualcomm code? do you know the real reason?
That's a question for Konrad. This improvement was introduced in the upstreaming process, update taken from more recent sequence.
David>
Quoted 104 lines
Frank
Quoted 102 lines
Acked-by Cory Keitz <[email protected]>Suggested-by Konrad Dybcio <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- .../media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +9
-11@@ -227,19 +227,19 @@ csiphy_lane_regs lane_regs_sdm845[] = { {0x0660, 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {0x0664, 0x7F, 0x00, CSIPHY_DEFAULT_PARAMS}, };/* GEN2 1.0 3PH */ /* 3 entries: 3 lanes (C-PHY) */ static const struct csiphy_lane_regs lane_regs_sdm845_3ph[] = { - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x43 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xa0 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, - {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0x25 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (23 ),0x63 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (26 ),0xac ,0x00 ,CSIPHY_DEFAULT_PARAMS }, + {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (27 ),0xa5 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (1 ),0x06 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (3 ),0x12 ,0x00 ,CSIPHY_SETTLE_CNT_LOWER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (2 ),0x00 ,0x00 ,CSIPHY_SETTLE_CNT_HIGHER_BYTE }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (5 ),0x20 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (20 ),0x00 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (6 ),0x3e ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR (7 ),0x41 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -247,19 +247,19 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN1_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS},@@ -267,36 +267,35 @@ csiphy_lane_regs lane_regs_sdm845_3ph[] = { {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN3_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x43, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xa0, 0x00, CSIPHY_DEFAULT_PARAMS}, - {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0x25, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(23), 0x63, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(26), 0xac, 0x00, CSIPHY_DEFAULT_PARAMS}, + {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(27), 0xa5, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(1), 0x06, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(3), 0x12, 0x00, CSIPHY_SETTLE_CNT_LOWER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(2), 0x00, 0x00, CSIPHY_SETTLE_CNT_HIGHER_BYTE}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(5), 0x20, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(20), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(6), 0x3e, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(7), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(8), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(9), 0x7f, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(10), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(11), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(17), 0x12, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(24), 0x02, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(51), 0x41, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(25), 0x00, 0x00, CSIPHY_DEFAULT_PARAMS}, {CSIPHY_LN5_CSI_3PH_CTRLn_ADDR(55), 0x51, 0x00, CSIPHY_DEFAULT_PARAMS}, - };/* GEN2 1.1 2PH */ static const struct csiphy_lane_regs lane_regs_sc8280xp[] = { {0x0004 ,0x0C ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x002C ,0x01 ,0x00 ,CSIPHY_DEFAULT_PARAMS }, {0x0034, 0x0F, 0x00, CSIPHY_DEFAULT_PARAMS}, --2.53.0
Signature · 1 line
David Heidelberg
Re: [PATCH RESEND v9 7/9] media: qcom: camss: csiphy-3ph: Update Gen2 v1.1 MIPI CSI-2 C-PHY init
Quoted 8 lines · David Heidelberg
Quoted 5 lines · Frank Li
Quoted 2 lines · David Heidelberg
These values should improve C-PHY behaviour. Should match most recent Qualcomm code.
Any reference? where recent Qualcomm code? do you know the real reason?
That's a question for Konrad. This improvement was introduced in the upstreaming process, update taken from more recent sequence.
It matches the latest what we call "Hardware Settings Reference" set of values, and happens to be present in e.g. this tree:
also worth noting, 845 is csiphy v1.0, not 1.1
Konrad
PATCH RESEND v9 8/9 media: qcom: camss: Account for C-PHY when calculating link frequency
In reply to David HeidelbergEnsure that the link frequency divider correctly accounts for C-PHY operation. The divider differs between D-PHY and C-PHY, as described in the MIPI CSI-2 specification.
For more details, see:
https://docs.kernel.org/driver-api/media/tx-rx.html#pixel-rate
--- drivers/media/platform/qcom/camss/camss-csid.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 ++++-- drivers/media/platform/qcom/camss/camss.c | 15 +++++++++++++-- drivers/media/platform/qcom/camss/camss.h | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-)
drivers/media/platform/qcom/camss/camss-csid.c +4 -2
@@ -535,24 +535,26 @@ const struct csid_format_info *csid_get_fmt_entry(const struct csid_format_info/* * csid_set_clock_rates - Calculate and set clock rates on CSID module * @csiphy: CSID device */ static int csid_set_clock_rates (struct csid_device *csid) {struct device *dev = csid->camss->dev;const struct csid_format_info *fmt; +const bool cphy = (csid->phy.phy_sel ==CSID_PHY_SEL_CPHY ); +s64 link_freq;int i, j;int ret; fmt =csid_get_fmt_entry (csid->res->formats->formats, csid->res->formats->nformats, csid->fmt[MSM_CSIPHY_PAD_SINK ].code); - link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, - csid->phy.lane_cnt); + + link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, csid->phy.lane_cnt, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csid->nclocks; i++) {struct camss_clock *clock = &csid->clock[i]; if (!strcmp(clock->name, "csi0") || !strcmp(clock->name, "csi1") ||
drivers/media/platform/qcom/camss/camss-csiphy.c +4 -2
@@ -139,18 +139,19 @@ static int csiphy_set_clock_rates(struct csiphy_device *csiphy)struct device *dev = csiphy->camss->dev;s64 link_freq;int i, j;int ret;u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY ); - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csiphy->nclocks; i++) {struct camss_clock *clock = &csiphy->clock[i];if (csiphy->rate_set[i]) {u64 min_rate = link_freq /4 ;
@@ -265,19 +266,20 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on)static int csiphy_stream_on (struct csiphy_device *csiphy) {struct csiphy_config *cfg = &csiphy->cfg;s64 link_freq;u8 lane_mask = csiphy->res->hw_ops->get_lane_mask (&cfg->csi2->lane_cfg);u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY );u8 val; - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) {dev_err (csiphy->camss->dev,"Cannot get CSI2 transmitter's link frequency\n" );return -EINVAL ; }if (csiphy->base_clk_mux) {
drivers/media/platform/qcom/camss/camss.c +13 -2
@@ -27,16 +27,24 @@#include <media/v4l2-mc.h> #include <media/v4l2-fwnode.h> #include "camss.h" #define CAMSS_CLOCK_MARGIN_NUMERATOR 105#define CAMSS_CLOCK_MARGIN_DENOMINATOR 100 +/* +* C-PHY encodes data by 16/7 ~ 2.28 bits/symbol +* D-PHY doesn't encode data, thus 16/16 = 1 b/s +*/ +#define CAMSS_COMMON_PHY_DIVIDENT 16 +#define CAMSS_CPHY_DIVISOR 7 +#define CAMSS_DPHY_DIVISOR 16 +static const struct parent_dev_ops vfe_parent_dev_ops;static const struct camss_subdev_resources csiphy_res_8x16[] = {/* CSIPHY0 */ { .regulators = {}, .clock = {"top_ahb" ,"ispif_ahb" ,"ahb" ,"csiphy0_timer" }, .clock_rate = { {0 },
@@ -4619,29 +4627,32 @@ struct media_pad *camss_find_sensor_pad(struct media_entity *entity) } }/** * camss_get_link_freq - Get link frequency from sensor * @entity: Media entity in the current pipeline * @bpp: Number of bits per pixel for the current format * @lanes: Number of lanes in the link to the sensor +* @cphy: If C-PHY encoding is used. * * Return link frequency on success or a negative error code otherwise */ s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes) +unsigned int lanes,const bool cphy) {struct media_pad *sensor_pad; +unsigned int div = lanes *2 * (cphy ?CAMSS_CPHY_DIVISOR : +CAMSS_DPHY_DIVISOR ); sensor_pad =camss_find_sensor_pad (entity);if (!sensor_pad)return -ENODEV ; -return v4l2_get_link_freq (sensor_pad, bpp,2 * lanes); +return v4l2_get_link_freq (sensor_pad,CAMSS_COMMON_PHY_DIVIDENT * bpp, div); }/* * camss_get_pixel_clock - Get pixel clock rate from sensor * @entity: Media entity in the current pipeline * @pixel_clock: Received pixel clock value * * Return 0 on success or a negative error code otherwise
drivers/media/platform/qcom/camss/camss.h +1 -1
@@ -164,17 +164,17 @@ struct parent_dev_ops { };void camss_add_clock_margin (u64 *rate);int camss_enable_clocks (int nclocks,struct camss_clock *clock,struct device *dev);void camss_disable_clocks (int nclocks,struct camss_clock *clock);struct media_pad *camss_find_sensor_pad (struct media_entity *entity);s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes); +unsigned int lanes,const bool cphy);int camss_get_pixel_clock (struct media_entity *entity,u64 *pixel_clock);int camss_pm_domain_on (struct camss *camss,int id);void camss_pm_domain_off (struct camss *camss,int id);int camss_vfe_get (struct camss *camss,int id);void camss_vfe_put (struct camss *camss,int id);void camss_delete (struct camss *camss);void camss_buf_done (struct camss *camss,int hw_id,int port_id); void camss_reg_update(struct camss *camss, int hw_id,
Signature · 1 line
2.53.0
Re: [PATCH RESEND v9 8/9] media: qcom: camss: Account for C-PHY when calculating link frequency
Quoted 132 lines · David Heidelberg
Ensure that the link frequency divider correctly accounts for C-PHY operation. The divider differs between D-PHY and C-PHY, as described in the MIPI CSI-2 specification.
For more details, see:
https://docs.kernel.org/driver-api/media/tx-rx.html#pixel-rateSuggested-by Sakari Ailus <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- drivers/media/platform/qcom/camss/camss-csid.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 ++++-- drivers/media/platform/qcom/camss/camss.c | 15 +++++++++++++-- drivers/media/platform/qcom/camss/camss.h | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-)drivers/media/platform/qcom/camss/camss-csid.c +4
-2@@ -535,24 +535,26 @@ const struct csid_format_info *csid_get_fmt_entry(const struct csid_format_info/* * csid_set_clock_rates - Calculate and set clock rates on CSID module * @csiphy: CSID device */ static int csid_set_clock_rates (struct csid_device *csid) {struct device *dev = csid->camss->dev;const struct csid_format_info *fmt; +const bool cphy = (csid->phy.phy_sel ==CSID_PHY_SEL_CPHY ); +s64 link_freq;int i, j;int ret; fmt =csid_get_fmt_entry (csid->res->formats->formats, csid->res->formats->nformats, csid->fmt[MSM_CSIPHY_PAD_SINK ].code); - link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, - csid->phy.lane_cnt); + + link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, csid->phy.lane_cnt, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csid->nclocks; i++) {struct camss_clock *clock = &csid->clock[i]; if (!strcmp(clock->name, "csi0") || !strcmp(clock->name, "csi1") ||drivers/media/platform/qcom/camss/camss-csiphy.c +4
-2@@ -139,18 +139,19 @@ static int csiphy_set_clock_rates(struct csiphy_device *csiphy)struct device *dev = csiphy->camss->dev;s64 link_freq;int i, j;int ret;u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY ); - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csiphy->nclocks; i++) {struct camss_clock *clock = &csiphy->clock[i];if (csiphy->rate_set[i]) {u64 min_rate = link_freq /4 ;@@ -265,19 +266,20 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on)static int csiphy_stream_on (struct csiphy_device *csiphy) {struct csiphy_config *cfg = &csiphy->cfg;s64 link_freq;u8 lane_mask = csiphy->res->hw_ops->get_lane_mask (&cfg->csi2->lane_cfg);u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY );u8 val; - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) {dev_err (csiphy->camss->dev,"Cannot get CSI2 transmitter's link frequency\n" );return -EINVAL ; }if (csiphy->base_clk_mux) {drivers/media/platform/qcom/camss/camss.c +8
-0@@ -27,16 +27,24 @@#include <media/v4l2-mc.h> #include <media/v4l2-fwnode.h> #include "camss.h" #define CAMSS_CLOCK_MARGIN_NUMERATOR 105#define CAMSS_CLOCK_MARGIN_DENOMINATOR 100 +/* +* C-PHY encodes data by 16/7 ~ 2.28 bits/symbol +* D-PHY doesn't encode data, thus 16/16 = 1 b/s +*/ +#define CAMSS_COMMON_PHY_DIVIDENT 16 +#define CAMSS_CPHY_DIVISOR 7 +#define CAMSS_DPHY_DIVISOR 16 +static const struct parent_dev_ops vfe_parent_dev_ops;static const struct camss_subdev_resources csiphy_res_8x16[] = {/* CSIPHY0 */ { .regulators = {}, .clock = {"top_ahb" ,"ispif_ahb" ,"ahb" ,"csiphy0_timer" }, .clock_rate = { {0 },@@ -4619,29 +4627,32 @@ struct media_pad *camss_find_sensor_pad(struct media_entity *entity) } }/** * camss_get_link_freq - Get link frequency from sensor
drivers/media/platform/qcom/camss/camss.c struct media_pad *camss_find_sensor_pad(struct media_entity *entity) · line 4640
Quoted 10 lines
drivers/media/platform/qcom/camss/camss.c +2
-1* @entity: Media entity in the current pipeline * @bpp: Number of bits per pixel for the current format * @lanes: Number of lanes in the link to the sensor +* @cphy: If C-PHY encoding is used. * * Return link frequency on success or a negative error code otherwise */ s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes) +unsigned int lanes,const bool cphy)
you change this function argument, can you direct pass down csiphy instead entity
so move
const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg == V4L2_MBUS_CSI2_CPHY);
into this help function,
to avoid dupicate such logic everywhere.
Frank
Quoted 46 lines
drivers/media/platform/qcom/camss/camss.c +3
-1{struct media_pad *sensor_pad; +unsigned int div = lanes *2 * (cphy ?CAMSS_CPHY_DIVISOR : +CAMSS_DPHY_DIVISOR ); sensor_pad =camss_find_sensor_pad (entity);if (!sensor_pad)return -ENODEV ; -return v4l2_get_link_freq (sensor_pad, bpp,2 * lanes); +return v4l2_get_link_freq (sensor_pad,CAMSS_COMMON_PHY_DIVIDENT * bpp, div); }/* * camss_get_pixel_clock - Get pixel clock rate from sensor * @entity: Media entity in the current pipeline * @pixel_clock: Received pixel clock value * * Return 0 on success or a negative error code otherwise drivers/media/platform/qcom/camss/camss.h +1
-2@@ -164,17 +164,17 @@ struct parent_dev_ops { };void camss_add_clock_margin (u64 *rate);int camss_enable_clocks (int nclocks,struct camss_clock *clock,struct device *dev);void camss_disable_clocks (int nclocks,struct camss_clock *clock);struct media_pad *camss_find_sensor_pad (struct media_entity *entity);s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes); +unsigned int lanes,const bool cphy);int camss_get_pixel_clock (struct media_entity *entity,u64 *pixel_clock);int camss_pm_domain_on (struct camss *camss,int id);void camss_pm_domain_off (struct camss *camss,int id);int camss_vfe_get (struct camss *camss,int id);void camss_vfe_put (struct camss *camss,int id);void camss_delete (struct camss *camss);void camss_buf_done (struct camss *camss,int hw_id,int port_id); void camss_reg_update(struct camss *camss, int hw_id, --2.53.0
Re: [PATCH RESEND v9 8/9] media: qcom: camss: Account for C-PHY when calculating link frequency
Quoted 147 lines · Frank Li
Quoted 132 lines · David Heidelberg
Ensure that the link frequency divider correctly accounts for C-PHY operation. The divider differs between D-PHY and C-PHY, as described in the MIPI CSI-2 specification.
For more details, see:
https://docs.kernel.org/driver-api/media/tx-rx.html#pixel-rateSuggested-by Sakari Ailus <[email protected]>Signed-off-by David Heidelberg <[email protected]>--- drivers/media/platform/qcom/camss/camss-csid.c | 6 ++++-- drivers/media/platform/qcom/camss/camss-csiphy.c | 6 ++++-- drivers/media/platform/qcom/camss/camss.c | 15 +++++++++++++-- drivers/media/platform/qcom/camss/camss.h | 2 +- 4 files changed, 22 insertions(+), 7 deletions(-)drivers/media/platform/qcom/camss/camss-csid.c +4
-2@@ -535,24 +535,26 @@ const struct csid_format_info *csid_get_fmt_entry(const struct csid_format_info/* * csid_set_clock_rates - Calculate and set clock rates on CSID module * @csiphy: CSID device */ static int csid_set_clock_rates (struct csid_device *csid) {struct device *dev = csid->camss->dev;const struct csid_format_info *fmt; +const bool cphy = (csid->phy.phy_sel ==CSID_PHY_SEL_CPHY ); +s64 link_freq;int i, j;int ret; fmt =csid_get_fmt_entry (csid->res->formats->formats, csid->res->formats->nformats, csid->fmt[MSM_CSIPHY_PAD_SINK ].code); - link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, - csid->phy.lane_cnt); + + link_freq =camss_get_link_freq (&csid->subdev.entity, fmt->bpp, csid->phy.lane_cnt, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csid->nclocks; i++) {struct camss_clock *clock = &csid->clock[i]; if (!strcmp(clock->name, "csi0") || !strcmp(clock->name, "csi1") ||drivers/media/platform/qcom/camss/camss-csiphy.c +4
-2@@ -139,18 +139,19 @@ static int csiphy_set_clock_rates(struct csiphy_device *csiphy)struct device *dev = csiphy->camss->dev;s64 link_freq;int i, j;int ret;u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY ); - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) link_freq =0 ;for (i =0 ; i < csiphy->nclocks; i++) {struct camss_clock *clock = &csiphy->clock[i];if (csiphy->rate_set[i]) {u64 min_rate = link_freq /4 ;@@ -265,19 +266,20 @@ static int csiphy_set_power(struct v4l2_subdev *sd, int on)static int csiphy_stream_on (struct csiphy_device *csiphy) {struct csiphy_config *cfg = &csiphy->cfg;s64 link_freq;u8 lane_mask = csiphy->res->hw_ops->get_lane_mask (&cfg->csi2->lane_cfg);u8 bpp =csiphy_get_bpp (csiphy->res->formats->formats, csiphy->res->formats->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);u8 num_lanes = csiphy->cfg.csi2->lane_cfg.num_data; +const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg ==V4L2_MBUS_CSI2_CPHY );u8 val; - link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes); + link_freq =camss_get_link_freq (&csiphy->subdev.entity, bpp, num_lanes, cphy);if (link_freq <0 ) {dev_err (csiphy->camss->dev,"Cannot get CSI2 transmitter's link frequency\n" );return -EINVAL ; }if (csiphy->base_clk_mux) {drivers/media/platform/qcom/camss/camss.c +8
-0@@ -27,16 +27,24 @@#include <media/v4l2-mc.h> #include <media/v4l2-fwnode.h> #include "camss.h" #define CAMSS_CLOCK_MARGIN_NUMERATOR 105#define CAMSS_CLOCK_MARGIN_DENOMINATOR 100 +/* +* C-PHY encodes data by 16/7 ~ 2.28 bits/symbol +* D-PHY doesn't encode data, thus 16/16 = 1 b/s +*/ +#define CAMSS_COMMON_PHY_DIVIDENT 16 +#define CAMSS_CPHY_DIVISOR 7 +#define CAMSS_DPHY_DIVISOR 16 +static const struct parent_dev_ops vfe_parent_dev_ops;static const struct camss_subdev_resources csiphy_res_8x16[] = {/* CSIPHY0 */ { .regulators = {}, .clock = {"top_ahb" ,"ispif_ahb" ,"ahb" ,"csiphy0_timer" }, .clock_rate = { {0 },@@ -4619,29 +4627,32 @@ struct media_pad *camss_find_sensor_pad(struct media_entity *entity) } }/** * camss_get_link_freq - Get link frequency from sensor drivers/media/platform/qcom/camss/camss.c struct media_pad *camss_find_sensor_pad(struct media_entity *entity) · line 4640
Quoted 10 lines
drivers/media/platform/qcom/camss/camss.c +2
-1* @entity: Media entity in the current pipeline * @bpp: Number of bits per pixel for the current format * @lanes: Number of lanes in the link to the sensor +* @cphy: If C-PHY encoding is used. * * Return link frequency on success or a negative error code otherwise */ s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes) +unsigned int lanes,const bool cphy)you change this function argument, can you direct pass down csiphy instead entity
Quoted 6 lines
so move
const bool cphy = (csiphy->cfg.csi2->lane_cfg.phy_cfg==V4L2_MBUS_CSI2_CPHY);into this help function,
to avoid dupicate such logic everywhere.
I tried similar approach in previous revisions [1], but it ended poorly due to this structure not being initialized at the time when I need it what I recall, thus I ended up with the cphy param again :(
David
[1] https://lore.kernel.org/all/[email protected]/
Quoted 48 lines
Frank
Quoted 46 lines
drivers/media/platform/qcom/camss/camss.c +3
-1{struct media_pad *sensor_pad; +unsigned int div = lanes *2 * (cphy ?CAMSS_CPHY_DIVISOR : +CAMSS_DPHY_DIVISOR ); sensor_pad =camss_find_sensor_pad (entity);if (!sensor_pad)return -ENODEV ; -return v4l2_get_link_freq (sensor_pad, bpp,2 * lanes); +return v4l2_get_link_freq (sensor_pad,CAMSS_COMMON_PHY_DIVIDENT * bpp, div); }/* * camss_get_pixel_clock - Get pixel clock rate from sensor * @entity: Media entity in the current pipeline * @pixel_clock: Received pixel clock value * * Return 0 on success or a negative error code otherwise drivers/media/platform/qcom/camss/camss.h +1
-2@@ -164,17 +164,17 @@ struct parent_dev_ops { };void camss_add_clock_margin (u64 *rate);int camss_enable_clocks (int nclocks,struct camss_clock *clock,struct device *dev);void camss_disable_clocks (int nclocks,struct camss_clock *clock);struct media_pad *camss_find_sensor_pad (struct media_entity *entity);s64 camss_get_link_freq (struct media_entity *entity,unsigned int bpp, -unsigned int lanes); +unsigned int lanes,const bool cphy);int camss_get_pixel_clock (struct media_entity *entity,u64 *pixel_clock);int camss_pm_domain_on (struct camss *camss,int id);void camss_pm_domain_off (struct camss *camss,int id);int camss_vfe_get (struct camss *camss,int id);void camss_vfe_put (struct camss *camss,int id);void camss_delete (struct camss *camss);void camss_buf_done (struct camss *camss,int hw_id,int port_id); void camss_reg_update(struct camss *camss, int hw_id, --2.53.0
Signature · 1 line
David Heidelberg
PATCH RESEND v9 9/9 media: qcom: camss: Enable C-PHY where available
In reply to David HeidelbergAfter all the changes done we can now safely enable C-PHY for a SoC where it's available.
--- drivers/media/platform/qcom/camss/camss.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/media/platform/qcom/camss/camss.c +5 -5
@@ -4760,21 +4760,21 @@ static int camss_parse_endpoint_node(struct device *dev,struct v4l2_fwnode_endpoint vep = { {0 } };unsigned int i;int ret; ret =v4l2_fwnode_endpoint_parse (ep, &vep);if (ret)return ret; -/* -* Most SoCs support both D-PHY and C-PHY standards, but currently only -* D-PHY is supported in the driver. -*/ -if (vep.bus_type !=V4L2_MBUS_CSI2_DPHY ) { +switch (vep.bus_type) { +case V4L2_MBUS_CSI2_CPHY : +case V4L2_MBUS_CSI2_DPHY : +break ; +default :dev_err (dev,"Unsupported bus type %d\n" , vep.bus_type);return -EINVAL ; } csd->interface.csiphy_id = vep.base.port; mipi_csi2 = &vep.bus.mipi_csi2; lncfg->num_data = mipi_csi2->num_data_lanes;
Signature · 1 line
2.53.0