1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 6ec82f76f019..e8198dd68615 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -232,7 +232,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)