| From d90c33818967c5e5371961604ad98b4dea4fa3f4 Mon Sep 17 00:00:00 2001 |
| From: David Cohen <david.a.cohen@linux.intel.com> |
| Date: Tue, 14 Oct 2014 10:54:37 -0700 |
| Subject: pinctrl: baytrail: show output gpio state correctly on Intel Baytrail |
| |
| From: David Cohen <david.a.cohen@linux.intel.com> |
| |
| 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> |
| |
| --- |
| drivers/pinctrl/pinctrl-baytrail.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pinctrl/pinctrl-baytrail.c |
| +++ b/drivers/pinctrl/pinctrl-baytrail.c |
| @@ -318,7 +318,7 @@ static int byt_gpio_direction_output(str |
| "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); |
