summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Cohen <david.a.cohen@linux.intel.com>2014-10-14 19:54:37 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-10-28 11:16:26 +0100
commitd90c33818967c5e5371961604ad98b4dea4fa3f4 (patch)
tree977bffd928f148af7248209166c282e16aeb3dac /drivers
parentpinctrl: use linux-gpio mailing list (diff)
downloadlinux-d90c33818967c5e5371961604ad98b4dea4fa3f4.tar.xz
linux-d90c33818967c5e5371961604ad98b4dea4fa3f4.zip
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
Even if a gpio pin is set to output, we still need to set INPUT_EN functionality (by clearing INPUT_EN bit) to be able to read the pin's level. E.g. without this change, we'll always read low level state from sysfs. Cc: <stable@vger.kernel.org> # v3.14+ Cc: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: David Cohen <david.a.cohen@linux.intel.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pinctrl/pinctrl-baytrail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c
index b83ec87c71fe..9dc38140194b 100644
--- a/drivers/pinctrl/pinctrl-baytrail.c
+++ b/drivers/pinctrl/pinctrl-baytrail.c
@@ -322,7 +322,7 @@ static int byt_gpio_direction_output(struct gpio_chip *chip,
"Potential Error: Setting GPIO with direct_irq_en to output");
reg_val = readl(reg) | BYT_DIR_MASK;
- reg_val &= ~BYT_OUTPUT_EN;
+ reg_val &= ~(BYT_OUTPUT_EN | BYT_INPUT_EN);
if (value)
writel(reg_val | BYT_LEVEL, reg);