]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
pinctrl: ingenic: Properly detect GPIO direction when configured for IRQ
authorPaul Cercueil <paul@crapouillou.net>
Mon, 22 Jun 2020 21:45:48 +0000 (23:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 11:05:29 +0000 (13:05 +0200)
commit 84e7a946da71f678affacea301f6d5cb4d9784e8 upstream.

The PAT1 register contains information about the IRQ type (edge/level)
for input GPIOs with IRQ enabled, and the direction for non-IRQ GPIOs.
So it makes sense to read it only if the GPIO has no interrupt
configured, otherwise input GPIOs configured for level IRQs are
misdetected as output GPIOs.

Fixes: ebd6651418b6 ("pinctrl: ingenic: Implement .get_direction for GPIO chips")
Reported-by: João Henrique <johnnyonflame@hotmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200622214548.265417-2-paul@crapouillou.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/pinctrl/pinctrl-ingenic.c

index e5600f65709bb66493c6c71ffada86049907dbe2..8bd0a078bfc47884cb24108337950071ff21c8be 100644 (file)
@@ -1644,7 +1644,8 @@ static int ingenic_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
        unsigned int pin = gc->base + offset;
 
        if (jzpc->version >= ID_JZ4760)
-               return ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1);
+               return ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_INT) ||
+                       ingenic_get_pin_config(jzpc, pin, JZ4760_GPIO_PAT1);
 
        if (ingenic_get_pin_config(jzpc, pin, JZ4740_GPIO_SELECT))
                return true;