From: John Crispin <john@phrozen.org>
To: Linus Walleij <linus.walleij@linaro.org>,
Stephen Boyd <stephen.boyd@linaro.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
John Crispin <john@phrozen.org>
Subject: [PATCH] pinctrl: qcom: fix masking of pinmux functions
Date: Mon, 12 Sep 2016 11:36:55 +0200 [thread overview]
Message-ID: <1473673015-33124-1-git-send-email-john@phrozen.org> (raw)
The following commit introduced a regression by not properly masking the
calculated value.
commit 47a01ee9a6c39fe1 ("pinctrl: qcom: Clear all function selection bits")
Signed-off-by: John Crispin <john@phrozen.org>
---
drivers/pinctrl/qcom/pinctrl-msm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index 51c42d7..775c883 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -156,7 +156,7 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev,
spin_lock_irqsave(&pctrl->lock, flags);
val = readl(pctrl->regs + g->ctl_reg);
- val &= mask;
+ val &= ~mask;
val |= i << g->mux_bit;
writel(val, pctrl->regs + g->ctl_reg);
--
1.7.10.4
next reply other threads:[~2016-09-12 9:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 9:36 John Crispin [this message]
2016-09-26 6:36 ` [PATCH] pinctrl: qcom: fix masking of pinmux functions Stephen Boyd
2016-09-26 15:52 ` Bjorn Andersson
2016-10-03 13:31 ` Linus Walleij
2016-10-03 14:24 ` John Crispin
2016-10-03 22:38 ` Linus Walleij
2016-10-03 20:53 ` Stephen Boyd
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=1473673015-33124-1-git-send-email-john@phrozen.org \
--to=john@phrozen.org \
--cc=bjorn.andersson@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stephen.boyd@linaro.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