[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Werner Almesberger]

The following commit has been merged in the andy-tracking branch:
commit dfc46239a6500e269a90cd51bb6d378c15b91aaa
Author: Matt Hsu <matt_hsu at openmoko.org>
Date:   Thu Mar 12 22:38:25 2009 +0800

    S3C64XX: Add gpio_to_irq method for external interrupt group.
    
    Add to_irq method to convert gpio to irq
    for external interrupt group (GPN).
    
    Signed-off-by: Matt Hsu <matt_hsu at openmoko.org>

diff --git a/arch/arm/plat-s3c64xx/gpiolib.c b/arch/arm/plat-s3c64xx/gpiolib.c
index 09bd681..6bb96d8 100644
--- a/arch/arm/plat-s3c64xx/gpiolib.c
+++ b/arch/arm/plat-s3c64xx/gpiolib.c
@@ -18,6 +18,7 @@
 
 #include <mach/map.h>
 #include <mach/gpio.h>
+#include <mach/irqs.h>
 #include <mach/gpio-core.h>
 
 #include <plat/gpio-cfg.h>
@@ -321,6 +322,11 @@ static struct s3c_gpio_cfg gpio_2bit_cfg_eint11 = {
 	.get_pull	= s3c_gpio_getpull_updown,
 };
 
+static int s3c_gpiolib_bankn_toirq(struct gpio_chip *chip, unsigned offset)
+{
+	return S3C_EINT(0) + offset;
+}
+
 static struct s3c_gpio_chip gpio_2bit[] = {
 	{
 		.base	= S3C64XX_GPF_BASE,
@@ -353,6 +359,7 @@ static struct s3c_gpio_chip gpio_2bit[] = {
 			.base	= S3C64XX_GPN(0),
 			.ngpio	= S3C64XX_GPIO_N_NR,
 			.label	= "GPN",
+			.to_irq = s3c_gpiolib_bankn_toirq,
 		},
 	}, {
 		.base	= S3C64XX_GPO_BASE,

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko