From nobody Sun Nov 24 21:39:50 2024 Received: from mail.mainlining.org (mail.mainlining.org [5.75.144.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 670891AC43E; Sat, 2 Nov 2024 22:39:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=5.75.144.95 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730587187; cv=none; b=SMmd2hTBKIADKZ3WGimYBZ2u8QKt33KBCXBkIw8e9LgbhyvnOTX+sZ4dOneFsoK690bklDXXxRiyR7I/+Z2d9S+g5ekSOggEOCzGd8LPBBypvplaHJzYjx15ipm37p5OLFrtzkSlftLmwYKUaBtp4gB1OlvauGlI/5E3bKE+BvI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730587187; c=relaxed/simple; bh=8uapuhzcoEEROc/m3t3yzzxEVVf0sVrzaxgbMRbq6Mg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sjJYLLrmfP6p9J9F3wBOQcCkJJC1iQQgHiVs5am6Cc/msvKGOWEs5XnWQ6pEg10Brei4dTld5IcHyRuslrvrANfRtJJF9o1Cp3NQ1xdhq36jxMAb0o9f7vNKUDf7ISXNC0OO/9TVIyxZ5ea9ZeyBuxEfHbj2KozxQ92iLtZ1D3M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mainlining.org; spf=pass smtp.mailfrom=mainlining.org; dkim=pass (2048-bit key) header.d=mainlining.org header.i=@mainlining.org header.b=VNb1v8B6; arc=none smtp.client-ip=5.75.144.95 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mainlining.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mainlining.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mainlining.org header.i=@mainlining.org header.b="VNb1v8B6" Received: from [192.168.0.162] (254C1E29.nat.pool.telekom.hu [37.76.30.41]) by mail.mainlining.org (Postfix) with ESMTPSA id 8C2B5E45BD; Sat, 2 Nov 2024 22:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mainlining.org; s=psm; t=1730587178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aWlhsEsm/LLraQLpzm4h4Y3dCktYQ70fSrM1iKEi9dQ=; b=VNb1v8B6fWfvcfud38uz0Euj+w777SMNoW235H1+WwOkJsyokIsTDRcaL9CEMYVS7qqzdC ZUW3lV3wseE4jz3Zr8zwHAi3fK4A5XlvSQvNzkfAwGSHDyZpVku3HCcupDVQh3RDgZve1U Otql9mr9sWyA3NY/jDgFvy29Q9IHV1sqpqtb5I9UgbM7eHgMZgqUD3RZngNrclaRKcS0ef 27qUAn9H8DenYbNkEclMSXlRalHkLIPTJ4JqZu7wTO00ul6LQ5tnv+TLrMX49fpr/1WaPl H9j5mITWQJxPpkbJG1+1nN0c8RoNzYjRMFjrtWT+Vpkz6PeBQ4Yc3G/kL6wJqQ== From: =?utf-8?q?Barnab=C3=A1s_Cz=C3=A9m=C3=A1n?= Date: Sat, 02 Nov 2024 23:39:14 +0100 Subject: [PATCH v3 3/3] media: qcom: camss: Add MSM8953 resources Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241102-camss-msm8953-v3-3-7041c9fa7a58@mainlining.org> References: <20241102-camss-msm8953-v3-0-7041c9fa7a58@mainlining.org> In-Reply-To: <20241102-camss-msm8953-v3-0-7041c9fa7a58@mainlining.org> To: Robert Foss , Todor Tomov , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Barnabas Czeman Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Vladimir Lypak X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1730587174; l=10199; i=barnabas.czeman@mainlining.org; s=20240730; h=from:subject:message-id; bh=0ZFaFBNFOmvZEnGfKS4IFJZ6Ufox5bd2zyapf/sD3pA=; b=AZvnT3tK8lUSg7EQh+UVquWnRCMmFlOX7ilZ/vpuBTPzGQp+TXLWB6lpud1bW+UsAgxW2966i YOt4Bs26xpIDHS07Uf/RVMuDx2lUSX+HPpneWHF0tEK6gZyrDs3hCqA X-Developer-Key: i=barnabas.czeman@mainlining.org; a=ed25519; pk=TWUSIGgwW/Sn4xnX25nw+lszj1AT/A3bzkahn7EhOFc= From: Vladimir Lypak 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 Acked-by: Bryan O'Donoghue Signed-off-by: Barnab=C3=A1s Cz=C3=A9m=C3=A1n --- 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/med= ia/platform/qcom/camss/camss-csiphy.c index 68a3ea1ba2a5299cf28289dfdb958cfdff3c91e0..5af2b382a843c2b8857339ba289= 30fe1682c9412 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); =20 if (camss->res->version =3D=3D CAMSS_8x16 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D CAMSS_8x96) { csiphy->base_clk_mux =3D devm_platform_ioremap_resource_byname(pdev, res->reg[1]); diff --git a/drivers/media/platform/qcom/camss/camss-ispif.c b/drivers/medi= a/platform/qcom/camss/camss-ispif.c index a12dcc7ff438c55167bc2981fd399dbf178181df..2dc585c6123dd248a5bacd9c7a8= 8cb5375644311 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 =3D=3D CAMSS_8x96 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D 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) =20 mutex_lock(&ispif->config_lock); if (camss->res->version =3D=3D CAMSS_8x96 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D 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 =3D=3D CAMSS_8x16) ispif->line_num =3D 2; else if (camss->res->version =3D=3D CAMSS_8x96 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D CAMSS_660) ispif->line_num =3D 4; else @@ -1130,6 +1133,7 @@ int msm_ispif_subdev_init(struct camss *camss, ispif->line[i].nformats =3D ARRAY_SIZE(ispif_formats_8x16); } else if (camss->res->version =3D=3D CAMSS_8x96 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D CAMSS_660) { ispif->line[i].formats =3D ispif_formats_8x96; ispif->line[i].nformats =3D @@ -1162,6 +1166,7 @@ int msm_ispif_subdev_init(struct camss *camss, ret =3D devm_request_irq(dev, ispif->irq, ispif_isr_8x16, IRQF_TRIGGER_RISING, ispif->irq_name, ispif); else if (camss->res->version =3D=3D CAMSS_8x96 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D CAMSS_660) ret =3D 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..80a62ba11295042802cbaec617f= b87c492ea6a55 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, =20 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/plat= form/qcom/camss/camss.c index fabe034081ed0a7c0e0fcd8bc76c4eb396cb0067..9fb31f4c18adee886cd0bcf8443= 8a8f27635e07f 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_8x= 16[] =3D { } }; =20 +static const struct camss_subdev_resources csid_res_8x53[] =3D { + /* CSID0 */ + { + .regulators =3D { "vdda" }, + .clock =3D { "top_ahb", "ispif_ahb", "csi0_ahb", "ahb", + "csi0", "csi0_phy", "csi0_pix", "csi0_rdi" }, + .clock_rate =3D { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg =3D { "csid0" }, + .interrupt =3D { "csid0" }, + .csid =3D { + .hw_ops =3D &csid_ops_4_7, + .parent_dev_ops =3D &vfe_parent_dev_ops, + .formats =3D &csid_formats_4_7 + } + }, + + /* CSID1 */ + { + .regulators =3D { "vdda" }, + .clock =3D { "top_ahb", "ispif_ahb", "csi1_ahb", "ahb", + "csi1", "csi1_phy", "csi1_pix", "csi1_rdi" }, + .clock_rate =3D { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg =3D { "csid1" }, + .interrupt =3D { "csid1" }, + .csid =3D { + .hw_ops =3D &csid_ops_4_7, + .parent_dev_ops =3D &vfe_parent_dev_ops, + .formats =3D &csid_formats_4_7 + } + }, + + /* CSID2 */ + { + .regulators =3D { "vdda" }, + .clock =3D { "top_ahb", "ispif_ahb", "csi2_ahb", "ahb", + "csi2", "csi2_phy", "csi2_pix", "csi2_rdi" }, + .clock_rate =3D { { 0 }, + { 0 }, + { 0 }, + { 0 }, + { 100000000, 200000000, 310000000, + 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg =3D { "csid2" }, + .interrupt =3D { "csid2" }, + .csid =3D { + .hw_ops =3D &csid_ops_4_7, + .parent_dev_ops =3D &vfe_parent_dev_ops, + .formats =3D &csid_formats_4_7 + } + }, +}; + +static const struct camss_subdev_resources ispif_res_8x53 =3D { + /* ISPIF */ + .clock =3D { "top_ahb", "ahb", "ispif_ahb", + "csi0", "csi0_pix", "csi0_rdi", + "csi1", "csi1_pix", "csi1_rdi", + "csi2", "csi2_pix", "csi2_rdi" }, + .clock_for_reset =3D { "vfe0", "csi_vfe0", "vfe1", "csi_vfe1" }, + .reg =3D { "ispif", "csi_clk_mux" }, + .interrupt =3D { "ispif" }, +}; + +static const struct camss_subdev_resources vfe_res_8x53[] =3D { + /* VFE0 */ + { + .regulators =3D {}, + .clock =3D { "top_ahb", "ahb", "ispif_ahb", + "vfe0", "csi_vfe0", "vfe0_ahb", "vfe0_axi" }, + .clock_rate =3D { { 0 }, + { 0 }, + { 0 }, + { 50000000, 100000000, 133330000, + 160000000, 200000000, 266670000, + 310000000, 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg =3D { "vfe0" }, + .interrupt =3D { "vfe0" }, + .vfe =3D { + .line_num =3D 3, + .has_pd =3D true, + .pd_name =3D "vfe0", + .hw_ops =3D &vfe_ops_4_1, + .formats_rdi =3D &vfe_formats_rdi_8x16, + .formats_pix =3D &vfe_formats_pix_8x16 + } + }, + + /* VFE1 */ + { + .regulators =3D {}, + .clock =3D { "top_ahb", "ahb", "ispif_ahb", + "vfe1", "csi_vfe1", "vfe1_ahb", "vfe1_axi" }, + .clock_rate =3D { { 0 }, + { 0 }, + { 0 }, + { 50000000, 100000000, 133330000, + 160000000, 200000000, 266670000, + 310000000, 400000000, 465000000 }, + { 0 }, + { 0 }, + { 0 } }, + .reg =3D { "vfe1" }, + .interrupt =3D { "vfe1" }, + .vfe =3D { + .line_num =3D 3, + .has_pd =3D true, + .pd_name =3D "vfe1", + .hw_ops =3D &vfe_ops_4_1, + .formats_rdi =3D &vfe_formats_rdi_8x16, + .formats_pix =3D &vfe_formats_pix_8x16 + } + } +}; + +static const struct resources_icc icc_res_8x53[] =3D { + { + .name =3D "cam_ahb", + .icc_bw_tbl.avg =3D 38400, + .icc_bw_tbl.peak =3D 76800, + }, + { + .name =3D "cam_vfe0_mem", + .icc_bw_tbl.avg =3D 939524, + .icc_bw_tbl.peak =3D 1342177, + }, + { + .name =3D "cam_vfe1_mem", + .icc_bw_tbl.avg =3D 939524, + .icc_bw_tbl.peak =3D 1342177, + }, +}; + static const struct camss_subdev_resources csiphy_res_8x96[] =3D { /* CSIPHY0 */ { @@ -2248,6 +2402,7 @@ static int camss_probe(struct platform_device *pdev) return -ENOMEM; =20 if (camss->res->version =3D=3D CAMSS_8x16 || + camss->res->version =3D=3D CAMSS_8x53 || camss->res->version =3D=3D CAMSS_8x96) { camss->ispif =3D devm_kcalloc(dev, 1, sizeof(*camss->ispif), GFP_KERNEL); if (!camss->ispif) @@ -2389,6 +2544,20 @@ static const struct camss_resources msm8916_resource= s =3D { .link_entities =3D camss_link_entities }; =20 +static const struct camss_resources msm8953_resources =3D { + .version =3D CAMSS_8x53, + .icc_res =3D icc_res_8x53, + .icc_path_num =3D ARRAY_SIZE(icc_res_8x53), + .csiphy_res =3D csiphy_res_8x96, + .csid_res =3D csid_res_8x53, + .ispif_res =3D &ispif_res_8x53, + .vfe_res =3D vfe_res_8x53, + .csiphy_num =3D ARRAY_SIZE(csiphy_res_8x96), + .csid_num =3D ARRAY_SIZE(csid_res_8x53), + .vfe_num =3D ARRAY_SIZE(vfe_res_8x53), + .link_entities =3D camss_link_entities +}; + static const struct camss_resources msm8996_resources =3D { .version =3D CAMSS_8x96, .csiphy_res =3D csiphy_res_8x96, @@ -2455,6 +2624,7 @@ static const struct camss_resources sc8280xp_resource= s =3D { =20 static const struct of_device_id camss_dt_match[] =3D { { .compatible =3D "qcom,msm8916-camss", .data =3D &msm8916_resources }, + { .compatible =3D "qcom,msm8953-camss", .data =3D &msm8953_resources }, { .compatible =3D "qcom,msm8996-camss", .data =3D &msm8996_resources }, { .compatible =3D "qcom,sdm660-camss", .data =3D &sdm660_resources }, { .compatible =3D "qcom,sdm845-camss", .data =3D &sdm845_resources }, diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/plat= form/qcom/camss/camss.h index 0ce84fcbbd25c7825212beb74073ffd4c70858a8..9da7f48f5dd762d27521d449051= 892e956693970 100644 --- a/drivers/media/platform/qcom/camss/camss.h +++ b/drivers/media/platform/qcom/camss/camss.h @@ -78,6 +78,7 @@ enum pm_domain { =20 enum camss_version { CAMSS_8x16, + CAMSS_8x53, CAMSS_8x96, CAMSS_660, CAMSS_845, --=20 2.47.0