Skip to content

Commit

Permalink
pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable
Browse files Browse the repository at this point in the history
Not all bits of a register are used for pinctrl in SPEAr. So only update bits
relevant to pinctrl using muxreg->mask.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Viresh Kumar authored and Linus Walleij committed Nov 5, 2012
1 parent 8f0d816 commit 0b53fa3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pinctrl/spear/pinctrl-spear.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ static int spear_pinctrl_endisable(struct pinctrl_dev *pctldev,
else
temp = ~muxreg->val;

val |= temp;
val |= muxreg->mask & temp;
pmx_writel(pmx, val, muxreg->reg);
}
}
Expand Down

0 comments on commit 0b53fa3

Please sign in to comment.