Skip to content

Commit

Permalink
OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+
Browse files Browse the repository at this point in the history
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: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
  • Loading branch information
Mika Westerberg authored and Kevin Hilman committed Jan 7, 2011
1 parent dda0aea commit f7c5cc4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/plat-omap/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f7c5cc4

Please sign in to comment.