diff options
| author | Viresh Kumar <viresh.kumar@linaro.org> | 2012-10-27 11:17:46 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 12:33:34 +0100 |
| commit | 0b53fa35355725b5130b8e73309995c4d4b4868b (patch) | |
| tree | 0b80b5b1dfadb25498b200fc688e3e8ec29f86dc /drivers/pinctrl | |
| parent | Linux 3.7-rc3 (diff) | |
| download | linux-0b53fa35355725b5130b8e73309995c4d4b4868b.tar.xz linux-0b53fa35355725b5130b8e73309995c4d4b4868b.zip | |
pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c index 5d4f44f462f0..b1fd6ee33c6c 100644 --- a/drivers/pinctrl/spear/pinctrl-spear.c +++ b/drivers/pinctrl/spear/pinctrl-spear.c @@ -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); } } |