From: kholk11@gmail.com
To: todor.too@gmail.com
Cc: agross@kernel.org, bjorn.andersson@linaro.org,
mchehab@kernel.org, robh+dt@kernel.org, marijns95@gmail.com,
konradybcio@gmail.com, martin.botka1@gmail.com,
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>
Subject: [PATCH 6/6] media: camss: csiphy: Set rate on csiX_phy clock on SDM630/660
Date: Sun, 18 Oct 2020 14:52:37 +0200 [thread overview]
Message-ID: <20201018125237.16717-7-kholk11@gmail.com> (raw)
In-Reply-To: <20201018125237.16717-1-kholk11@gmail.com>
From: AngeloGioacchino Del Regno <kholk11@gmail.com>
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.
Signed-off-by: AngeloGioacchino Del Regno <kholk11@gmail.com>
---
.../media/platform/qcom/camss/camss-csiphy.c | 22 ++++++++++++++++---
.../media/platform/qcom/camss/camss-csiphy.h | 1 +
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index c00f25aac21b..a5d717d022a5 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -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;
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
index 376f865ad383..f7967ef836dc 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy.h
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
@@ -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;
--
2.28.0
next prev parent reply other threads:[~2020-10-18 12:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-18 12:52 [PATCH 0/6] Add support for SDM630/660 Camera Subsystem kholk11
2020-10-18 12:52 ` [PATCH 1/6] media: camss: csiphy-3ph: Add support for SDM630/660 kholk11
2020-10-20 8:52 ` Robert Foss
2020-10-18 12:52 ` [PATCH 2/6] media: camss: ispif: Correctly reset based on the VFE ID kholk11
2020-10-20 8:59 ` Robert Foss
2020-10-20 9:02 ` Robert Foss
2020-10-22 17:08 ` AngeloGioacchino Del Regno
2020-10-18 12:52 ` [PATCH 3/6] media: camss: vfe: Add support for VFE 4.8 kholk11
2020-10-20 9:14 ` Robert Foss
2020-10-18 12:52 ` [PATCH 4/6] media: camss: Add support for SDM630/636/660 camera subsystem kholk11
2020-10-20 10:26 ` Robert Foss
2020-10-18 12:52 ` [PATCH 5/6] media: dt-bindings: media: qcom,camss: Add bindings for SDM660 camss kholk11
2020-10-20 10:34 ` Robert Foss
2020-10-18 12:52 ` kholk11 [this message]
2020-10-20 10:35 ` [PATCH 6/6] media: camss: csiphy: Set rate on csiX_phy clock on SDM630/660 Robert Foss
2020-10-20 12:01 ` [PATCH 0/6] Add support for SDM630/660 Camera Subsystem 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=20201018125237.16717-7-kholk11@gmail.com \
--to=kholk11@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=marijns95@gmail.com \
--cc=martin.botka1@gmail.com \
--cc=mchehab@kernel.org \
--cc=robh+dt@kernel.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).