From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org,
hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com,
rfoss@kernel.org, todor.too@gmail.com, agross@kernel.org,
andersson@kernel.org, konrad.dybcio@linaro.org,
mchehab@kernel.org, sakari.ailus@linux.intel.com,
andrey.konovalov@linaro.org
Cc: linux-kernel@vger.kernel.org,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Subject: [RESEND PATCH v6 11/17] media: qcom: camss: Allow clocks vfeN vfe_liteN or vfe_lite
Date: Mon, 25 Sep 2023 16:47:01 +0100 [thread overview]
Message-ID: <20230925154707.837542-12-bryan.odonoghue@linaro.org> (raw)
In-Reply-To: <20230925154707.837542-1-bryan.odonoghue@linaro.org>
The number of Video Front End - VFE or Image Front End - IFE supported
with new SoCs can vary both for the full and lite cases.
For example sdm845 has one vfe_lite and two vfe interfaces with the vfe
clock called simply "vfe_lite" with no integer postfix. sc8280xp has four
vfe and four vfe lite blocks.
At the moment we declare vfe_lite0 and vfe_lite1 for sm8250 but never set
those clocks because we don't match the strings.
We need to support the following clock name formats
- vfeN
- vfe_liteN
- vfe_lite
with N being any reasonably sized integer.
There are two sites in this code which need to do the same thing,
constructing and matching strings with the pattern above, so encapsulate
the logic in one function.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
drivers/media/platform/qcom/camss/camss-vfe.c | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index db8f68819ded9..4db0d0a1c6a51 100644
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -431,6 +431,20 @@ void vfe_isr_reset_ack(struct vfe_device *vfe)
complete(&vfe->reset_complete);
}
+static int vfe_match_clock_names(struct vfe_device *vfe,
+ struct camss_clock *clock)
+{
+ char vfe_name[7]; /* vfeXXX\0 */
+ char vfe_lite_name[12]; /* vfe_liteXXX\0 */
+
+ snprintf(vfe_name, sizeof(vfe_name), "vfe%d", vfe->id);
+ snprintf(vfe_lite_name, sizeof(vfe_lite_name), "vfe_lite%d", vfe->id);
+
+ return (!strcmp(clock->name, vfe_name) ||
+ !strcmp(clock->name, vfe_lite_name) ||
+ !strcmp(clock->name, "vfe_lite"));
+}
+
/*
* vfe_set_clock_rates - Calculate and set clock rates on VFE module
* @vfe: VFE device
@@ -454,9 +468,7 @@ static int vfe_set_clock_rates(struct vfe_device *vfe)
for (i = 0; i < vfe->nclocks; i++) {
struct camss_clock *clock = &vfe->clock[i];
- if (!strcmp(clock->name, "vfe0") ||
- !strcmp(clock->name, "vfe1") ||
- !strcmp(clock->name, "vfe_lite")) {
+ if (vfe_match_clock_names(vfe, clock)) {
u64 min_rate = 0;
long rate;
@@ -537,9 +549,7 @@ static int vfe_check_clock_rates(struct vfe_device *vfe)
for (i = 0; i < vfe->nclocks; i++) {
struct camss_clock *clock = &vfe->clock[i];
- if (!strcmp(clock->name, "vfe0") ||
- !strcmp(clock->name, "vfe1") ||
- !strcmp(clock->name, "vfe_lite")) {
+ if (vfe_match_clock_names(vfe, clock)) {
u64 min_rate = 0;
unsigned long rate;
--
2.42.0
next prev parent reply other threads:[~2023-09-25 15:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 15:46 [RESEND PATCH v6 00/17] media: qcom: camss: Add parameter passing to remove several outstanding bugs Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 01/17] media: qcom: camss: Amalgamate struct resource with struct resource_ispif Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 02/17] media: qcom: camss: Rename camss struct resources to camss_subdev_resources Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 03/17] media: qcom: camss: Start to move to module compat matched resources Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 04/17] media: qcom: camss: Pass icc bandwidth table as a platform parameter Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 05/17] media: qcom: camss: Pass remainder of variables as resources Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 06/17] media: qcom: camss: Pass line_num from compat resources Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 07/17] media: qcom: camss: Pass CAMSS subdev callbacks via resource ops pointer Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 08/17] media: qcom: camss: Assign the correct number of RDIs per VFE Bryan O'Donoghue
2023-09-25 15:46 ` [RESEND PATCH v6 09/17] media: qcom: camss: Remove special case for VFE get/put Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 10/17] media: qcom: camss: Untangle if/else spaghetti in camss Bryan O'Donoghue
2023-09-25 15:47 ` Bryan O'Donoghue [this message]
2023-09-25 15:47 ` [RESEND PATCH v6 12/17] media: qcom: camss: Functionally decompose CSIPHY clock lookups Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 13/17] media: qcom: camss: Fix support for setting CSIPHY clock name csiphyX Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 14/17] media: qcom: camss: Support RDI3 for VFE 17x Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 15/17] media: qcom: camss: Move vfe_disable into a common routine where applicable Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 16/17] media: qcom: camss: Propagate vfe_reset error up the callstack Bryan O'Donoghue
2023-09-25 15:47 ` [RESEND PATCH v6 17/17] media: qcom: camss: Comment CSID dt_id field Bryan O'Donoghue
2023-09-27 11:42 ` Hans Verkuil
2023-09-27 12:03 ` Bryan O'Donoghue
2023-09-27 12:05 ` Hans Verkuil
2023-09-28 0:58 ` [PATCH v6.1] " Bryan O'Donoghue
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=20230925154707.837542-12-bryan.odonoghue@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=hverkuil@xs4all.nl \
--cc=konrad.dybcio@linaro.org \
--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=rfoss@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--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
all inboxes | Powered by JetHome®