diff options
| author | David Cohen <david.a.cohen@linux.intel.com> | 2014-10-14 10:54:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 09:00:12 -0800 |
| commit | 36bad412b85554d7c7f7372560d113c8f20fa8c9 (patch) | |
| tree | 1a142bf1bdd835446426b4906ed9e6d860206e75 | |
| parent | 77a16ea5d9f0a4249ce57c1eca8c4646ef99acbd (diff) | |
| download | linux-stable-36bad412b85554d7c7f7372560d113c8f20fa8c9.tar.gz linux-stable-36bad412b85554d7c7f7372560d113c8f20fa8c9.tar.bz2 linux-stable-36bad412b85554d7c7f7372560d113c8f20fa8c9.zip | |
pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
commit d90c33818967c5e5371961604ad98b4dea4fa3f4 upstream.
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/pinctrl/pinctrl-baytrail.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c index 665b96bc0c3a..eb9f1906952a 100644 --- a/drivers/pinctrl/pinctrl-baytrail.c +++ b/drivers/pinctrl/pinctrl-baytrail.c @@ -263,7 +263,7 @@ static int byt_gpio_direction_output(struct gpio_chip *chip, spin_lock_irqsave(&vg->lock, flags); 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); |