Add support for SDM630/660 Camera Subsystem
Subsystems (5)
v2 cover Add support for SDM630/660 Camera Subsystem
From: AngeloGioacchino Del Regno <[email protected]>
This patch series implements support for the entire camera subsystem found in SDM630/636/660 and SDA variants, including CSIPHY 3-Phase, CSID v5.0, ISPIF 3.0 (though it didn't need any adaptation) and VFE 4.8.
One small note about VFE4.8, even if I wrote it in the commit that adds support for it: I know, the VFE support here is split in multiple files having the name of the actual VFE version that it is targeting... but it didn't feel right to commonize the VFE 4.7 file and make another one only for VFE4.8, when it's just about something like 3 small differences.
That VFE 4.8 seems to be just a minor revision of VFE 4.7.
While at it, also fix a small issue when using two VFEs: only one of them was being resetted (always VFE0) so, after the first usage of VFE1, in case we leave it in a bad state, it would not properly start again. Now... it's fine :)))
P.S.: SDM630/660's camss seems to be *very* similar to MSM8998, so
likely 90% of this series should be reusable on that one, too!
Tested on:
- Sony Xperia XA2 (IMX300 on CSI0/PHY0/VFE0, IMX219 on CSI2,PHY2,VFE1)
* VFE0/1 RDI only, as the VIDEO one does not work with SRGGB Bayer formats yet. As far as I can see, that color format hasn't been implemented yet in the video interface.
Changes in v2:
- Splitted out VFE 4.7 functions rename from the VFE 4.8 support commit
- Moved a commit so that sequentially picking patches from this series still results in buildable code (heh, oops! sorry!)
- Fixed ispif reset commit (moved the fix for itfrom the wrong commit to the right one: that was a "funny" overlook).
AngeloGioacchino Del Regno (7):
media: camss: ispif: Correctly reset based on the VFE ID
media: camss: vfe-4-7: Rename get_ub_size, set_qos, set_ds, wm_enable
media: camss: vfe: Add support for VFE 4.8
media: camss: Add support for SDM630/636/660 camera subsystem
media: camss: csiphy-3ph: Add support for SDM630/660
media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss
media: camss: csiphy: Set rate on csiX_phy clock on SDM630/660
.../devicetree/bindings/media/qcom,camss.txt | 7 + .../media/platform/qcom/camss/camss-csid.c | 9 +- .../qcom/camss/camss-csiphy-3ph-1-0.c | 7 +- .../media/platform/qcom/camss/camss-csiphy.c | 25 ++- .../media/platform/qcom/camss/camss-csiphy.h | 1 + .../media/platform/qcom/camss/camss-ispif.c | 100 ++++++--- .../media/platform/qcom/camss/camss-ispif.h | 2 +- .../media/platform/qcom/camss/camss-vfe-4-7.c | 131 ++++++++++- drivers/media/platform/qcom/camss/camss-vfe.c | 19 +- drivers/media/platform/qcom/camss/camss-vfe.h | 1 + .../media/platform/qcom/camss/camss-video.c | 3 +- drivers/media/platform/qcom/camss/camss.c | 206 +++++++++++++++++- drivers/media/platform/qcom/camss/camss.h | 1 + 13 files changed, 450 insertions(+), 62 deletions(-)
Signature · 1 line
2.28.0
PATCH v2 1/7 media: camss: ispif: Correctly reset based on the VFE ID
From: AngeloGioacchino Del Regno <[email protected]>
Resetting the ISPIF VFE0 context is wrong if we are using the VFE1 for dual-camera or simply because a secondary camera is connected to it: in this case the reset will always happen on the VFE0 ctx of the ISPIF, which is .. useless.
Fix this usecase by adding the ISPIF_RST_CMD_1 address and choose where to do the (or what to) reset based on the VFE line id.
--- .../media/platform/qcom/camss/camss-ispif.c | 85 ++++++++++++------- .../media/platform/qcom/camss/camss-ispif.h | 2 +- 2 files changed, 56 insertions(+), 31 deletions(-)
drivers/media/platform/qcom/camss/camss-ispif.c +55 -30
@@ -26,6 +26,7 @@#define MSM_ISPIF_NAME "msm_ispif"#define ISPIF_RST_CMD_0 0x008 +#define ISPIF_RST_CMD_1 0x00c#define ISPIF_RST_CMD_0_STROBED_RST_EN (1 << 0)#define ISPIF_RST_CMD_0_MISC_LOGIC_RST (1 << 1)#define ISPIF_RST_CMD_0_SW_REG_RST (1 << 2)
@@ -179,7 +180,10 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)writel (0x1 , ispif->base +ISPIF_IRQ_GLOBAL_CLEAR_CMD );if ((value0 >>27 ) &0x1 ) -complete (&ispif->reset_complete); +complete (&ispif->reset_complete[0 ]); + +if ((value3 >>27 ) &0x1 ) +complete (&ispif->reset_complete[1 ]);if (unlikely (value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))dev_err_ratelimited (to_device (ispif),"VFE0 pix0 overflow\n" );
@@ -237,7 +241,7 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)writel (0x1 , ispif->base +ISPIF_IRQ_GLOBAL_CLEAR_CMD );if ((value0 >>27 ) &0x1 ) -complete (&ispif->reset_complete); +complete (&ispif->reset_complete[0 ]);if (unlikely (value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))dev_err_ratelimited (to_device (ispif),"VFE0 pix0 overflow\n" );
@@ -257,33 +261,18 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)return IRQ_HANDLED ; } -/* -* ispif_reset - Trigger reset on ISPIF module and wait to complete -* @ispif: ISPIF device -* -* Return 0 on success or a negative error code otherwise -*/ -static int ispif_reset (struct ispif_device *ispif) +static int ispif_vfe_reset (struct ispif_device *ispif,u8 vfe_id) {unsigned long time;u32 val; -int ret; - - ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE0 ); -if (ret <0 ) -return ret; - ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE1 ); -if (ret <0 ) -return ret; - - ret =camss_enable_clocks (ispif->nclocks_for_reset, - ispif->clock_for_reset, -to_device (ispif)); -if (ret <0 ) -return ret; +if (vfe_id > (to_camss (ispif)->vfe_num -1 )) { +dev_err (to_device (ispif), +"Error: asked reset for invalid VFE%d\n" , vfe_id); +return -ENOENT ; + } -reinit_completion (&ispif->reset_complete); +reinit_completion (&ispif->reset_complete[vfe_id]); val =ISPIF_RST_CMD_0_STROBED_RST_EN | ISPIF_RST_CMD_0_MISC_LOGIC_RST |
@@ -303,15 +292,50 @@ static int ispif_reset(struct ispif_device *ispif)ISPIF_RST_CMD_0_RDI_OUTPUT_1_MISR_RST |ISPIF_RST_CMD_0_RDI_OUTPUT_2_MISR_RST ; -writel_relaxed (val, ispif->base +ISPIF_RST_CMD_0 ); +if (vfe_id ==1 ) +writel_relaxed (val, ispif->base +ISPIF_RST_CMD_1 ); +else +writel_relaxed (val, ispif->base +ISPIF_RST_CMD_0 ); - time =wait_for_completion_timeout (&ispif->reset_complete, + time =wait_for_completion_timeout (&ispif->reset_complete[vfe_id],msecs_to_jiffies (ISPIF_RESET_TIMEOUT_MS ));if (!time) { -dev_err (to_device (ispif),"ISPIF reset timeout\n" ); - ret = -EIO ; +dev_err (to_device (ispif), +"ISPIF for VFE%d reset timeout\n" , vfe_id); +return -EIO ; } +return 0 ; +} + +/* +* ispif_reset - Trigger reset on ISPIF module and wait to complete +* @ispif: ISPIF device +* +* Return 0 on success or a negative error code otherwise +*/ +static int ispif_reset (struct ispif_device *ispif,u8 vfe_id) +{ +int ret; + + ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE0 ); +if (ret <0 ) +return ret; + + ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE1 ); +if (ret <0 ) +return ret; + + ret =camss_enable_clocks (ispif->nclocks_for_reset, + ispif->clock_for_reset, +to_device (ispif)); +if (ret <0 ) +return ret; + + ret =ispif_vfe_reset (ispif, vfe_id); +if (ret) +dev_dbg (to_device (ispif),"ISPIF Reset failed\n" ); +camss_disable_clocks (ispif->nclocks_for_reset, ispif->clock_for_reset);camss_pm_domain_off (to_camss (ispif),PM_DOMAIN_VFE0 );
@@ -355,7 +379,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on) goto exit; } - ret =ispif_reset (ispif); + ret =ispif_reset (ispif, line->vfe_id);if (ret <0 ) {pm_runtime_put_sync (dev);camss_disable_clocks (ispif->nclocks, ispif->clock);
@@ -1192,7 +1216,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,mutex_init (&ispif->config_lock); -init_completion (&ispif->reset_complete); +for (i =0 ; i <MSM_ISPIF_VFE_NUM ; i++) +init_completion (&ispif->reset_complete[i]);return 0 ; }
drivers/media/platform/qcom/camss/camss-ispif.h +1 -1
@@ -56,7 +56,7 @@ struct ispif_device {int nclocks;struct camss_clock *clock_for_reset;int nclocks_for_reset; -struct completion reset_complete; +struct completion reset_complete[MSM_ISPIF_VFE_NUM ];int power_count;struct mutex power_lock;struct ispif_intf_cmd_reg intf_cmd[MSM_ISPIF_VFE_NUM ];
Signature · 1 line
2.28.0
Vladimir Zapolskiy
reviewerRe: [PATCH v2 1/7] media: camss: ispif: Correctly reset based on the VFE ID
Quoted 75 lines · On 10/22/20 20:47, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Resetting the ISPIF VFE0 context is wrong if we are using the VFE1 for dual-camera or simply because a secondary camera is connected to it: in this case the reset will always happen on the VFE0 ctx of the ISPIF, which is .. useless.
Fix this usecase by adding the
ISPIF_RST_CMD_1address and choose where to do the (or what to) reset based on the VFE line id.Signed-off-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Robert Foss <[email protected]>--- .../media/platform/qcom/camss/camss-ispif.c | 85 ++++++++++++------- .../media/platform/qcom/camss/camss-ispif.h | 2 +- 2 files changed, 56 insertions(+), 31 deletions(-)drivers/media/platform/qcom/camss/camss-ispif.c +7
-18@@ -26,6 +26,7 @@#define MSM_ISPIF_NAME "msm_ispif"#define ISPIF_RST_CMD_0 0x008 +#define ISPIF_RST_CMD_1 0x00c#define ISPIF_RST_CMD_0_STROBED_RST_EN (1 << 0)#define ISPIF_RST_CMD_0_MISC_LOGIC_RST (1 << 1)#define ISPIF_RST_CMD_0_SW_REG_RST (1 << 2)@@ -179,7 +180,10 @@ static irqreturn_t ispif_isr_8x96(int irq, void *dev)writel (0x1 , ispif->base +ISPIF_IRQ_GLOBAL_CLEAR_CMD );if ((value0 >>27 ) &0x1 ) -complete (&ispif->reset_complete); +complete (&ispif->reset_complete[0 ]); + +if ((value3 >>27 ) &0x1 ) +complete (&ispif->reset_complete[1 ]);if (unlikely (value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))dev_err_ratelimited (to_device (ispif),"VFE0 pix0 overflow\n" );@@ -237,7 +241,7 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)writel (0x1 , ispif->base +ISPIF_IRQ_GLOBAL_CLEAR_CMD );if ((value0 >>27 ) &0x1 ) -complete (&ispif->reset_complete); +complete (&ispif->reset_complete[0 ]);if (unlikely (value0 & ISPIF_VFE_m_IRQ_STATUS_0_PIX0_OVERFLOW))dev_err_ratelimited (to_device (ispif),"VFE0 pix0 overflow\n" );@@ -257,33 +261,18 @@ static irqreturn_t ispif_isr_8x16(int irq, void *dev)return IRQ_HANDLED ; } -/* -* ispif_reset - Trigger reset on ISPIF module and wait to complete -* @ispif: ISPIF device -* -* Return 0 on success or a negative error code otherwise -*/ -static int ispif_reset (struct ispif_device *ispif) +static int ispif_vfe_reset (struct ispif_device *ispif,u8 vfe_id) {unsigned long time;u32 val; -int ret; - - ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE0 ); -if (ret <0 ) -return ret; - ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE1 ); -if (ret <0 ) -return ret; -
drivers/media/platform/qcom/camss/camss-ispif.c static irqreturn_t ispif_isr_8x16(int irq, void *dev) · line 273
Quoted 10 lines
drivers/media/platform/qcom/camss/camss-ispif.c +5
-5- ret =camss_enable_clocks (ispif->nclocks_for_reset, - ispif->clock_for_reset, -to_device (ispif)); -if (ret <0 ) -return ret; +if (vfe_id > (to_camss (ispif)->vfe_num -1 )) { +dev_err (to_device (ispif), +"Error: asked reset for invalid VFE%d\n" , vfe_id); +return -ENOENT ; + }
I was stumbled upon this "vfe_num" usage, which seems unnecessary...
Quoted 62 lines
drivers/media/platform/qcom/camss/camss-ispif.c +40
-5-reinit_completion (&ispif->reset_complete); +reinit_completion (&ispif->reset_complete[vfe_id]); val =ISPIF_RST_CMD_0_STROBED_RST_EN | ISPIF_RST_CMD_0_MISC_LOGIC_RST |@@ -303,15 +292,50 @@ static int ispif_reset(struct ispif_device *ispif)ISPIF_RST_CMD_0_RDI_OUTPUT_1_MISR_RST |ISPIF_RST_CMD_0_RDI_OUTPUT_2_MISR_RST ; -writel_relaxed (val, ispif->base +ISPIF_RST_CMD_0 ); +if (vfe_id ==1 ) +writel_relaxed (val, ispif->base +ISPIF_RST_CMD_1 ); +else +writel_relaxed (val, ispif->base +ISPIF_RST_CMD_0 ); - time =wait_for_completion_timeout (&ispif->reset_complete, + time =wait_for_completion_timeout (&ispif->reset_complete[vfe_id],msecs_to_jiffies (ISPIF_RESET_TIMEOUT_MS ));if (!time) { -dev_err (to_device (ispif),"ISPIF reset timeout\n" ); - ret = -EIO ; +dev_err (to_device (ispif), +"ISPIF for VFE%d reset timeout\n" , vfe_id); +return -EIO ; } +return 0 ; +} + +/* +* ispif_reset - Trigger reset on ISPIF module and wait to complete +* @ispif: ISPIF device +* +* Return 0 on success or a negative error code otherwise +*/ +static int ispif_reset (struct ispif_device *ispif,u8 vfe_id) +{ +int ret; + + ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE0 ); +if (ret <0 ) +return ret; + + ret =camss_pm_domain_on (to_camss (ispif),PM_DOMAIN_VFE1 ); +if (ret <0 ) +return ret; + + ret =camss_enable_clocks (ispif->nclocks_for_reset, + ispif->clock_for_reset, +to_device (ispif)); +if (ret <0 ) +return ret; + + ret =ispif_vfe_reset (ispif, vfe_id); +if (ret) +dev_dbg (to_device (ispif),"ISPIF Reset failed\n" ); +camss_disable_clocks (ispif->nclocks_for_reset, ispif->clock_for_reset);camss_pm_domain_off (to_camss (ispif),PM_DOMAIN_VFE0 );
drivers/media/platform/qcom/camss/camss-ispif.c static int ispif_set_power(struct v4l2_subdev *sd, int on) · line 382
Quoted 5 lines
drivers/media/platform/qcom/camss/camss-ispif.c +1
-1@@ -355,7 +379,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on) goto exit; } - ret =ispif_reset (ispif); + ret =ispif_reset (ispif, line->vfe_id);
But in fact here is an error.
line->vfe_id is never set.
I'm unable to test any fix, since I don't have a correspondent hardware, but I can write a fix for someone's testing.
--
Best wishes,
Vladimir
Re: [PATCH v2 1/7] media: camss: ispif: Correctly reset based on the VFE ID
Wow, a patchset from 2020.
Quoted 18 lines · Vladimir Zapolskiy
Quoted 17 lines · On 10/22/20 20:47, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Resetting the ISPIF VFE0 context is wrong if we are using the VFE1 for dual-camera or simply because a secondary camera is connected to it: in this case the reset will always happen on the VFE0 ctx of the ISPIF, which is .. useless.
Fix this usecase by adding the
ISPIF_RST_CMD_1address and choose where to do the (or what to) reset based on the VFE line id.Signed-off-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Robert Foss <[email protected]>---
.../media/platform/qcom/camss/camss-ispif.c | 85 ++++++++++++------- .../media/platform/qcom/camss/camss-ispif.h | 2 +-2 files changed, 56 insertions(+), 31 deletions(-)
[skipped]
Quoted 9 lines
drivers/media/platform/qcom/camss/camss-ispif.c static int ispif_set_power(struct v4l2_subdev *sd, · line 382
Quoted 6 lines
drivers/media/platform/qcom/camss/camss-ispif.c +1
-1@@ -355,7 +379,7 @@ static int ispif_set_power(struct v4l2_subdev *sd, int on) goto exit; } - ret = ispif_reset(ispif); + ret = ispif_reset(ispif, line->vfe_id);But in fact here is an error.
Quoted 4 lines
line->vfe_idis never set.I'm unable to test any fix, since I don't have a correspondent hardware, but I can write a fix for someone's testing.
I have a sda660 device, but I don't have cameras attached. So one will have to use TPG.
Signature · 2 lines
With best wishes Dmitry
PATCH v2 2/7 media: camss: vfe-4-7: Rename get_ub_size, set_qos, set_ds, wm_enable
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
In preparation to add support for VFE 4.8, rename these functions by adding the vfe version that they are referred to (for example, vfe_get_ub_size -> vfe47_get_ub_size), as these are the only ones that will be different for the VFE version 4.8.
--- .../media/platform/qcom/camss/camss-vfe-4-7.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +8 -8
@@ -246,7 +246,7 @@ static void vfe_hw_version_read(struct vfe_device *vfe, struct device *dev)dev_err (dev,"VFE HW Version = 0x%08x\n" , hw_version); } -static u16 vfe_get_ub_size (u8 vfe_id) +static u16 vfe47_get_ub_size (u8 vfe_id) {if (vfe_id ==0 )return MSM_VFE_VFE0_UB_SIZE_RDI ;
@@ -299,7 +299,7 @@ static void vfe_halt_clear(struct vfe_device *vfe)writel_relaxed (0x0 , vfe->base +VFE_0_BUS_BDG_CMD ); } -static void vfe_wm_enable (struct vfe_device *vfe,u8 wm,u8 enable) +static void vfe47_wm_enable (struct vfe_device *vfe,u8 wm,u8 enable) {if (enable) vfe_reg_set(vfe, VFE_0_BUS_IMAGE_MASTER_n_WR_CFG(wm),
@@ -883,7 +883,7 @@ static void vfe_set_clamp_cfg(struct vfe_device *vfe)writel_relaxed (val, vfe->base +VFE_0_CLAMP_ENC_MIN_CFG ); } -static void vfe_set_qos (struct vfe_device *vfe) +static void vfe47_set_qos (struct vfe_device *vfe) {u32 val =VFE_0_BUS_BDG_QOS_CFG_0_CFG ;u32 val7 =VFE_0_BUS_BDG_QOS_CFG_7_CFG ;
@@ -898,7 +898,7 @@ static void vfe_set_qos(struct vfe_device *vfe)writel_relaxed (val7, vfe->base +VFE_0_BUS_BDG_QOS_CFG_7 ); } -static void vfe_set_ds (struct vfe_device *vfe) +static void vfe47_set_ds (struct vfe_device *vfe) {u32 val =VFE_0_BUS_BDG_DS_CFG_0_CFG ;u32 val16 =VFE_0_BUS_BDG_DS_CFG_16_CFG ;
@@ -1098,11 +1098,11 @@ static irqreturn_t vfe_isr(int irq, void *dev)const struct vfe_hw_ops vfe_ops_4_7 = { .hw_version_read = vfe_hw_version_read, - .get_ub_size = vfe_get_ub_size, + .get_ub_size = vfe47_get_ub_size, .global_reset = vfe_global_reset, .halt_request = vfe_halt_request, .halt_clear = vfe_halt_clear, - .wm_enable = vfe_wm_enable, + .wm_enable = vfe47_wm_enable, .wm_frame_based = vfe_wm_frame_based, .wm_line_based = vfe_wm_line_based, .wm_set_framedrop_period = vfe_wm_set_framedrop_period,
@@ -1128,8 +1128,8 @@ const struct vfe_hw_ops vfe_ops_4_7 = { .set_scale_cfg = vfe_set_scale_cfg, .set_crop_cfg = vfe_set_crop_cfg, .set_clamp_cfg = vfe_set_clamp_cfg, - .set_qos = vfe_set_qos, - .set_ds = vfe_set_ds, + .set_qos = vfe47_set_qos, + .set_ds = vfe47_set_ds, .set_cgc_override = vfe_set_cgc_override, .set_camif_cfg = vfe_set_camif_cfg, .set_camif_cmd = vfe_set_camif_cmd,
Signature · 1 line
2.28.0
PATCH v2 3/7 media: camss: vfe: Add support for VFE 4.8
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
Add the support for VFE 4.8 in the camss-vfe-4-7 driver, as this one really is a minor revision, requiring the very same management and basically having the same register layout as VFE 4.7, but needing a different QoS and DS configuration, using a different register to enable the wm and habing the same UB size for both instances (instead of a different size between instance 0 and 1).
--- .../media/platform/qcom/camss/camss-vfe-4-7.c | 115 ++++++++++++++++++ drivers/media/platform/qcom/camss/camss-vfe.h | 1 + 2 files changed, 116 insertions(+)
drivers/media/platform/qcom/camss/camss-vfe-4-7.c +115 -0
@@ -133,6 +133,11 @@#define VFE_0_BUS_BDG_QOS_CFG_7 0x420#define VFE_0_BUS_BDG_QOS_CFG_7_CFG 0x0001aaa9 +#define VFE48_0_BUS_BDG_QOS_CFG_0_CFG 0xaaa5aaa5 +#define VFE48_0_BUS_BDG_QOS_CFG_3_CFG 0xaa55aaa5 +#define VFE48_0_BUS_BDG_QOS_CFG_4_CFG 0xaa55aa55 +#define VFE48_0_BUS_BDG_QOS_CFG_7_CFG 0x0005aa55 +#define VFE_0_BUS_BDG_DS_CFG_0 0x424#define VFE_0_BUS_BDG_DS_CFG_0_CFG 0xcccc0011#define VFE_0_BUS_BDG_DS_CFG_1 0x428
@@ -153,6 +158,9 @@#define VFE_0_BUS_BDG_DS_CFG_16 0x464#define VFE_0_BUS_BDG_DS_CFG_16_CFG 0x40000103 +#define VFE48_0_BUS_BDG_DS_CFG_0_CFG 0xcccc1111 +#define VFE48_0_BUS_BDG_DS_CFG_16_CFG 0x00000110 +#define VFE_0_RDI_CFG_x (x) (0x46c + (0x4 * (x)))#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_SHIFT 28#define VFE_0_RDI_CFG_x_RDI_STREAM_SEL_MASK (0xf << 28)
@@ -231,6 +239,9 @@#define VFE_0_REALIGN_BUF_CFG_CR_ODD_PIXEL BIT(3)#define VFE_0_REALIGN_BUF_CFG_HSUB_ENABLE BIT(4) +#define VFE48_0_BUS_IMAGE_MASTER_CMD 0xcec +#define VFE48_0_BUS_IMAGE_MASTER_n_SHIFT (x) (2 * (x)) +#define CAMIF_TIMEOUT_SLEEP_US 1000#define CAMIF_TIMEOUT_ALL_US 1000000
@@ -1139,3 +1150,107 @@ const struct vfe_hw_ops vfe_ops_4_7 = { .violation_read = vfe_violation_read, .isr = vfe_isr, }; + +static u16 vfe48_get_ub_size (u8 vfe_id) +{ +/* On VFE4.8 the ub-size is the same on both instances */ +return MSM_VFE_VFE0_UB_SIZE_RDI ; +} + +static void vfe48_wm_enable (struct vfe_device *vfe,u8 wm,u8 enable) +{ +if (enable) +writel_relaxed (2 <<VFE48_0_BUS_IMAGE_MASTER_n_SHIFT (wm), + vfe->base +VFE48_0_BUS_IMAGE_MASTER_CMD ); +else +writel_relaxed (1 <<VFE48_0_BUS_IMAGE_MASTER_n_SHIFT (wm), + vfe->base +VFE48_0_BUS_IMAGE_MASTER_CMD ); + +/* The WM must be enabled before sending other commands */ +wmb (); +} + +static void vfe48_set_qos (struct vfe_device *vfe) +{ +u32 val =VFE48_0_BUS_BDG_QOS_CFG_0_CFG ; +u32 val3 =VFE48_0_BUS_BDG_QOS_CFG_3_CFG ; +u32 val4 =VFE48_0_BUS_BDG_QOS_CFG_4_CFG ; +u32 val7 =VFE48_0_BUS_BDG_QOS_CFG_7_CFG ; + +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_QOS_CFG_0 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_QOS_CFG_1 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_QOS_CFG_2 ); +writel_relaxed (val3, vfe->base +VFE_0_BUS_BDG_QOS_CFG_3 ); +writel_relaxed (val4, vfe->base +VFE_0_BUS_BDG_QOS_CFG_4 ); +writel_relaxed (val4, vfe->base +VFE_0_BUS_BDG_QOS_CFG_5 ); +writel_relaxed (val4, vfe->base +VFE_0_BUS_BDG_QOS_CFG_6 ); +writel_relaxed (val7, vfe->base +VFE_0_BUS_BDG_QOS_CFG_7 ); +} + +static void vfe48_set_ds (struct vfe_device *vfe) +{ +u32 val =VFE48_0_BUS_BDG_DS_CFG_0_CFG ; +u32 val16 =VFE48_0_BUS_BDG_DS_CFG_16_CFG ; + +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_0 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_1 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_2 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_3 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_4 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_5 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_6 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_7 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_8 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_9 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_10 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_11 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_12 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_13 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_14 ); +writel_relaxed (val, vfe->base +VFE_0_BUS_BDG_DS_CFG_15 ); +writel_relaxed (val16, vfe->base +VFE_0_BUS_BDG_DS_CFG_16 ); +} + +const struct vfe_hw_ops vfe_ops_4_8 = { + .hw_version_read = vfe_hw_version_read, + .get_ub_size = vfe48_get_ub_size, + .global_reset = vfe_global_reset, + .halt_request = vfe_halt_request, + .halt_clear = vfe_halt_clear, + .wm_enable = vfe48_wm_enable, + .wm_frame_based = vfe_wm_frame_based, + .wm_line_based = vfe_wm_line_based, + .wm_set_framedrop_period = vfe_wm_set_framedrop_period, + .wm_set_framedrop_pattern = vfe_wm_set_framedrop_pattern, + .wm_set_ub_cfg = vfe_wm_set_ub_cfg, + .bus_reload_wm = vfe_bus_reload_wm, + .wm_set_ping_addr = vfe_wm_set_ping_addr, + .wm_set_pong_addr = vfe_wm_set_pong_addr, + .wm_get_ping_pong_status = vfe_wm_get_ping_pong_status, + .bus_enable_wr_if = vfe_bus_enable_wr_if, + .bus_connect_wm_to_rdi = vfe_bus_connect_wm_to_rdi, + .wm_set_subsample = vfe_wm_set_subsample, + .bus_disconnect_wm_from_rdi = vfe_bus_disconnect_wm_from_rdi, + .set_xbar_cfg = vfe_set_xbar_cfg, + .set_realign_cfg = vfe_set_realign_cfg, + .set_rdi_cid = vfe_set_rdi_cid, + .reg_update = vfe_reg_update, + .reg_update_clear = vfe_reg_update_clear, + .enable_irq_wm_line = vfe_enable_irq_wm_line, + .enable_irq_pix_line = vfe_enable_irq_pix_line, + .enable_irq_common = vfe_enable_irq_common, + .set_demux_cfg = vfe_set_demux_cfg, + .set_scale_cfg = vfe_set_scale_cfg, + .set_crop_cfg = vfe_set_crop_cfg, + .set_clamp_cfg = vfe_set_clamp_cfg, + .set_qos = vfe48_set_qos, + .set_ds = vfe48_set_ds, + .set_cgc_override = vfe_set_cgc_override, + .set_camif_cfg = vfe_set_camif_cfg, + .set_camif_cmd = vfe_set_camif_cmd, + .set_module_cfg = vfe_set_module_cfg, + .camif_wait_for_stop = vfe_camif_wait_for_stop, + .isr_read = vfe_isr_read, + .violation_read = vfe_violation_read, + .isr = vfe_isr, +};
drivers/media/platform/qcom/camss/camss-vfe.h +1 -0
@@ -180,5 +180,6 @@ void msm_vfe_get_vfe_line_id(struct media_entity *entity, enum vfe_line_id *id);extern const struct vfe_hw_ops vfe_ops_4_1;extern const struct vfe_hw_ops vfe_ops_4_7; +extern const struct vfe_hw_ops vfe_ops_4_8;#endif /* QC_MSM_CAMSS_VFE_H */
Signature · 1 line
2.28.0
PATCH v2 4/7 media: camss: Add support for SDM630/636/660 camera subsystem
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
Add support for the Qualcomm SDM630/636/660 and SDA variants' camera subsystem. These SoCs are equipped with:
- 3x CSI PHY 3-Phase v1.0 (downstream csiphy-v3.5)
- 4x CSID v5.0
- 2x ISPIF v3.0
- 2x VFE 4.8
As a note, this camera subsystem is very similar to the one that is found in the MSM8998/APQ8098 SoCs.
--- .../media/platform/qcom/camss/camss-csid.c | 9 +- .../media/platform/qcom/camss/camss-csiphy.c | 3 +- .../media/platform/qcom/camss/camss-ispif.c | 15 +- drivers/media/platform/qcom/camss/camss-vfe.c | 19 +- .../media/platform/qcom/camss/camss-video.c | 3 +- drivers/media/platform/qcom/camss/camss.c | 206 +++++++++++++++++- drivers/media/platform/qcom/camss/camss.h | 1 + 7 files changed, 237 insertions(+), 19 deletions(-)
drivers/media/platform/qcom/camss/camss-csid.c +6 -3
@@ -383,7 +383,8 @@ static u32 csid_src_pad_code(struct csid_device *csid, u32 sink_code,return 0 ;return sink_code; - }else if (csid->camss->version == CAMSS_8x96) { + }else if (csid->camss->version == CAMSS_8x96 || + csid->camss->version ==CAMSS_660 ) {switch (sink_code) {case MEDIA_BUS_FMT_SBGGR10_1X10 : {
@@ -718,7 +719,8 @@ static int csid_set_stream(struct v4l2_subdev *sd, int enable) val |= df << CAMSS_CSID_CID_n_CFG_DECODE_FORMAT_SHIFT; val |= CAMSS_CSID_CID_n_CFG_RDI_MODE_RAW_DUMP; -if (csid->camss->version == CAMSS_8x96) { +if (csid->camss->version == CAMSS_8x96 || + csid->camss->version ==CAMSS_660 ) {u32 sink_code = csid->fmt[MSM_CSID_PAD_SINK ].code;u32 src_code = csid->fmt[MSM_CSID_PAD_SRC ].code;
@@ -1098,7 +1100,8 @@ int msm_csid_subdev_init(struct camss *camss, struct csid_device *csid, csid->formats = csid_formats_8x16; csid->nformats =ARRAY_SIZE (csid_formats_8x16); - }else if (camss->version == CAMSS_8x96) { + }else if (camss->version == CAMSS_8x96 || + camss->version ==CAMSS_660 ) { csid->formats = csid_formats_8x96; csid->nformats =ARRAY_SIZE (csid_formats_8x96);
drivers/media/platform/qcom/camss/camss-csiphy.c +2 -1
@@ -552,7 +552,8 @@ int msm_csiphy_subdev_init(struct camss *camss, csiphy->ops = &csiphy_ops_2ph_1_0; csiphy->formats = csiphy_formats_8x16; csiphy->nformats =ARRAY_SIZE (csiphy_formats_8x16); - }else if (camss->version == CAMSS_8x96) { + }else if (camss->version == CAMSS_8x96 || + camss->version ==CAMSS_660 ) { csiphy->ops = &csiphy_ops_3ph_1_0; csiphy->formats = csiphy_formats_8x96; csiphy->nformats =ARRAY_SIZE (csiphy_formats_8x96);
drivers/media/platform/qcom/camss/camss-ispif.c +10 -5
@@ -825,7 +825,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)ispif_select_csid (ispif, intf, csid, vfe,1 );ispif_select_cid (ispif, intf, cid, vfe,1 );ispif_config_irq (ispif, intf, vfe,1 ); -if (to_camss (ispif)->version == CAMSS_8x96) +if (to_camss (ispif)->version == CAMSS_8x96 || +to_camss (ispif)->version ==CAMSS_660 )ispif_config_pack (ispif, line->fmt[MSM_ISPIF_PAD_SINK ].code, intf, cid, vfe,1 );
@@ -842,7 +843,8 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable)return ret;mutex_lock (&ispif->config_lock); -if (to_camss (ispif)->version == CAMSS_8x96) +if (to_camss (ispif)->version == CAMSS_8x96 || +to_camss (ispif)->version ==CAMSS_660 )ispif_config_pack (ispif, line->fmt[MSM_ISPIF_PAD_SINK ].code, intf, cid, vfe,0 );
@@ -1098,7 +1100,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,/* Number of ISPIF lines - same as number of CSID hardware modules */ if (to_camss (ispif)->version == CAMSS_8x16) ispif->line_num =2 ; -else if (to_camss (ispif)->version == CAMSS_8x96) +else if (to_camss (ispif)->version == CAMSS_8x96 || +to_camss (ispif)->version ==CAMSS_660 ) ispif->line_num =4 ;else return -EINVAL ;
@@ -1116,7 +1119,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif, ispif->line[i].formats = ispif_formats_8x16; ispif->line[i].nformats =ARRAY_SIZE (ispif_formats_8x16); - }else if (to_camss (ispif)->version == CAMSS_8x96) { + }else if (to_camss (ispif)->version == CAMSS_8x96 || +to_camss (ispif)->version ==CAMSS_660 ) { ispif->line[i].formats = ispif_formats_8x96; ispif->line[i].nformats =ARRAY_SIZE (ispif_formats_8x96);
@@ -1156,7 +1160,8 @@ int msm_ispif_subdev_init(struct ispif_device *ispif,if (to_camss (ispif)->version == CAMSS_8x16) ret =devm_request_irq (dev, ispif->irq, ispif_isr_8x16,IRQF_TRIGGER_RISING , ispif->irq_name, ispif); -else if (to_camss (ispif)->version == CAMSS_8x96) +else if (to_camss (ispif)->version == CAMSS_8x96 || +to_camss (ispif)->version ==CAMSS_660 ) ret =devm_request_irq (dev, ispif->irq, ispif_isr_8x96,IRQF_TRIGGER_RISING , ispif->irq_name, ispif);else
drivers/media/platform/qcom/camss/camss-vfe.c +14 -5
@@ -205,7 +205,8 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,return sink_code; } -else if (vfe->camss->version == CAMSS_8x96) +else if (vfe->camss->version == CAMSS_8x96 || + vfe->camss->version ==CAMSS_660 )switch (sink_code) {case MEDIA_BUS_FMT_YUYV8_2X8 : {
@@ -1991,12 +1992,19 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, vfe->isr_ops.comp_done = vfe_isr_comp_done; vfe->isr_ops.wm_done = vfe_isr_wm_done; -if (camss->version == CAMSS_8x16) +switch (camss->version) { +case CAMSS_8x16: vfe->ops = &vfe_ops_4_1; -else if (camss->version == CAMSS_8x96) +break ; +case CAMSS_8x96: vfe->ops = &vfe_ops_4_7; -else +break ; +case CAMSS_660 : + vfe->ops = &vfe_ops_4_8; +break ; +default :return -EINVAL ; + }/* Memory */
@@ -2095,7 +2103,8 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe, l->formats = formats_rdi_8x16; l->nformats =ARRAY_SIZE (formats_rdi_8x16); } - }else if (camss->version == CAMSS_8x96) { + }else if (camss->version == CAMSS_8x96 || + camss->version ==CAMSS_660 ) {if (i ==VFE_LINE_PIX ) { l->formats = formats_pix_8x96; l->nformats =ARRAY_SIZE (formats_pix_8x96);
drivers/media/platform/qcom/camss/camss-video.c +2 -1
@@ -970,7 +970,8 @@ int msm_video_register(struct camss_video *video, struct v4l2_device *v4l2_dev, video->formats = formats_rdi_8x16; video->nformats =ARRAY_SIZE (formats_rdi_8x16); } - }else if (video->camss->version == CAMSS_8x96) { + }else if (video->camss->version == CAMSS_8x96 || + video->camss->version ==CAMSS_660 ) {if (is_pix) { video->formats = formats_pix_8x96; video->nformats =ARRAY_SIZE (formats_pix_8x96);
drivers/media/platform/qcom/camss/camss.c +202 -4
254 lines not on this page · raw message
drivers/media/platform/qcom/camss/camss.h +1 -0
@@ -65,6 +65,7 @@ enum pm_domain {enum camss_version { CAMSS_8x16, CAMSS_8x96, +CAMSS_660 , };struct camss {
Signature · 1 line
2.28.0
PATCH v2 5/7 media: camss: csiphy-3ph: Add support for SDM630/660
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
The CSIPHY on SDM630/660 needs a slightly longer T_HS_CLK_MISS configuration on lanes CFG4.
--- drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c +6 -1
@@ -8,6 +8,7 @@* Copyright (C) 2016-2018 Linaro Ltd. */ +#include "camss.h" #include "camss-csiphy.h" #include <linux/delay.h>
@@ -21,6 +22,7 @@#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 +#define CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS_660 0xa5#define CSIPHY_3PH_LNn_CFG5 (n) (0x010 + 0x100 * (n))#define CSIPHY_3PH_LNn_CFG5_T_HS_DTERM 0x02#define CSIPHY_3PH_LNn_CFG5_HS_REC_EQ_FQ_INT 0x50
@@ -198,7 +200,10 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy, val = CSIPHY_3PH_LNn_CFG1_SWI_REC_DLY_PRG;writel_relaxed (val, csiphy->base +CSIPHY_3PH_LNn_CFG1 (l)); - val = CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS; +if (csiphy->camss->version ==CAMSS_660 ) + val = CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS_660; +else + val = CSIPHY_3PH_LNn_CFG4_T_HS_CLK_MISS;writel_relaxed (val, csiphy->base +CSIPHY_3PH_LNn_CFG4 (l)); val = CSIPHY_3PH_LNn_MISC1_IS_CLKLANE;
Signature · 1 line
2.28.0
PATCH v2 6/7 media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
Add bindings for qcom,sdm660-camss in order to support the camera subsystem on SDM630/660 and SDA variants.
--- Documentation/devicetree/bindings/media/qcom,camss.txt | 7 +++++++ 1 file changed, 7 insertions(+)
Documentation/devicetree/bindings/media/qcom,camss.txt +7 -0
@@ -8,6 +8,7 @@ Qualcomm Camera Subsystem Definition: Should contain one of: - "qcom,msm8916-camss" - "qcom,msm8996-camss" + - "qcom,sdm660-camss" - reg: Usage: required Value type: <prop-encoded-array>
@@ -64,30 +65,36 @@ Qualcomm Camera Subsystem Value type: <stringlist> Definition: Should contain the following entries: - "top_ahb" + - "throttle_axi" (660 only) - "ispif_ahb" - "csiphy0_timer" - "csiphy1_timer" - "csiphy2_timer" (8996 only) + - "csiphy_ahb2crif" (660 only) - "csi0_ahb" - "csi0" - "csi0_phy" - "csi0_pix" - "csi0_rdi" + - "cphy_csid0" (660 only) - "csi1_ahb" - "csi1" - "csi1_phy" - "csi1_pix" - "csi1_rdi" + - "cphy_csid1" (660 only) - "csi2_ahb" (8996 only) - "csi2" (8996 only) - "csi2_phy" (8996 only) - "csi2_pix" (8996 only) - "csi2_rdi" (8996 only) + - "cphy_csid2" (660 only) - "csi3_ahb" (8996 only) - "csi3" (8996 only) - "csi3_phy" (8996 only) - "csi3_pix" (8996 only) - "csi3_rdi" (8996 only) + - "cphy_csid3" (660 only) - "ahb" - "vfe0" - "csi_vfe0"
Signature · 1 line
2.28.0
Re: [PATCH v2 6/7] media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss
Quoted 11 lines · On Thu, 22 Oct 2020 19:47:05 +0200, [email protected] wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Add bindings for qcom,sdm660-camss in order to support the camera subsystem on SDM630/660 and SDA variants.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>Reviewed-by Robert Foss <[email protected]>--- Documentation/devicetree/bindings/media/qcom,camss.txt | 7 +++++++ 1 file changed, 7 insertions(+)
PATCH v2 7/7 media: camss: csiphy: Set rate on csiX_phy clock on SDM630/660
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
The SDM630/660 SoCs (and variants) have another clock source for the PHY, which must be set to a rate that's equal or greater than the CSI PHY timer clock: failing to do this will produce PHY overflows when trying to get a stream from a very high bandwidth camera sensor and outputting no frame or a partial one.
Since I haven't found any usecase in which the csiX_phy clock needs to be higher than the csiXphy_timer, let's just set the same rate on both, which seems to work just perfect.
--- .../media/platform/qcom/camss/camss-csiphy.c | 22 ++++++++++++++++--- .../media/platform/qcom/camss/camss-csiphy.h | 1 + 2 files changed, 20 insertions(+), 3 deletions(-)
drivers/media/platform/qcom/camss/camss-csiphy.c +19 -3
@@ -113,9 +113,7 @@ static int csiphy_set_clock_rates(struct csiphy_device *csiphy)for (i =0 ; i < csiphy->nclocks; i++) {struct camss_clock *clock = &csiphy->clock[i]; -if (!strcmp (clock->name,"csiphy0_timer" ) || - !strcmp (clock->name,"csiphy1_timer" ) || - !strcmp (clock->name,"csiphy2_timer" )) { +if (csiphy->rate_set[i]) {u8 bpp =csiphy_get_bpp (csiphy->formats, csiphy->nformats, csiphy->fmt[MSM_CSIPHY_PAD_SINK ].code);
@@ -611,6 +609,13 @@ int msm_csiphy_subdev_init(struct camss *camss,if (!csiphy->clock)return -ENOMEM ; + csiphy->rate_set =devm_kcalloc (dev, + csiphy->nclocks, +sizeof (*csiphy->rate_set), +GFP_KERNEL ); +if (!csiphy->rate_set) +return -ENOMEM ; +for (i =0 ; i < csiphy->nclocks; i++) {struct camss_clock *clock = &csiphy->clock[i];
@@ -638,6 +643,17 @@ int msm_csiphy_subdev_init(struct camss *camss,for (j =0 ; j < clock->nfreqs; j++) clock->freq[j] = res->clock_rate[i][j]; + +if (!strcmp (clock->name,"csiphy0_timer" ) || + !strcmp (clock->name,"csiphy1_timer" ) || + !strcmp (clock->name,"csiphy2_timer" )) + csiphy->rate_set[i] = true; + +if (camss->version ==CAMSS_660 && + (!strcmp (clock->name,"csi0_phy" ) || + !strcmp (clock->name,"csi1_phy" ) || + !strcmp (clock->name,"csi2_phy" ))) + csiphy->rate_set[i] = true; }return 0 ;
drivers/media/platform/qcom/camss/camss-csiphy.h +1 -0
@@ -66,6 +66,7 @@ struct csiphy_device {u32 irq;char irq_name[30 ];struct camss_clock *clock; +bool *rate_set;int nclocks;u32 timer_clk_rate;struct csiphy_config cfg;
Signature · 1 line
2.28.0
Hey Angelo,
I can't functionally test the code myself, but the series looks good to me now.
Quoted 64 lines · On Thu, 22 Oct 2020 at 19:47, <[email protected]> wrote:
From: AngeloGioacchino Del Regno <[email protected]>
This patch series implements support for the entire camera subsystem found in SDM630/636/660 and SDA variants, including CSIPHY 3-Phase, CSID v5.0, ISPIF 3.0 (though it didn't need any adaptation) and VFE 4.8.
One small note about VFE4.8, even if I wrote it in the commit that adds support for it: I know, the VFE support here is split in multiple files having the name of the actual VFE version that it is targeting... but it didn't feel right to commonize the VFE 4.7 file and make another one only for VFE4.8, when it's just about something like 3 small differences.
That VFE 4.8 seems to be just a minor revision of VFE 4.7.While at it, also fix a small issue when using two VFEs: only one of them was being resetted (always VFE0) so, after the first usage of VFE1, in case we leave it in a bad state, it would not properly start again. Now... it's fine :)))
P.S.: SDM630/660's camss seems to be *very* similar to MSM8998, so
likely 90% of this series should be reusable on that one, too!Tested on:
- Sony Xperia XA2 (IMX300 on CSI0/PHY0/VFE0, IMX219 on CSI2,PHY2,VFE1)
* VFE0/1 RDI only, as the VIDEO one does not work with SRGGB Bayer formats yet. As far as I can see, that color format hasn't been implemented yet in the video interface.Changes in v2:
- Splitted out VFE 4.7 functions rename from the VFE 4.8 support commit
- Moved a commit so that sequentially picking patches from this series still results in buildable code (heh, oops! sorry!)
- Fixed ispif reset commit (moved the fix for itfrom the wrong commit to the right one: that was a "funny" overlook).AngeloGioacchino Del Regno (7):
media: camss: ispif: Correctly reset based on the VFE ID
media: camss: vfe-4-7: Renameget_ub_size,set_qos,set_ds,wm_enable
media: camss: vfe: Add support for VFE 4.8
media: camss: Add support for SDM630/636/660 camera subsystem
media: camss: csiphy-3ph: Add support for SDM630/660
media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss
media: camss: csiphy: Set rate oncsiX_phyclock on SDM630/660.../devicetree/bindings/media/qcom,camss.txt | 7 + .../media/platform/qcom/camss/camss-csid.c | 9 +- .../qcom/camss/camss-csiphy-3ph-1-0.c | 7 +- .../media/platform/qcom/camss/camss-csiphy.c | 25 ++- .../media/platform/qcom/camss/camss-csiphy.h | 1 + .../media/platform/qcom/camss/camss-ispif.c | 100 ++++++--- .../media/platform/qcom/camss/camss-ispif.h | 2 +- .../media/platform/qcom/camss/camss-vfe-4-7.c | 131 ++++++++++- drivers/media/platform/qcom/camss/camss-vfe.c | 19 +- drivers/media/platform/qcom/camss/camss-vfe.h | 1 + .../media/platform/qcom/camss/camss-video.c | 3 +- drivers/media/platform/qcom/camss/camss.c | 206 +++++++++++++++++- drivers/media/platform/qcom/camss/camss.h | 1 + 13 files changed, 450 insertions(+), 62 deletions(-)--
2.28.0
This series was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This series was applied to qcom/linux.git (refs/heads/for-next):
Quoted 8 lines · On Thu, 22 Oct 2020 19:46:59 +0200 you wrote:
From: AngeloGioacchino Del Regno <[email protected]>
This patch series implements support for the entire camera subsystem found in SDM630/636/660 and SDA variants, including CSIPHY 3-Phase, CSID v5.0, ISPIF 3.0 (though it didn't need any adaptation) and VFE 4.8.
[...]
Here is the summary with links:
- [v2,1/7] media: camss: ispif: Correctly reset based on the VFE ID
https://git.kernel.org/qcom/c/864ed874d74a - [v2,2/7] media: camss: vfe-4-7: Rename get_ub_size, set_qos, set_ds, wm_enable https://git.kernel.org/qcom/c/1786653aa2e3 - [v2,3/7] media: camss: vfe: Add support for VFE 4.8 https://git.kernel.org/qcom/c/40296e712cad - [v2,4/7] media: camss: Add support for SDM630/636/660 camera subsystem https://git.kernel.org/qcom/c/9e5d158189c6 - [v2,5/7] media: camss: csiphy-3ph: Add support for SDM630/660 https://git.kernel.org/qcom/c/e486781b74cc - [v2,6/7] media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss https://git.kernel.org/qcom/c/3cba9d22c358 - [v2,7/7] media: camss: csiphy: Set rate on csiX_phy clock on SDM630/660 https://git.kernel.org/qcom/c/4863b93cfd2d
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html