| Message ID | 20241103-camss-msm8953-v4-3-48d0ec75958d@mainlining.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add MSM8953 camss support | expand |
On 11/3/24 11:45, Barnabás Czémán wrote: > From: Vladimir Lypak <vladimir.lypak@gmail.com> > > This commit describes the hardware layout for the MSM8953 > for the following hardware blocks: > > - 2 x VFE, 3 RDI per VFE > - 3 x CSID > - 3 x CSI PHY > > Signed-off-by: Vladimir Lypak <vladimir.lypak@gmail.com> > Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org> > --- > drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + > drivers/media/platform/qcom/camss/camss-ispif.c | 5 + > drivers/media/platform/qcom/camss/camss-vfe.c | 1 + > drivers/media/platform/qcom/camss/camss.c | 170 +++++++++++++++++++++++ > drivers/media/platform/qcom/camss/camss.h | 1 + > 5 files changed, 178 insertions(+) > > diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c > index 68a3ea1ba2a5299cf28289dfdb958cfdff3c91e0..5af2b382a843c2b8857339ba28930fe1682c9412 100644 > --- a/drivers/media/platform/qcom/camss/camss-csiphy.c > +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c > @@ -596,6 +596,7 @@ int msm_csiphy_subdev_init(struct camss *camss, > return PTR_ERR(csiphy->base); > > if (camss->res->version == CAMSS_8x16 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_8x96) { > csiphy->base_clk_mux = > devm_platform_ioremap_resource_byname(pdev, res->reg[1]); > diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c > index a12dcc7ff438c55167bc2981fd399dbf178181df..2dc585c6123dd248a5bacd9c7a88cb5375644311 100644 > --- a/drivers/media/platform/qcom/camss/camss-ispif.c > +++ b/drivers/media/platform/qcom/camss/camss-ispif.c > @@ -830,6 +830,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable) > ispif_select_cid(ispif, intf, cid, vfe, 1); > ispif_config_irq(ispif, intf, vfe, 1); > if (camss->res->version == CAMSS_8x96 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_660) > ispif_config_pack(ispif, > line->fmt[MSM_ISPIF_PAD_SINK].code, > @@ -848,6 +849,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable) > > mutex_lock(&ispif->config_lock); > if (camss->res->version == CAMSS_8x96 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_660) > ispif_config_pack(ispif, > line->fmt[MSM_ISPIF_PAD_SINK].code, > @@ -1111,6 +1113,7 @@ int msm_ispif_subdev_init(struct camss *camss, > if (camss->res->version == CAMSS_8x16) > ispif->line_num = 2; > else if (camss->res->version == CAMSS_8x96 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_660) > ispif->line_num = 4; > else > @@ -1130,6 +1133,7 @@ int msm_ispif_subdev_init(struct camss *camss, > ispif->line[i].nformats = > ARRAY_SIZE(ispif_formats_8x16); > } else if (camss->res->version == CAMSS_8x96 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_660) { > ispif->line[i].formats = ispif_formats_8x96; > ispif->line[i].nformats = > @@ -1162,6 +1166,7 @@ int msm_ispif_subdev_init(struct camss *camss, > ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16, > IRQF_TRIGGER_RISING, ispif->irq_name, ispif); > else if (camss->res->version == CAMSS_8x96 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_660) > ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96, > IRQF_TRIGGER_RISING, ispif->irq_name, ispif); > diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c > index 83c5a36d071fcc32c4b8a89e4e429dc1820df139..80a62ba11295042802cbaec617fb87c492ea6a55 100644 > --- a/drivers/media/platform/qcom/camss/camss-vfe.c > +++ b/drivers/media/platform/qcom/camss/camss-vfe.c > @@ -285,6 +285,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code, > > switch (vfe->camss->res->version) { > case CAMSS_8x16: > + case CAMSS_8x53: > switch (sink_code) { > case MEDIA_BUS_FMT_YUYV8_1X16: > { > diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c > index fabe034081ed0a7c0e0fcd8bc76c4eb396cb0067..9fb31f4c18adee886cd0bcf84438a8f27635e07f 100644 > --- a/drivers/media/platform/qcom/camss/camss.c > +++ b/drivers/media/platform/qcom/camss/camss.c > @@ -152,6 +152,160 @@ static const struct camss_subdev_resources vfe_res_8x16[] = { > } > }; > > +static const struct camss_subdev_resources csid_res_8x53[] = { > + /* CSID0 */ > + { > + .regulators = { "vdda" }, I see that you do reuse csiphy_res_8x16 for this platform support, in this case let me ask you to double check/test that the "vdda" regulator is actually a CSIPHY regulator, and if so, please move the registration of the regulators to csiphy_res_8x16 as a preceding change. In case if my ask is unclear, see commit 0567d0f1cc62 as a reference. > + .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb", > + "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, > + .clock_rate = { { 0 }, > + { 0 }, > + { 0 }, > + { 0 }, > + { 100000000, 200000000, 310000000, > + 400000000, 465000000 }, > + { 0 }, > + { 0 }, > + { 0 } }, > + .reg = { "csid0" }, > + .interrupt = { "csid0" }, > + .csid = { > + .hw_ops = &csid_ops_4_7, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_4_7 > + } > + }, > + > + /* CSID1 */ > + { > + .regulators = { "vdda" }, > + .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb", > + "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, > + .clock_rate = { { 0 }, > + { 0 }, > + { 0 }, > + { 0 }, > + { 100000000, 200000000, 310000000, > + 400000000, 465000000 }, > + { 0 }, > + { 0 }, > + { 0 } }, > + .reg = { "csid1" }, > + .interrupt = { "csid1" }, > + .csid = { > + .hw_ops = &csid_ops_4_7, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_4_7 > + } > + }, > + > + /* CSID2 */ > + { > + .regulators = { "vdda" }, > + .clock = { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb", > + "csi2", "csi2_phy", "csi2_pix", "csi2_rdi" }, > + .clock_rate = { { 0 }, > + { 0 }, > + { 0 }, > + { 0 }, > + { 100000000, 200000000, 310000000, > + 400000000, 465000000 }, > + { 0 }, > + { 0 }, > + { 0 } }, > + .reg = { "csid2" }, > + .interrupt = { "csid2" }, > + .csid = { > + .hw_ops = &csid_ops_4_7, > + .parent_dev_ops = &vfe_parent_dev_ops, > + .formats = &csid_formats_4_7 > + } > + }, > +}; > + > +static const struct camss_subdev_resources ispif_res_8x53 = { > + /* ISPIF */ > + .clock = { "top_ahb", "ahb", "ispif_ahb", > + "csi0", "csi0_pix", "csi0_rdi", > + "csi1", "csi1_pix", "csi1_rdi", > + "csi2", "csi2_pix", "csi2_rdi" }, > + .clock_for_reset = { "vfe0", "csi_vfe0", "vfe1", "csi_vfe1" }, > + .reg = { "ispif", "csi_clk_mux" }, > + .interrupt = { "ispif" }, > +}; > + > +static const struct camss_subdev_resources vfe_res_8x53[] = { > + /* VFE0 */ > + { > + .regulators = {}, > + .clock = { "top_ahb", "ahb", "ispif_ahb", > + "vfe0", "csi_vfe0", "vfe0_ahb", "vfe0_axi" }, > + .clock_rate = { { 0 }, > + { 0 }, > + { 0 }, > + { 50000000, 100000000, 133330000, > + 160000000, 200000000, 266670000, > + 310000000, 400000000, 465000000 }, > + { 0 }, > + { 0 }, > + { 0 } }, > + .reg = { "vfe0" }, > + .interrupt = { "vfe0" }, > + .vfe = { > + .line_num = 3, > + .has_pd = true, > + .pd_name = "vfe0", > + .hw_ops = &vfe_ops_4_1, > + .formats_rdi = &vfe_formats_rdi_8x16, > + .formats_pix = &vfe_formats_pix_8x16 > + } > + }, > + > + /* VFE1 */ > + { > + .regulators = {}, > + .clock = { "top_ahb", "ahb", "ispif_ahb", > + "vfe1", "csi_vfe1", "vfe1_ahb", "vfe1_axi" }, > + .clock_rate = { { 0 }, > + { 0 }, > + { 0 }, > + { 50000000, 100000000, 133330000, > + 160000000, 200000000, 266670000, > + 310000000, 400000000, 465000000 }, > + { 0 }, > + { 0 }, > + { 0 } }, > + .reg = { "vfe1" }, > + .interrupt = { "vfe1" }, > + .vfe = { > + .line_num = 3, > + .has_pd = true, > + .pd_name = "vfe1", > + .hw_ops = &vfe_ops_4_1, > + .formats_rdi = &vfe_formats_rdi_8x16, > + .formats_pix = &vfe_formats_pix_8x16 > + } > + } > +}; > + > +static const struct resources_icc icc_res_8x53[] = { > + { > + .name = "cam_ahb", > + .icc_bw_tbl.avg = 38400, > + .icc_bw_tbl.peak = 76800, > + }, > + { > + .name = "cam_vfe0_mem", > + .icc_bw_tbl.avg = 939524, > + .icc_bw_tbl.peak = 1342177, > + }, > + { > + .name = "cam_vfe1_mem", > + .icc_bw_tbl.avg = 939524, > + .icc_bw_tbl.peak = 1342177, > + }, > +}; > + > static const struct camss_subdev_resources csiphy_res_8x96[] = { > /* CSIPHY0 */ > { > @@ -2248,6 +2402,7 @@ static int camss_probe(struct platform_device *pdev) > return -ENOMEM; > > if (camss->res->version == CAMSS_8x16 || > + camss->res->version == CAMSS_8x53 || > camss->res->version == CAMSS_8x96) { > camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL); > if (!camss->ispif) > @@ -2389,6 +2544,20 @@ static const struct camss_resources msm8916_resources = { > .link_entities = camss_link_entities > }; > > +static const struct camss_resources msm8953_resources = { > + .version = CAMSS_8x53, > + .icc_res = icc_res_8x53, > + .icc_path_num = ARRAY_SIZE(icc_res_8x53), > + .csiphy_res = csiphy_res_8x96, > + .csid_res = csid_res_8x53, > + .ispif_res = &ispif_res_8x53, > + .vfe_res = vfe_res_8x53, > + .csiphy_num = ARRAY_SIZE(csiphy_res_8x96), > + .csid_num = ARRAY_SIZE(csid_res_8x53), > + .vfe_num = ARRAY_SIZE(vfe_res_8x53), > + .link_entities = camss_link_entities > +}; > + > static const struct camss_resources msm8996_resources = { > .version = CAMSS_8x96, > .csiphy_res = csiphy_res_8x96, > @@ -2455,6 +2624,7 @@ static const struct camss_resources sc8280xp_resources = { > > 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,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 0ce84fcbbd25c7825212beb74073ffd4c70858a8..9da7f48f5dd762d27521d449051892e956693970 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_8x16, > + CAMSS_8x53, > CAMSS_8x96, > CAMSS_660, > CAMSS_845, > -- Best wishes, Vladimir
On 2024-11-13 05:58, Vladimir Zapolskiy wrote: > On 11/3/24 11:45, Barnabás Czémán wrote: >> From: Vladimir Lypak <vladimir.lypak@gmail.com> >> >> This commit describes the hardware layout for the MSM8953 >> for the following hardware blocks: >> >> - 2 x VFE, 3 RDI per VFE >> - 3 x CSID >> - 3 x CSI PHY >> >> Signed-off-by: Vladimir Lypak <vladimir.lypak@gmail.com> >> Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >> Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org> >> --- >> drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + >> drivers/media/platform/qcom/camss/camss-ispif.c | 5 + >> drivers/media/platform/qcom/camss/camss-vfe.c | 1 + >> drivers/media/platform/qcom/camss/camss.c | 170 >> +++++++++++++++++++++++ >> drivers/media/platform/qcom/camss/camss.h | 1 + >> 5 files changed, 178 insertions(+) >> >> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c >> b/drivers/media/platform/qcom/camss/camss-csiphy.c >> index >> 68a3ea1ba2a5299cf28289dfdb958cfdff3c91e0..5af2b382a843c2b8857339ba28930fe1682c9412 >> 100644 >> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c >> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c >> @@ -596,6 +596,7 @@ int msm_csiphy_subdev_init(struct camss *camss, >> return PTR_ERR(csiphy->base); >> if (camss->res->version == CAMSS_8x16 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_8x96) { >> csiphy->base_clk_mux = >> devm_platform_ioremap_resource_byname(pdev, res->reg[1]); >> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c >> b/drivers/media/platform/qcom/camss/camss-ispif.c >> index >> a12dcc7ff438c55167bc2981fd399dbf178181df..2dc585c6123dd248a5bacd9c7a88cb5375644311 >> 100644 >> --- a/drivers/media/platform/qcom/camss/camss-ispif.c >> +++ b/drivers/media/platform/qcom/camss/camss-ispif.c >> @@ -830,6 +830,7 @@ static int ispif_set_stream(struct v4l2_subdev >> *sd, int enable) >> ispif_select_cid(ispif, intf, cid, vfe, 1); >> ispif_config_irq(ispif, intf, vfe, 1); >> if (camss->res->version == CAMSS_8x96 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_660) >> ispif_config_pack(ispif, >> line->fmt[MSM_ISPIF_PAD_SINK].code, >> @@ -848,6 +849,7 @@ static int ispif_set_stream(struct v4l2_subdev >> *sd, int enable) >> mutex_lock(&ispif->config_lock); >> if (camss->res->version == CAMSS_8x96 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_660) >> ispif_config_pack(ispif, >> line->fmt[MSM_ISPIF_PAD_SINK].code, >> @@ -1111,6 +1113,7 @@ int msm_ispif_subdev_init(struct camss *camss, >> if (camss->res->version == CAMSS_8x16) >> ispif->line_num = 2; >> else if (camss->res->version == CAMSS_8x96 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_660) >> ispif->line_num = 4; >> else >> @@ -1130,6 +1133,7 @@ int msm_ispif_subdev_init(struct camss *camss, >> ispif->line[i].nformats = >> ARRAY_SIZE(ispif_formats_8x16); >> } else if (camss->res->version == CAMSS_8x96 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_660) { >> ispif->line[i].formats = ispif_formats_8x96; >> ispif->line[i].nformats = >> @@ -1162,6 +1166,7 @@ int msm_ispif_subdev_init(struct camss *camss, >> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16, >> IRQF_TRIGGER_RISING, ispif->irq_name, ispif); >> else if (camss->res->version == CAMSS_8x96 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_660) >> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96, >> IRQF_TRIGGER_RISING, ispif->irq_name, ispif); >> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c >> b/drivers/media/platform/qcom/camss/camss-vfe.c >> index >> 83c5a36d071fcc32c4b8a89e4e429dc1820df139..80a62ba11295042802cbaec617fb87c492ea6a55 >> 100644 >> --- a/drivers/media/platform/qcom/camss/camss-vfe.c >> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c >> @@ -285,6 +285,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, >> u32 sink_code, >> switch (vfe->camss->res->version) { >> case CAMSS_8x16: >> + case CAMSS_8x53: >> switch (sink_code) { >> case MEDIA_BUS_FMT_YUYV8_1X16: >> { >> diff --git a/drivers/media/platform/qcom/camss/camss.c >> b/drivers/media/platform/qcom/camss/camss.c >> index >> fabe034081ed0a7c0e0fcd8bc76c4eb396cb0067..9fb31f4c18adee886cd0bcf84438a8f27635e07f >> 100644 >> --- a/drivers/media/platform/qcom/camss/camss.c >> +++ b/drivers/media/platform/qcom/camss/camss.c >> @@ -152,6 +152,160 @@ static const struct camss_subdev_resources >> vfe_res_8x16[] = { >> } >> }; >> +static const struct camss_subdev_resources csid_res_8x53[] = { >> + /* CSID0 */ >> + { >> + .regulators = { "vdda" }, > > I see that you do reuse csiphy_res_8x16 for this platform support, in > this case let me ask you to double check/test that the "vdda" regulator > is actually a CSIPHY regulator, and if so, please move the registration > of the regulators to csiphy_res_8x16 as a preceding change. It is placed in CSID at downstream and this is the documentation of the downstream property: - qcom,mipi-csi-vdd-supply : should contain regulator to be used for this csid core so it should be a csid regulator as i understand. It is also placed at CSIDs in msm8953-camera.dtsi > > In case if my ask is unclear, see commit 0567d0f1cc62 as a reference. > >> + .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb", >> + "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, >> + .clock_rate = { { 0 }, >> + { 0 }, >> + { 0 }, >> + { 0 }, >> + { 100000000, 200000000, 310000000, >> + 400000000, 465000000 }, >> + { 0 }, >> + { 0 }, >> + { 0 } }, >> + .reg = { "csid0" }, >> + .interrupt = { "csid0" }, >> + .csid = { >> + .hw_ops = &csid_ops_4_7, >> + .parent_dev_ops = &vfe_parent_dev_ops, >> + .formats = &csid_formats_4_7 >> + } >> + }, >> + >> + /* CSID1 */ >> + { >> + .regulators = { "vdda" }, >> + .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb", >> + "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, >> + .clock_rate = { { 0 }, >> + { 0 }, >> + { 0 }, >> + { 0 }, >> + { 100000000, 200000000, 310000000, >> + 400000000, 465000000 }, >> + { 0 }, >> + { 0 }, >> + { 0 } }, >> + .reg = { "csid1" }, >> + .interrupt = { "csid1" }, >> + .csid = { >> + .hw_ops = &csid_ops_4_7, >> + .parent_dev_ops = &vfe_parent_dev_ops, >> + .formats = &csid_formats_4_7 >> + } >> + }, >> + >> + /* CSID2 */ >> + { >> + .regulators = { "vdda" }, >> + .clock = { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb", >> + "csi2", "csi2_phy", "csi2_pix", "csi2_rdi" }, >> + .clock_rate = { { 0 }, >> + { 0 }, >> + { 0 }, >> + { 0 }, >> + { 100000000, 200000000, 310000000, >> + 400000000, 465000000 }, >> + { 0 }, >> + { 0 }, >> + { 0 } }, >> + .reg = { "csid2" }, >> + .interrupt = { "csid2" }, >> + .csid = { >> + .hw_ops = &csid_ops_4_7, >> + .parent_dev_ops = &vfe_parent_dev_ops, >> + .formats = &csid_formats_4_7 >> + } >> + }, >> +}; >> + >> +static const struct camss_subdev_resources ispif_res_8x53 = { >> + /* ISPIF */ >> + .clock = { "top_ahb", "ahb", "ispif_ahb", >> + "csi0", "csi0_pix", "csi0_rdi", >> + "csi1", "csi1_pix", "csi1_rdi", >> + "csi2", "csi2_pix", "csi2_rdi" }, >> + .clock_for_reset = { "vfe0", "csi_vfe0", "vfe1", "csi_vfe1" }, >> + .reg = { "ispif", "csi_clk_mux" }, >> + .interrupt = { "ispif" }, >> +}; >> + >> +static const struct camss_subdev_resources vfe_res_8x53[] = { >> + /* VFE0 */ >> + { >> + .regulators = {}, >> + .clock = { "top_ahb", "ahb", "ispif_ahb", >> + "vfe0", "csi_vfe0", "vfe0_ahb", "vfe0_axi" }, >> + .clock_rate = { { 0 }, >> + { 0 }, >> + { 0 }, >> + { 50000000, 100000000, 133330000, >> + 160000000, 200000000, 266670000, >> + 310000000, 400000000, 465000000 }, >> + { 0 }, >> + { 0 }, >> + { 0 } }, >> + .reg = { "vfe0" }, >> + .interrupt = { "vfe0" }, >> + .vfe = { >> + .line_num = 3, >> + .has_pd = true, >> + .pd_name = "vfe0", >> + .hw_ops = &vfe_ops_4_1, >> + .formats_rdi = &vfe_formats_rdi_8x16, >> + .formats_pix = &vfe_formats_pix_8x16 >> + } >> + }, >> + >> + /* VFE1 */ >> + { >> + .regulators = {}, >> + .clock = { "top_ahb", "ahb", "ispif_ahb", >> + "vfe1", "csi_vfe1", "vfe1_ahb", "vfe1_axi" }, >> + .clock_rate = { { 0 }, >> + { 0 }, >> + { 0 }, >> + { 50000000, 100000000, 133330000, >> + 160000000, 200000000, 266670000, >> + 310000000, 400000000, 465000000 }, >> + { 0 }, >> + { 0 }, >> + { 0 } }, >> + .reg = { "vfe1" }, >> + .interrupt = { "vfe1" }, >> + .vfe = { >> + .line_num = 3, >> + .has_pd = true, >> + .pd_name = "vfe1", >> + .hw_ops = &vfe_ops_4_1, >> + .formats_rdi = &vfe_formats_rdi_8x16, >> + .formats_pix = &vfe_formats_pix_8x16 >> + } >> + } >> +}; >> + >> +static const struct resources_icc icc_res_8x53[] = { >> + { >> + .name = "cam_ahb", >> + .icc_bw_tbl.avg = 38400, >> + .icc_bw_tbl.peak = 76800, >> + }, >> + { >> + .name = "cam_vfe0_mem", >> + .icc_bw_tbl.avg = 939524, >> + .icc_bw_tbl.peak = 1342177, >> + }, >> + { >> + .name = "cam_vfe1_mem", >> + .icc_bw_tbl.avg = 939524, >> + .icc_bw_tbl.peak = 1342177, >> + }, >> +}; >> + >> static const struct camss_subdev_resources csiphy_res_8x96[] = { >> /* CSIPHY0 */ >> { >> @@ -2248,6 +2402,7 @@ static int camss_probe(struct platform_device >> *pdev) >> return -ENOMEM; >> if (camss->res->version == CAMSS_8x16 || >> + camss->res->version == CAMSS_8x53 || >> camss->res->version == CAMSS_8x96) { >> camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), >> GFP_KERNEL); >> if (!camss->ispif) >> @@ -2389,6 +2544,20 @@ static const struct camss_resources >> msm8916_resources = { >> .link_entities = camss_link_entities >> }; >> +static const struct camss_resources msm8953_resources = { >> + .version = CAMSS_8x53, >> + .icc_res = icc_res_8x53, >> + .icc_path_num = ARRAY_SIZE(icc_res_8x53), >> + .csiphy_res = csiphy_res_8x96, >> + .csid_res = csid_res_8x53, >> + .ispif_res = &ispif_res_8x53, >> + .vfe_res = vfe_res_8x53, >> + .csiphy_num = ARRAY_SIZE(csiphy_res_8x96), >> + .csid_num = ARRAY_SIZE(csid_res_8x53), >> + .vfe_num = ARRAY_SIZE(vfe_res_8x53), >> + .link_entities = camss_link_entities >> +}; >> + >> static const struct camss_resources msm8996_resources = { >> .version = CAMSS_8x96, >> .csiphy_res = csiphy_res_8x96, >> @@ -2455,6 +2624,7 @@ static const struct camss_resources >> sc8280xp_resources = { >> 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,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 >> 0ce84fcbbd25c7825212beb74073ffd4c70858a8..9da7f48f5dd762d27521d449051892e956693970 >> 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_8x16, >> + CAMSS_8x53, >> CAMSS_8x96, >> CAMSS_660, >> CAMSS_845, >> > > -- > Best wishes, > Vladimir
On 13/11/2024 08:01, barnabas.czeman@mainlining.org wrote: >> I see that you do reuse csiphy_res_8x16 for this platform support, in >> this case let me ask you to double check/test that the "vdda" regulator >> is actually a CSIPHY regulator, and if so, please move the registration >> of the regulators to csiphy_res_8x16 as a preceding change. > It is placed in CSID at downstream and this is the documentation of > the downstream property: > - qcom,mipi-csi-vdd-supply : should contain regulator to be used for > this csid core > so it should be a csid regulator as i understand. > It is also placed at CSIDs in msm8953-camera.dtsi No, the regulator(s) supply voltage to the PHY. Make sure you have: commit 44fdbb9d1a3892db92b2c9cf5f46e32ca4095d92 Author: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> Date: Fri Sep 27 00:19:56 2024 +0300 media: qcom: camss: add management of supply regulators to CSIPHY and give the change a try. --- bod
On 2024-11-13 10:53, Bryan O'Donoghue wrote: > On 13/11/2024 08:01, barnabas.czeman@mainlining.org wrote: >>> I see that you do reuse csiphy_res_8x16 for this platform support, in >>> this case let me ask you to double check/test that the "vdda" >>> regulator >>> is actually a CSIPHY regulator, and if so, please move the >>> registration >>> of the regulators to csiphy_res_8x16 as a preceding change. >> It is placed in CSID at downstream and this is the documentation of >> the downstream property: >> - qcom,mipi-csi-vdd-supply : should contain regulator to be used for >> this csid core >> so it should be a csid regulator as i understand. >> It is also placed at CSIDs in msm8953-camera.dtsi > > No, the regulator(s) supply voltage to the PHY. On sm8250 it is for csiphy but on older soc like on msm8953, msm8917, msm8916 this regulator is placed in csid nodes. https://git.codelinaro.org/clo/la/kernel/msm-4.9/-/blob/LA.UM.10.6.2.c26-01500-89xx.0/arch/arm64/boot/dts/qcom/msm8953-camera.dtsi#L96 There is no regulator in csiphy nodes only PM domains. I will check later move the regulator to the csiphy. > > Make sure you have: > > commit 44fdbb9d1a3892db92b2c9cf5f46e32ca4095d92 > Author: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> > Date: Fri Sep 27 00:19:56 2024 +0300 > > media: qcom: camss: add management of supply regulators to CSIPHY > > and give the change a try. > > --- > bod
Hello Barnabás, Bryan. On 11/13/24 10:01, barnabas.czeman@mainlining.org wrote: > On 2024-11-13 05:58, Vladimir Zapolskiy wrote: >> On 11/3/24 11:45, Barnabás Czémán wrote: >>> From: Vladimir Lypak <vladimir.lypak@gmail.com> >>> >>> This commit describes the hardware layout for the MSM8953 >>> for the following hardware blocks: >>> >>> - 2 x VFE, 3 RDI per VFE >>> - 3 x CSID >>> - 3 x CSI PHY >>> >>> Signed-off-by: Vladimir Lypak <vladimir.lypak@gmail.com> >>> Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> >>> Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org> >>> --- >>> drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + >>> drivers/media/platform/qcom/camss/camss-ispif.c | 5 + >>> drivers/media/platform/qcom/camss/camss-vfe.c | 1 + >>> drivers/media/platform/qcom/camss/camss.c | 170 >>> +++++++++++++++++++++++ >>> drivers/media/platform/qcom/camss/camss.h | 1 + >>> 5 files changed, 178 insertions(+) >>> >>> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c >>> b/drivers/media/platform/qcom/camss/camss-csiphy.c >>> index >>> 68a3ea1ba2a5299cf28289dfdb958cfdff3c91e0..5af2b382a843c2b8857339ba28930fe1682c9412 >>> 100644 >>> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c >>> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c >>> @@ -596,6 +596,7 @@ int msm_csiphy_subdev_init(struct camss *camss, >>> return PTR_ERR(csiphy->base); >>> if (camss->res->version == CAMSS_8x16 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_8x96) { >>> csiphy->base_clk_mux = >>> devm_platform_ioremap_resource_byname(pdev, res->reg[1]); >>> diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c >>> b/drivers/media/platform/qcom/camss/camss-ispif.c >>> index >>> a12dcc7ff438c55167bc2981fd399dbf178181df..2dc585c6123dd248a5bacd9c7a88cb5375644311 >>> 100644 >>> --- a/drivers/media/platform/qcom/camss/camss-ispif.c >>> +++ b/drivers/media/platform/qcom/camss/camss-ispif.c >>> @@ -830,6 +830,7 @@ static int ispif_set_stream(struct v4l2_subdev >>> *sd, int enable) >>> ispif_select_cid(ispif, intf, cid, vfe, 1); >>> ispif_config_irq(ispif, intf, vfe, 1); >>> if (camss->res->version == CAMSS_8x96 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_660) >>> ispif_config_pack(ispif, >>> line->fmt[MSM_ISPIF_PAD_SINK].code, >>> @@ -848,6 +849,7 @@ static int ispif_set_stream(struct v4l2_subdev >>> *sd, int enable) >>> mutex_lock(&ispif->config_lock); >>> if (camss->res->version == CAMSS_8x96 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_660) >>> ispif_config_pack(ispif, >>> line->fmt[MSM_ISPIF_PAD_SINK].code, >>> @@ -1111,6 +1113,7 @@ int msm_ispif_subdev_init(struct camss *camss, >>> if (camss->res->version == CAMSS_8x16) >>> ispif->line_num = 2; >>> else if (camss->res->version == CAMSS_8x96 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_660) >>> ispif->line_num = 4; >>> else >>> @@ -1130,6 +1133,7 @@ int msm_ispif_subdev_init(struct camss *camss, >>> ispif->line[i].nformats = >>> ARRAY_SIZE(ispif_formats_8x16); >>> } else if (camss->res->version == CAMSS_8x96 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_660) { >>> ispif->line[i].formats = ispif_formats_8x96; >>> ispif->line[i].nformats = >>> @@ -1162,6 +1166,7 @@ int msm_ispif_subdev_init(struct camss *camss, >>> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16, >>> IRQF_TRIGGER_RISING, ispif->irq_name, ispif); >>> else if (camss->res->version == CAMSS_8x96 || >>> + camss->res->version == CAMSS_8x53 || >>> camss->res->version == CAMSS_660) >>> ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96, >>> IRQF_TRIGGER_RISING, ispif->irq_name, ispif); >>> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c >>> b/drivers/media/platform/qcom/camss/camss-vfe.c >>> index >>> 83c5a36d071fcc32c4b8a89e4e429dc1820df139..80a62ba11295042802cbaec617fb87c492ea6a55 >>> 100644 >>> --- a/drivers/media/platform/qcom/camss/camss-vfe.c >>> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c >>> @@ -285,6 +285,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, >>> u32 sink_code, >>> switch (vfe->camss->res->version) { >>> case CAMSS_8x16: >>> + case CAMSS_8x53: >>> switch (sink_code) { >>> case MEDIA_BUS_FMT_YUYV8_1X16: >>> { >>> diff --git a/drivers/media/platform/qcom/camss/camss.c >>> b/drivers/media/platform/qcom/camss/camss.c >>> index >>> fabe034081ed0a7c0e0fcd8bc76c4eb396cb0067..9fb31f4c18adee886cd0bcf84438a8f27635e07f >>> 100644 >>> --- a/drivers/media/platform/qcom/camss/camss.c >>> +++ b/drivers/media/platform/qcom/camss/camss.c >>> @@ -152,6 +152,160 @@ static const struct camss_subdev_resources >>> vfe_res_8x16[] = { >>> } >>> }; >>> +static const struct camss_subdev_resources csid_res_8x53[] = { >>> + /* CSID0 */ >>> + { >>> + .regulators = { "vdda" }, >> >> I see that you do reuse csiphy_res_8x16 for this platform support, in >> this case let me ask you to double check/test that the "vdda" regulator >> is actually a CSIPHY regulator, and if so, please move the registration >> of the regulators to csiphy_res_8x16 as a preceding change. > It is placed in CSID at downstream and this is the documentation of > the downstream property: > - qcom,mipi-csi-vdd-supply : should contain regulator to be used for > this csid core > so it should be a csid regulator as i understand. > It is also placed at CSIDs in msm8953-camera.dtsi I've opened DB410C board schematics, and CAMSS IP is supplied over VREG_L2_1P2 power lane entering VDDA_MIPI_CSI pad on the APQ8016 SoC. The same voltage regulator also supplies display and SDRAM memory, most probably the latter implies that CAMSS IP and driver cannot be tested at least on this reference board, when the regulator is disabled. So, we have to rely on the documentation here. Bryan, can you please check, if VDDA_MIPI_CSI pad on MSM8916 and/or MSM8953 is related to CSIPHY or CSID power supply? Thank you in advance. -- Best wishes, Vladimir
On 13/11/2024 13:28, Vladimir Zapolskiy wrote: > So, we have to rely on the documentation here. Bryan, can you please > check, if VDDA_MIPI_CSI pad on MSM8916 and/or MSM8953 is related to > CSIPHY or CSID power supply? Thank you in advance. No there's really no indication in the documents I have how the input gets routed internally, CSID, CSIPHY, both.. not clear. I think Barnabás is right, the best source of information we have for this one is the downstream dtsi => CSID. --- bod
On 2024-11-13 16:23, Bryan O'Donoghue wrote: > On 13/11/2024 13:28, Vladimir Zapolskiy wrote: >> So, we have to rely on the documentation here. Bryan, can you please >> check, if VDDA_MIPI_CSI pad on MSM8916 and/or MSM8953 is related to >> CSIPHY or CSID power supply? Thank you in advance. > > No there's really no indication in the documents I have how the input > gets routed internally, CSID, CSIPHY, both.. not clear. > > I think Barnabás is right, the best source of information we have for > this one is the downstream dtsi => CSID. I have found the regulator also in downstream msm_csid driver i hope it helps a bit. https://git.codelinaro.org/clo/la/kernel/msm-4.9/-/blob/LA.UM.10.6.2.c26-01500-89xx.0/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c#L73 > > --- > bod
On 11/13/24 17:32, barnabas.czeman@mainlining.org wrote: > On 2024-11-13 16:23, Bryan O'Donoghue wrote: >> On 13/11/2024 13:28, Vladimir Zapolskiy wrote: >>> So, we have to rely on the documentation here. Bryan, can you please >>> check, if VDDA_MIPI_CSI pad on MSM8916 and/or MSM8953 is related to >>> CSIPHY or CSID power supply? Thank you in advance. >> >> No there's really no indication in the documents I have how the input >> gets routed internally, CSID, CSIPHY, both.. not clear. >> >> I think Barnabás is right, the best source of information we have for >> this one is the downstream dtsi => CSID. > I have found the regulator also in downstream msm_csid driver i hope it > helps a bit. > https://git.codelinaro.org/clo/la/kernel/msm-4.9/-/blob/LA.UM.10.6.2.c26-01500-89xx.0/drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c#L73 > Agreed, since the documentation is ambiguous about the voltage supply, the best deal is to follow the downstream code here. Please fix the review findings in the dt-bindings, and rebase the driver changes on top of the linux-next, also please consider to add CCI and CAMSS device tree nodes into the msm8953.dtsi file. -- Best wishes, Vladimir
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c index 68a3ea1ba2a5299cf28289dfdb958cfdff3c91e0..5af2b382a843c2b8857339ba28930fe1682c9412 100644 --- a/drivers/media/platform/qcom/camss/camss-csiphy.c +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c @@ -596,6 +596,7 @@ int msm_csiphy_subdev_init(struct camss *camss, return PTR_ERR(csiphy->base); if (camss->res->version == CAMSS_8x16 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_8x96) { csiphy->base_clk_mux = devm_platform_ioremap_resource_byname(pdev, res->reg[1]); diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/media/platform/qcom/camss/camss-ispif.c index a12dcc7ff438c55167bc2981fd399dbf178181df..2dc585c6123dd248a5bacd9c7a88cb5375644311 100644 --- a/drivers/media/platform/qcom/camss/camss-ispif.c +++ b/drivers/media/platform/qcom/camss/camss-ispif.c @@ -830,6 +830,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable) ispif_select_cid(ispif, intf, cid, vfe, 1); ispif_config_irq(ispif, intf, vfe, 1); if (camss->res->version == CAMSS_8x96 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_660) ispif_config_pack(ispif, line->fmt[MSM_ISPIF_PAD_SINK].code, @@ -848,6 +849,7 @@ static int ispif_set_stream(struct v4l2_subdev *sd, int enable) mutex_lock(&ispif->config_lock); if (camss->res->version == CAMSS_8x96 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_660) ispif_config_pack(ispif, line->fmt[MSM_ISPIF_PAD_SINK].code, @@ -1111,6 +1113,7 @@ int msm_ispif_subdev_init(struct camss *camss, if (camss->res->version == CAMSS_8x16) ispif->line_num = 2; else if (camss->res->version == CAMSS_8x96 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_660) ispif->line_num = 4; else @@ -1130,6 +1133,7 @@ int msm_ispif_subdev_init(struct camss *camss, ispif->line[i].nformats = ARRAY_SIZE(ispif_formats_8x16); } else if (camss->res->version == CAMSS_8x96 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_660) { ispif->line[i].formats = ispif_formats_8x96; ispif->line[i].nformats = @@ -1162,6 +1166,7 @@ int msm_ispif_subdev_init(struct camss *camss, ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x16, IRQF_TRIGGER_RISING, ispif->irq_name, ispif); else if (camss->res->version == CAMSS_8x96 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_660) ret = devm_request_irq(dev, ispif->irq, ispif_isr_8x96, IRQF_TRIGGER_RISING, ispif->irq_name, ispif); diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c index 83c5a36d071fcc32c4b8a89e4e429dc1820df139..80a62ba11295042802cbaec617fb87c492ea6a55 100644 --- a/drivers/media/platform/qcom/camss/camss-vfe.c +++ b/drivers/media/platform/qcom/camss/camss-vfe.c @@ -285,6 +285,7 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code, switch (vfe->camss->res->version) { case CAMSS_8x16: + case CAMSS_8x53: switch (sink_code) { case MEDIA_BUS_FMT_YUYV8_1X16: { diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index fabe034081ed0a7c0e0fcd8bc76c4eb396cb0067..9fb31f4c18adee886cd0bcf84438a8f27635e07f 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -152,6 +152,160 @@ static const struct camss_subdev_resources vfe_res_8x16[] = { } }; +static const struct camss_subdev_resources csid_res_8x53[] = { + /* CSID0 */ + { + .regulators = { "vdda" }, + .clock = { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb", + "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, + .clock_rate = { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg = { "csid0" }, + .interrupt = { "csid0" }, + .csid = { + .hw_ops = &csid_ops_4_7, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_4_7 + } + }, + + /* CSID1 */ + { + .regulators = { "vdda" }, + .clock = { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb", + "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, + .clock_rate = { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg = { "csid1" }, + .interrupt = { "csid1" }, + .csid = { + .hw_ops = &csid_ops_4_7, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_4_7 + } + }, + + /* CSID2 */ + { + .regulators = { "vdda" }, + .clock = { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb", + "csi2", "csi2_phy", "csi2_pix", "csi2_rdi" }, + .clock_rate = { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg = { "csid2" }, + .interrupt = { "csid2" }, + .csid = { + .hw_ops = &csid_ops_4_7, + .parent_dev_ops = &vfe_parent_dev_ops, + .formats = &csid_formats_4_7 + } + }, +}; + +static const struct camss_subdev_resources ispif_res_8x53 = { + /* ISPIF */ + .clock = { "top_ahb", "ahb", "ispif_ahb", + "csi0", "csi0_pix", "csi0_rdi", + "csi1", "csi1_pix", "csi1_rdi", + "csi2", "csi2_pix", "csi2_rdi" }, + .clock_for_reset = { "vfe0", "csi_vfe0", "vfe1", "csi_vfe1" }, + .reg = { "ispif", "csi_clk_mux" }, + .interrupt = { "ispif" }, +}; + +static const struct camss_subdev_resources vfe_res_8x53[] = { + /* VFE0 */ + { + .regulators = {}, + .clock = { "top_ahb", "ahb", "ispif_ahb", + "vfe0", "csi_vfe0", "vfe0_ahb", "vfe0_axi" }, + .clock_rate = { { 0 }, + { 0 }, + { 0 }, + { 50000000, 100000000, 133330000, + 160000000, 200000000, 266670000, + 310000000, 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg = { "vfe0" }, + .interrupt = { "vfe0" }, + .vfe = { + .line_num = 3, + .has_pd = true, + .pd_name = "vfe0", + .hw_ops = &vfe_ops_4_1, + .formats_rdi = &vfe_formats_rdi_8x16, + .formats_pix = &vfe_formats_pix_8x16 + } + }, + + /* VFE1 */ + { + .regulators = {}, + .clock = { "top_ahb", "ahb", "ispif_ahb", + "vfe1", "csi_vfe1", "vfe1_ahb", "vfe1_axi" }, + .clock_rate = { { 0 }, + { 0 }, + { 0 }, + { 50000000, 100000000, 133330000, + 160000000, 200000000, 266670000, + 310000000, 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg = { "vfe1" }, + .interrupt = { "vfe1" }, + .vfe = { + .line_num = 3, + .has_pd = true, + .pd_name = "vfe1", + .hw_ops = &vfe_ops_4_1, + .formats_rdi = &vfe_formats_rdi_8x16, + .formats_pix = &vfe_formats_pix_8x16 + } + } +}; + +static const struct resources_icc icc_res_8x53[] = { + { + .name = "cam_ahb", + .icc_bw_tbl.avg = 38400, + .icc_bw_tbl.peak = 76800, + }, + { + .name = "cam_vfe0_mem", + .icc_bw_tbl.avg = 939524, + .icc_bw_tbl.peak = 1342177, + }, + { + .name = "cam_vfe1_mem", + .icc_bw_tbl.avg = 939524, + .icc_bw_tbl.peak = 1342177, + }, +}; + static const struct camss_subdev_resources csiphy_res_8x96[] = { /* CSIPHY0 */ { @@ -2248,6 +2402,7 @@ static int camss_probe(struct platform_device *pdev) return -ENOMEM; if (camss->res->version == CAMSS_8x16 || + camss->res->version == CAMSS_8x53 || camss->res->version == CAMSS_8x96) { camss->ispif = devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL); if (!camss->ispif) @@ -2389,6 +2544,20 @@ static const struct camss_resources msm8916_resources = { .link_entities = camss_link_entities }; +static const struct camss_resources msm8953_resources = { + .version = CAMSS_8x53, + .icc_res = icc_res_8x53, + .icc_path_num = ARRAY_SIZE(icc_res_8x53), + .csiphy_res = csiphy_res_8x96, + .csid_res = csid_res_8x53, + .ispif_res = &ispif_res_8x53, + .vfe_res = vfe_res_8x53, + .csiphy_num = ARRAY_SIZE(csiphy_res_8x96), + .csid_num = ARRAY_SIZE(csid_res_8x53), + .vfe_num = ARRAY_SIZE(vfe_res_8x53), + .link_entities = camss_link_entities +}; + static const struct camss_resources msm8996_resources = { .version = CAMSS_8x96, .csiphy_res = csiphy_res_8x96, @@ -2455,6 +2624,7 @@ static const struct camss_resources sc8280xp_resources = { 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,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 0ce84fcbbd25c7825212beb74073ffd4c70858a8..9da7f48f5dd762d27521d449051892e956693970 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_8x16, + CAMSS_8x53, CAMSS_8x96, CAMSS_660, CAMSS_845,