Skip to content

Commit

Permalink
pinctrl: qcom: fix masking of pinmux functions
Browse files Browse the repository at this point in the history
The following commit introduced a regression by not properly masking the
calculated value.

Fixes: 47a01ee ("pinctrl: qcom: Clear all function selection bits")
Signed-off-by: John Crispin <john@phrozen.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
John Crispin authored and Linus Walleij committed Oct 3, 2016
1 parent 8d0a0ac commit 6bcf3f6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pinctrl/qcom/pinctrl-msm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 6bcf3f6

Please sign in to comment.