From: Mukesh Ojha <quic_mojha@quicinc.com>
To: <agross@kernel.org>, <andersson@kernel.org>,
<konrad.dybcio@linaro.org>, <linus.walleij@linaro.org>
Cc: <linux-arm-msm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-gpio@vger.kernel.org>,
Mukesh Ojha <quic_mojha@quicinc.com>
Subject: [PATCH v6 2/5] pinctrl: qcom: Use qcom_scm_io_update_field()
Date: Wed, 29 Mar 2023 13:16:49 +0530 [thread overview]
Message-ID: <1680076012-10785-3-git-send-email-quic_mojha@quicinc.com> (raw)
In-Reply-To: <1680076012-10785-1-git-send-email-quic_mojha@quicinc.com>
Use qcom_scm_io_update_field() exported function introduced
in last commit.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com>
---
drivers/pinctrl/qcom/pinctrl-msm.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index daeb79a..6e1a5e4 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -1016,6 +1016,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
unsigned long flags;
bool was_enabled;
u32 val;
+ u32 mask;
if (msm_gpio_needs_dual_edge_parent_workaround(d, type)) {
set_bit(d->hwirq, pctrl->dual_edge_irqs);
@@ -1049,23 +1050,19 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
* With intr_target_use_scm interrupts are routed to
* application cpu using scm calls.
*/
+ mask = (7 << g->intr_target_bit);
if (pctrl->intr_target_use_scm) {
u32 addr = pctrl->phys_base[0] + g->intr_target_reg;
int ret;
- qcom_scm_io_readl(addr, &val);
-
- val &= ~(7 << g->intr_target_bit);
- val |= g->intr_target_kpss_val << g->intr_target_bit;
-
- ret = qcom_scm_io_writel(addr, val);
+ ret = qcom_scm_io_update_field(addr, mask, g->intr_target_kpss_val);
if (ret)
dev_err(pctrl->dev,
"Failed routing %lu interrupt to Apps proc",
d->hwirq);
} else {
val = msm_readl_intr_target(pctrl, g);
- val &= ~(7 << g->intr_target_bit);
+ val &= ~mask;
val |= g->intr_target_kpss_val << g->intr_target_bit;
msm_writel_intr_target(val, pctrl, g);
}
--
2.7.4
next prev parent reply other threads:[~2023-03-29 7:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 7:46 [PATCH v6 0/5] Refactor to support multiple download mode Mukesh Ojha
2023-03-29 7:46 ` [PATCH v6 1/5] firmware: qcom_scm: provide a read-modify-write function Mukesh Ojha
2023-05-26 22:00 ` andy.shevchenko
2023-03-29 7:46 ` Mukesh Ojha [this message]
2023-05-26 22:02 ` [PATCH v6 2/5] pinctrl: qcom: Use qcom_scm_io_update_field() andy.shevchenko
2023-03-29 7:46 ` [PATCH v6 3/5] firmware: scm: Modify only the download bits in TCSR register Mukesh Ojha
2023-05-26 20:17 ` Bjorn Andersson
2023-03-29 7:46 ` [PATCH v6 4/5] firmware: qcom_scm: Refactor code to support multiple download mode Mukesh Ojha
2023-05-26 22:08 ` andy.shevchenko
2023-06-26 16:27 ` Mukesh Ojha
2023-06-26 17:12 ` Andy Shevchenko
2023-03-29 7:46 ` [PATCH v6 5/5] firmware: qcom_scm: Add multiple download mode support Mukesh Ojha
2023-05-26 22:14 ` andy.shevchenko
2023-05-26 23:36 ` Bjorn Andersson
2023-05-27 7:22 ` Andy Shevchenko
2023-04-10 14:34 ` [PATCH v6 0/5] Refactor to support multiple download mode Mukesh Ojha
2023-05-26 22:15 ` andy.shevchenko
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=1680076012-10785-3-git-send-email-quic_mojha@quicinc.com \
--to=quic_mojha@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).