pinctrl: baytrail: show output gpio state correctly on Intel Baytrail
diff mbox

Message ID 1413224639-21552-1-git-send-email-david.a.cohen@linux.intel.com
State Not Applicable
Headers show

Commit Message

David Cohen Oct. 13, 2014, 6:23 p.m. UTC
Even if a gpio pin is set to output, we still need to set INPUT_EN bit
to be able to read its value. Without this change, we'll always read low
level state.

Cc: <stable@vger.kernel.org> # v3.14+
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
---

Hi,

I'm resending same v1 patch but now copying linux stable and linux gpio.
This patch is meant for all linux stable trees >= v3.14.

Br, David
---

 drivers/pinctrl/pinctrl-baytrail.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch
diff mbox

diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c
index e12e5b07f6d7..c23d8ded936d 100644
--- a/drivers/pinctrl/pinctrl-baytrail.c
+++ b/drivers/pinctrl/pinctrl-baytrail.c
@@ -318,7 +318,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);