diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2013-10-13 19:27:27 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-16 09:33:51 -0400 |
commit | 6d0a4ed2b90a12e1403d3e7d9d8c2cc7fdc301b5 (patch) | |
tree | c0dbc851ce6e5171976d87d021e908fb4855ad34 /drivers/pinctrl | |
parent | 5aad0db1c1ebb0f5be79f0adbecc16a2f0259b21 (diff) |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c index 29f7e4fc7ca5..360b9b236b34 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, | |||
335 | unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2); | 335 | unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2); |
336 | 336 | ||
337 | gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1; | 337 | gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1; |
338 | gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION2); | 338 | gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION3); |
339 | 339 | ||
340 | switch (config) { | 340 | switch (config) { |
341 | case 1: | 341 | case 1: |