Re: [PATCH v7 3/5] media: qcom: camss: Add support for camss driver on sc7280

From: Luca Weiss
Date: Fri Dec 06 2024 - 02:51:35 EST

Next message: Luca Weiss: "Re: [PATCH v7 4/5] arm64: dts: qcom: sc7280: Add support for camss"
Previous message: Dan Williams: "Re: [RFC PATCH] resource: Fix CXL node not populated issue"
In reply to: Vikram Sharma: "[PATCH v7 3/5] media: qcom: camss: Add support for camss driver on sc7280"
Next in thread: Vikram Sharma: "Re: [PATCH v7 3/5] media: qcom: camss: Add support for camss driver on sc7280"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Wed Dec 4, 2024 at 11:00 AM CET, Vikram Sharma wrote:
> From: Suresh Vankadara <quic_svankada@xxxxxxxxxxx>
>
> Add support for the camss driver on the sc7280 soc.
>
> Signed-off-by: Suresh Vankadara <quic_svankada@xxxxxxxxxxx>
> Signed-off-by: Trishansh Bhardwaj <quic_tbhardwa@xxxxxxxxxxx>
> Signed-off-by: Vikram Sharma <quic_vikramsa@xxxxxxxxxxx>
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>

Hi Vikram,

This is working on QCM6490 Fairphone 5 smartphone with WIP drivers for
IMX858 and S5KJN1, thanks!

Tested-by: Luca Weiss <luca.weiss@xxxxxxxxxxxxx> # qcm6490-fairphone-fp5

Regards
Luca

> ---
> .../qcom/camss/camss-csiphy-3ph-1-0.c | 5 +
> .../media/platform/qcom/camss/camss-csiphy.c | 5 +
> .../media/platform/qcom/camss/camss-csiphy.h | 1 +
> drivers/media/platform/qcom/camss/camss-vfe.c | 2 +
> drivers/media/platform/qcom/camss/camss.c | 319 ++++++++++++++++++
> drivers/media/platform/qcom/camss/camss.h | 1 +
> 6 files changed, 333 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> index 7d2490c9de01..f341f7b7fd8a 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
> @@ -505,6 +505,10 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
> u32 val;
>
> switch (csiphy->camss->res->version) {
> + case CAMSS_7280:
> + r = &lane_regs_sm8250[0][0];
> + array_size = ARRAY_SIZE(lane_regs_sm8250[0]);
> + break;
> case CAMSS_8250:
> r = &lane_regs_sm8250[0][0];
> array_size = ARRAY_SIZE(lane_regs_sm8250[0]);
> @@ -557,6 +561,7 @@ static bool csiphy_is_gen2(u32 version)
> bool ret = false;
>
> switch (version) {
> + case CAMSS_7280:
> case CAMSS_8250:
> case CAMSS_8280XP:
> case CAMSS_845:
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
> index 5af2b382a843..3791c2d8a6cf 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
> @@ -103,6 +103,11 @@ const struct csiphy_formats csiphy_formats_8x96 = {
> .formats = formats_8x96
> };
>
> +const struct csiphy_formats csiphy_formats_sc7280 = {
> + .nformats = ARRAY_SIZE(formats_sdm845),
> + .formats = formats_sdm845
> +};
> +
> const struct csiphy_formats csiphy_formats_sdm845 = {
> .nformats = ARRAY_SIZE(formats_sdm845),
> .formats = formats_sdm845
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
> index eebc1ff1cfab..b6209bddfb61 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.h
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
> @@ -111,6 +111,7 @@ void msm_csiphy_unregister_entity(struct csiphy_device *csiphy);
>
> extern const struct csiphy_formats csiphy_formats_8x16;
> extern const struct csiphy_formats csiphy_formats_8x96;
> +extern const struct csiphy_formats csiphy_formats_sc7280;
> extern const struct csiphy_formats csiphy_formats_sdm845;
>
> extern const struct csiphy_hw_ops csiphy_ops_2ph_1_0;
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index fb3234c65403..95f6a1ac7eaf 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -335,6 +335,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
> }
> break;
> case CAMSS_660:
> + case CAMSS_7280:
> case CAMSS_8x96:
> case CAMSS_8250:
> case CAMSS_8280XP:
> @@ -1693,6 +1694,7 @@ static int vfe_bpl_align(struct vfe_device *vfe)
> int ret = 8;
>
> switch (vfe->camss->res->version) {
> + case CAMSS_7280:
> case CAMSS_8250:
> case CAMSS_8280XP:
> case CAMSS_845:
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index f5704c23766a..4fa16ff6e614 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -1266,6 +1266,310 @@ static const struct resources_icc icc_res_sm8250[] = {
> },
> };
>
> +static const struct camss_subdev_resources csiphy_res_7280[] = {
> + /* CSIPHY0 */
> + {
> + .regulators = { "vdda-phy", "vdda-pll" },
> +
> + .clock = { "csiphy0", "csiphy0_timer" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy0" },
> + .interrupt = { "csiphy0" },
> + .csiphy = {
> + .hw_ops = &csiphy_ops_3ph_1_0,
> + .formats = &csiphy_formats_sc7280
> + }
> + },
> + /* CSIPHY1 */
> + {
> + .regulators = { "vdda-phy", "vdda-pll" },
> +
> + .clock = { "csiphy1", "csiphy1_timer" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy1" },
> + .interrupt = { "csiphy1" },
> + .csiphy = {
> + .hw_ops = &csiphy_ops_3ph_1_0,
> + .formats = &csiphy_formats_sc7280
> + }
> + },
> + /* CSIPHY2 */
> + {
> + .regulators = { "vdda-phy", "vdda-pll" },
> +
> + .clock = { "csiphy2", "csiphy2_timer" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy2" },
> + .interrupt = { "csiphy2" },
> + .csiphy = {
> + .hw_ops = &csiphy_ops_3ph_1_0,
> + .formats = &csiphy_formats_sc7280
> + }
> + },
> + /* CSIPHY3 */
> + {
> + .regulators = { "vdda-phy", "vdda-pll" },
> +
> + .clock = { "csiphy3", "csiphy3_timer" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy3" },
> + .interrupt = { "csiphy3" },
> + .csiphy = {
> + .hw_ops = &csiphy_ops_3ph_1_0,
> + .formats = &csiphy_formats_sc7280
> + }
> + },
> + /* CSIPHY4 */
> + {
> + .regulators = { "vdda-phy", "vdda-pll" },
> +
> + .clock = { "csiphy4", "csiphy4_timer" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 300000000 } },
> + .reg = { "csiphy4" },
> + .interrupt = { "csiphy4" },
> + .csiphy = {
> + .hw_ops = &csiphy_ops_3ph_1_0,
> + .formats = &csiphy_formats_sc7280
> + }
> + },
> +};
> +
> +static const struct camss_subdev_resources csid_res_7280[] = {
> + /* CSID0 */
> + {
> + .regulators = {},
> +
> + .clock = { "vfe0_csid", "vfe0_cphy_rx", "vfe0" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 }
> + },
> +
> + .reg = { "csid0" },
> + .interrupt = { "csid0" },
> + .csid = {
> + .is_lite = false,
> + .hw_ops = &csid_ops_gen2,
> + .parent_dev_ops = &vfe_parent_dev_ops,
> + .formats = &csid_formats_gen2
> + }
> + },
> + /* CSID1 */
> + {
> + .regulators = {},
> +
> + .clock = { "vfe1_csid", "vfe1_cphy_rx", "vfe1" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 }
> + },
> +
> + .reg = { "csid1" },
> + .interrupt = { "csid1" },
> + .csid = {
> + .is_lite = false,
> + .hw_ops = &csid_ops_gen2,
> + .parent_dev_ops = &vfe_parent_dev_ops,
> + .formats = &csid_formats_gen2
> + }
> + },
> + /* CSID2 */
> + {
> + .regulators = {},
> +
> + .clock = { "vfe2_csid", "vfe2_cphy_rx", "vfe2" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 }
> + },
> +
> + .reg = { "csid2" },
> + .interrupt = { "csid2" },
> + .csid = {
> + .is_lite = false,
> + .hw_ops = &csid_ops_gen2,
> + .parent_dev_ops = &vfe_parent_dev_ops,
> + .formats = &csid_formats_gen2
> + }
> + },
> + /* CSID3 */
> + {
> + .regulators = {},
> +
> + .clock = { "vfe_lite0_csid", "vfe_lite0_cphy_rx", "vfe_lite0" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 0 },
> + { 320000000, 400000000, 480000000, 600000000 }
> + },
> +
> + .reg = { "csid_lite0" },
> + .interrupt = { "csid_lite0" },
> + .csid = {
> + .is_lite = true,
> + .hw_ops = &csid_ops_gen2,
> + .parent_dev_ops = &vfe_parent_dev_ops,
> + .formats = &csid_formats_gen2
> + }
> + },
> + /* CSID4 */
> + {
> + .regulators = {},
> +
> + .clock = { "vfe_lite1_csid", "vfe_lite1_cphy_rx", "vfe_lite1" },
> + .clock_rate = { { 300000000, 400000000 },
> + { 0 },
> + { 320000000, 400000000, 480000000, 600000000 }
> + },
> +
> + .reg = { "csid_lite1" },
> + .interrupt = { "csid_lite1" },
> + .csid = {
> + .is_lite = true,
> + .hw_ops = &csid_ops_gen2,
> + .parent_dev_ops = &vfe_parent_dev_ops,
> + .formats = &csid_formats_gen2
> + }
> + },
> +};
> +
> +static const struct camss_subdev_resources vfe_res_7280[] = {
> + /* VFE0 */
> + {
> + .regulators = {},
> +
> + .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe0",
> + "vfe0_axi", "gcc_cam_hf_axi" },
> + .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> + { 80000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 },
> + { 0 },
> + { 0 } },
> +
> + .reg = { "vfe0" },
> + .interrupt = { "vfe0" },
> + .vfe = {
> + .line_num = 3,
> + .is_lite = false,
> + .has_pd = true,
> + .pd_name = "ife0",
> + .hw_ops = &vfe_ops_170,
> + .formats_rdi = &vfe_formats_rdi_845,
> + .formats_pix = &vfe_formats_pix_845
> + }
> + },
> + /* VFE1 */
> + {
> + .regulators = {},
> +
> + .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe1",
> + "vfe1_axi", "gcc_cam_hf_axi" },
> + .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> + { 80000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 },
> + { 0 },
> + { 0 } },
> +
> + .reg = { "vfe1" },
> + .interrupt = { "vfe1" },
> + .vfe = {
> + .line_num = 3,
> + .is_lite = false,
> + .has_pd = true,
> + .pd_name = "ife1",
> + .hw_ops = &vfe_ops_170,
> + .formats_rdi = &vfe_formats_rdi_845,
> + .formats_pix = &vfe_formats_pix_845
> + }
> + },
> + /* VFE2 */
> + {
> + .regulators = {},
> +
> + .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb", "vfe2",
> + "vfe2_axi", "gcc_cam_hf_axi" },
> + .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> + { 80000000 },
> + { 0 },
> + { 380000000, 510000000, 637000000, 760000000 },
> + { 0 },
> + { 0 } },
> +
> + .reg = { "vfe2" },
> + .interrupt = { "vfe2" },
> + .vfe = {
> + .line_num = 3,
> + .is_lite = false,
> + .hw_ops = &vfe_ops_170,
> + .has_pd = true,
> + .pd_name = "ife2",
> + .formats_rdi = &vfe_formats_rdi_845,
> + .formats_pix = &vfe_formats_pix_845
> + }
> + },
> + /* VFE3 (lite) */
> + {
> + .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
> + "vfe_lite0", "gcc_cam_hf_axi" },
> + .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> + { 80000000 },
> + { 0 },
> + { 320000000, 400000000, 480000000, 600000000 },
> + { 0 } },
> +
> + .regulators = {},
> + .reg = { "vfe_lite0" },
> + .interrupt = { "vfe_lite0" },
> + .vfe = {
> + .line_num = 4,
> + .is_lite = true,
> + .hw_ops = &vfe_ops_170,
> + .formats_rdi = &vfe_formats_rdi_845,
> + .formats_pix = &vfe_formats_pix_845
> + }
> + },
> + /* VFE4 (lite) */
> + {
> + .clock = { "camnoc_axi", "cpas_ahb", "icp_ahb",
> + "vfe_lite1", "gcc_cam_hf_axi" },
> + .clock_rate = { { 150000000, 240000000, 320000000, 400000000, 480000000 },
> + { 80000000 },
> + { 0 },
> + { 320000000, 400000000, 480000000, 600000000 },
> + { 0 } },
> +
> + .regulators = {},
> + .reg = { "vfe_lite1" },
> + .interrupt = { "vfe_lite1" },
> + .vfe = {
> + .line_num = 4,
> + .is_lite = true,
> + .hw_ops = &vfe_ops_170,
> + .formats_rdi = &vfe_formats_rdi_845,
> + .formats_pix = &vfe_formats_pix_845
> + }
> + },
> +};
> +
> +static const struct resources_icc icc_res_sc7280[] = {
> + {
> + .name = "ahb",
> + .icc_bw_tbl.avg = 38400,
> + .icc_bw_tbl.peak = 76800,
> + },
> + {
> + .name = "hf_0",
> + .icc_bw_tbl.avg = 2097152,
> + .icc_bw_tbl.peak = 2097152,
> + },
> +};
> +
> static const struct camss_subdev_resources csiphy_res_sc8280xp[] = {
> /* CSIPHY0 */
> {
> @@ -2622,10 +2926,25 @@ static const struct camss_resources sc8280xp_resources = {
> .link_entities = camss_link_entities
> };
>
> +static const struct camss_resources sc7280_resources = {
> + .version = CAMSS_7280,
> + .pd_name = "top",
> + .csiphy_res = csiphy_res_7280,
> + .csid_res = csid_res_7280,
> + .vfe_res = vfe_res_7280,
> + .icc_res = icc_res_sc7280,
> + .icc_path_num = ARRAY_SIZE(icc_res_sc7280),
> + .csiphy_num = ARRAY_SIZE(csiphy_res_7280),
> + .csid_num = ARRAY_SIZE(csid_res_7280),
> + .vfe_num = ARRAY_SIZE(vfe_res_7280),
> + .link_entities = camss_link_entities
> +};
> +
> static const struct of_device_id camss_dt_match[] = {
> { .compatible = "qcom,msm8916-camss", .data = &msm8916_resources },
> { .compatible = "qcom,msm8953-camss", .data = &msm8953_resources },
> { .compatible = "qcom,msm8996-camss", .data = &msm8996_resources },
> + { .compatible = "qcom,sc7280-camss", .data = &sc7280_resources },
> { .compatible = "qcom,sc8280xp-camss", .data = &sc8280xp_resources },
> { .compatible = "qcom,sdm660-camss", .data = &sdm660_resources },
> { .compatible = "qcom,sdm845-camss", .data = &sdm845_resources },
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index ffce0a0edbc5..9a046eea334f 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -78,6 +78,7 @@ enum pm_domain {
>
> enum camss_version {
> CAMSS_660,
> + CAMSS_7280,
> CAMSS_8x16,
> CAMSS_8x53,
> CAMSS_8x96,

Next message: Luca Weiss: "Re: [PATCH v7 4/5] arm64: dts: qcom: sc7280: Add support for camss"
Previous message: Dan Williams: "Re: [RFC PATCH] resource: Fix CXL node not populated issue"
In reply to: Vikram Sharma: "[PATCH v7 3/5] media: qcom: camss: Add support for camss driver on sc7280"
Next in thread: Vikram Sharma: "Re: [PATCH v7 3/5] media: qcom: camss: Add support for camss driver on sc7280"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]