From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Sat, 27 Oct 2012 09:17:46 +0000 (+0530)
Subject: pinctrl: SPEAr: Don't update all non muxreg bits on pinctrl_disable
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b53fa35355725b5130b8e73309995c4d4b4868b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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);
 		}
 	}