From: Robert Foss <robert.foss@linaro.org>
To: agross@kernel.org, bjorn.andersson@linaro.org,
robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org,
robh+dt@kernel.org, angelogioacchino.delregno@somainline.org,
linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
AngeloGioacchino Del Regno <kholk11@gmail.com>,
Sakari Ailus <sakari.ailus@iki.fi>,
Andrey Konovalov <andrey.konovalov@linaro.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: Rob Herring <robh@kernel.org>, Tomasz Figa <tfiga@chromium.org>,
Azam Sadiq Pasha Kapatrala Syed <akapatra@quicinc.com>,
Sarvesh Sridutt <Sarvesh.Sridutt@smartwirelesscompute.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Jonathan Marek <jonathan@marek.ca>
Subject: [PATCH v8 13/22] media: camss: Enable SDM845
Date: Mon, 15 Mar 2021 16:59:34 +0100 [thread overview]
Message-ID: <20210315155942.640889-14-robert.foss@linaro.org> (raw)
In-Reply-To: <20210315155942.640889-1-robert.foss@linaro.org>
Enable support for SDM845 based Titan 170 ISPs.
Signed-off-by: Robert Foss <robert.foss@linaro.org>
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
---
Changes since v5:
- Andrey: Add r-b
drivers/media/platform/qcom/camss/camss.c | 17 +++++++++++++++++
drivers/media/platform/qcom/camss/camss.h | 6 ++++--
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 9b23285d1c20..ef100d5f7763 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -939,6 +939,12 @@ static int camss_init_subdevices(struct camss *camss)
csid_res = csid_res_660;
ispif_res = &ispif_res_660;
vfe_res = vfe_res_660;
+ } else if (camss->version == CAMSS_845) {
+ csiphy_res = csiphy_res_845;
+ csid_res = csid_res_845;
+ /* Titan VFEs don't have an ISPIF */
+ ispif_res = NULL;
+ vfe_res = vfe_res_845;
} else {
return -EINVAL;
}
@@ -1244,6 +1250,8 @@ static int camss_configure_pd(struct camss *camss)
if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660)
nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;
+ else if (camss->version == CAMSS_845)
+ nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;
for (i = 0; i < nbr_pm_domains; i++) {
camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i);
@@ -1312,6 +1320,12 @@ static int camss_probe(struct platform_device *pdev)
camss->csiphy_num = 3;
camss->csid_num = 4;
camss->vfe_num = 2;
+ } else if (of_device_is_compatible(dev->of_node,
+ "qcom,sdm845-camss")) {
+ camss->version = CAMSS_845;
+ camss->csiphy_num = 4;
+ camss->csid_num = 3;
+ camss->vfe_num = 3;
} else {
ret = -EINVAL;
goto err_free;
@@ -1443,6 +1457,8 @@ void camss_delete(struct camss *camss)
if (camss->version == CAMSS_8x96 ||
camss->version == CAMSS_660)
nbr_pm_domains = PM_DOMAIN_GEN1_COUNT;
+ else if (camss->version == CAMSS_845)
+ nbr_pm_domains = PM_DOMAIN_GEN2_COUNT;
for (i = 0; i < nbr_pm_domains; i++) {
device_link_del(camss->genpd_link[i]);
@@ -1476,6 +1492,7 @@ static const struct of_device_id camss_dt_match[] = {
{ .compatible = "qcom,msm8916-camss" },
{ .compatible = "qcom,msm8996-camss" },
{ .compatible = "qcom,sdm660-camss" },
+ { .compatible = "qcom,sdm845-camss" },
{ }
};
diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 33ed16ab821d..dc8b4154f92b 100644
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -60,6 +60,8 @@ enum pm_domain {
PM_DOMAIN_VFE0 = 0,
PM_DOMAIN_VFE1 = 1,
PM_DOMAIN_GEN1_COUNT = 2, /* CAMSS series of ISPs */
+ PM_DOMAIN_VFELITE = 2, /* VFELITE / TOP GDSC */
+ PM_DOMAIN_GEN2_COUNT = 3, /* Titan series of ISPs */
};
enum camss_version {
@@ -83,8 +85,8 @@ struct camss {
int vfe_num;
struct vfe_device *vfe;
atomic_t ref_count;
- struct device *genpd[PM_DOMAIN_GEN1_COUNT];
- struct device_link *genpd_link[PM_DOMAIN_GEN1_COUNT];
+ struct device *genpd[PM_DOMAIN_GEN2_COUNT];
+ struct device_link *genpd_link[PM_DOMAIN_GEN2_COUNT];
};
struct camss_camera_interface {
--
2.27.0
next prev parent reply other threads:[~2021-03-15 16:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 15:59 [PATCH v8 00/22] Add support for the SDM845 Camera Subsystem Robert Foss
2021-03-15 15:59 ` [PATCH v8 01/22] media: camss: Fix vfe_isr_comp_done() documentation Robert Foss
2021-03-15 15:59 ` [PATCH v8 02/22] media: camss: Fix vfe_isr comment typo Robert Foss
2021-03-15 15:59 ` [PATCH v8 03/22] media: camss: Replace trace_printk() with dev_dbg() Robert Foss
2021-03-15 15:59 ` [PATCH v8 04/22] media: camss: Add CAMSS_845 camss version Robert Foss
2021-03-15 15:59 ` [PATCH v8 05/22] media: camss: Make ISPIF subdevice optional Robert Foss
2021-03-15 15:59 ` [PATCH v8 07/22] media: camss: Add support for VFE hardware version Titan 170 Robert Foss
2021-03-15 15:59 ` [PATCH v8 08/22] media: camss: Add missing format identifiers Robert Foss
2021-03-15 15:59 ` [PATCH v8 09/22] media: camss: Refactor CSID HW version support Robert Foss
2021-03-16 9:36 ` Hans Verkuil
2021-03-16 11:12 ` Robert Foss
2021-03-15 15:59 ` [PATCH v8 10/22] media: camss: Add support for CSID hardware version Titan 170 Robert Foss
2021-03-15 15:59 ` [PATCH v8 11/22] media: camss: Add support for CSIPHY " Robert Foss
2021-03-15 15:59 ` [PATCH v8 12/22] media: camss: Refactor VFE power domain toggling Robert Foss
2021-03-15 15:59 ` Robert Foss [this message]
2021-03-15 15:59 ` [PATCH v8 14/22] dt-bindings: media: camss: Add qcom,msm8916-camss binding Robert Foss
2021-03-15 15:59 ` [PATCH v8 15/22] dt-bindings: media: camss: Add qcom,msm8996-camss binding Robert Foss
2021-03-15 15:59 ` [PATCH v8 16/22] dt-bindings: media: camss: Add qcom,sdm660-camss binding Robert Foss
2021-03-15 15:59 ` [PATCH v8 17/22] dt-bindings: media: camss: Add qcom,sdm845-camss binding Robert Foss
2021-03-15 15:59 ` [PATCH v8 18/22] MAINTAINERS: Change CAMSS documentation to use dtschema bindings Robert Foss
2021-03-15 15:59 ` [PATCH v8 19/22] media: dt-bindings: media: Remove qcom,camss documentation Robert Foss
2021-03-15 15:59 ` [PATCH v8 20/22] arm64: dts: sdm845: Add CAMSS ISP node Robert Foss
2021-03-15 15:59 ` [PATCH v8 21/22] arm64: dts: sdm845-db845c: Configure regulators for camss node Robert Foss
2021-03-15 15:59 ` [PATCH v8 22/22] arm64: dts: sdm845-db845c: Enable ov8856 sensor and connect to ISP Robert Foss
[not found] ` <20210315155942.640889-7-robert.foss@linaro.org>
2021-03-16 9:40 ` [PATCH v8 06/22] media: camss: Refactor VFE HW version support Hans Verkuil
2021-03-16 11:02 ` Robert Foss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315155942.640889-14-robert.foss@linaro.org \
--to=robert.foss@linaro.org \
--cc=Sarvesh.Sridutt@smartwirelesscompute.com \
--cc=agross@kernel.org \
--cc=akapatra@quicinc.com \
--cc=andrey.konovalov@linaro.org \
--cc=angelogioacchino.delregno@somainline.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=hverkuil@xs4all.nl \
--cc=jonathan@marek.ca \
--cc=kholk11@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sakari.ailus@iki.fi \
--cc=tfiga@chromium.org \
--cc=todor.too@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).