From: Juha Yrjola <juha.yrjola@nokia.com>
Date: Wed, 8 Feb 2006 15:56:22 +0000 (+0200)
Subject: ARM: OMAP: Fix GPIO IRQ edge control setting for OMAP16xx
X-Git-Tag: v2.6.16-omap1~95^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c507249d0b0148a65f66e0195550df99d69213a8;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix GPIO IRQ edge control setting for OMAP16xx

Signed-off-by: Juha Yrjölä <juha.yrjola@nokia.com>
---

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 861f5536ff6..a4afa1ef1f6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -451,9 +451,9 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
 		l = __raw_readl(reg);
 		l &= ~(3 << (gpio << 1));
 		if (trigger & __IRQT_RISEDGE)
-			l |= 2 << gpio;
+			l |= 2 << (gpio << 1);
 		else if (trigger & __IRQT_FALEDGE)
-			l |= 1 << gpio;
+			l |= 1 << (gpio << 1);
 		else
 			goto bad;
 		break;