Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7c5cc45 authored by Mika Westerberg's avatar Mika Westerberg Committed by Kevin Hilman
Browse files

OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+ 



In case on OMAP2+ we call set_24xx_gpio_triggering() instead of
updating reg and l values. However, at the end of the function we
perform a write:

	__raw_writel(l, reg);

So on OMAP2+ we end up writing 0 to the bank->base which is not
correct (typically this points to GPIO_REVISION register).

Fix this by returning immediately after call to
set_24xx_gpio_triggering().

Signed-off-by: default avatarMika Westerberg <ext-mika.1.westerberg@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent dda0aea7

arch/arm/plat-omap/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) 
	case METHOD_GPIO_24XX:

	case METHOD_GPIO_44XX:

		set_24xx_gpio_triggering(bank, gpio, trigger);

		break;

		return 0;

#endif

	default:

		goto bad;