ARM: OMAP: Support all four OMAP1610 GPIO trigger modes

(proposed by David Brownell)

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index a4afa1ef1f652d21711382ab7114c3416a9b5c0a..d3c8ea7eecfd216846d5b2f94161d721e17b2d20 100644 (file)
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -452,10 +452,8 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
                l &= ~(3 << (gpio << 1));
                if (trigger & __IRQT_RISEDGE)
                        l |= 2 << (gpio << 1);
-               else if (trigger & __IRQT_FALEDGE)
+               if (trigger & __IRQT_FALEDGE)
                        l |= 1 << (gpio << 1);
-               else
-                       goto bad;
                break;
        case METHOD_GPIO_730:
                reg += OMAP730_GPIO_INT_CONTROL;