gpio-rcar: Use OUTDT when reading GPIOs configured as output

Testing on r8a7790 shows that INDT does not indicate the correct
pin state when reading a GPIO configured as output, so update
the gpio_rcar_get() function to handle this case.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index b4ca450947b8f4b8f041c35ddfb9e21dde797487..6b78ad96d3d44cc0ff26a3bfced2d5365fb3a5fb 100644 (file)
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -214,7 +214,14 @@ static int gpio_rcar_direction_input(struct gpio_chip *chip, unsigned offset)
 
 static int gpio_rcar_get(struct gpio_chip *chip, unsigned offset)
 {
-       return (int)(gpio_rcar_read(gpio_to_priv(chip), INDT) & BIT(offset));
+       u32 bit = BIT(offset);
+
+       /* testing on r8a7790 shows that INDT does not show correct pin state
+        * when configured as output, so use OUTDT in case of output pins */
+       if (gpio_rcar_read(gpio_to_priv(chip), INOUTSEL) & bit)
+               return (int)(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
+       else
+               return (int)(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
 }
 
 static void gpio_rcar_set(struct gpio_chip *chip, unsigned offset, int value)