summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2013-10-14 01:27:27 +0200
committerLinus Walleij <linus.walleij@linaro.org>2013-10-16 15:33:51 +0200
commit6d0a4ed2b90a12e1403d3e7d9d8c2cc7fdc301b5 (patch)
treec0dbc851ce6e5171976d87d021e908fb4855ad34 /drivers/pinctrl
parent5aad0db1c1ebb0f5be79f0adbecc16a2f0259b21 (diff)
downloadop-kernel-dev-6d0a4ed2b90a12e1403d3e7d9d8c2cc7fdc301b5.zip
op-kernel-dev-6d0a4ed2b90a12e1403d3e7d9d8c2cc7fdc301b5.tar.gz
pinctrl: dove: unset twsi option3 for gconfig as well
This fixes a typo which left twsi config3 option enabled. Cc: stable@vger.kernel.org Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/mvebu/pinctrl-dove.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 29f7e4f..360b9b2 100644
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -335,7 +335,7 @@ static int dove_twsi_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1;
- gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION2);
+ gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION3);
switch (config) {
case 1:
OpenPOWER on IntegriCloud