aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWerner Almesberger <werner@openmoko.org>2008-12-08 16:40:32 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-08 16:40:32 +0000
commitcf97ca4b1c88e0c427d847f6a2faf5b4b33882a5 (patch)
treec6163f87795a818b5c124b9a1d6843d73bec2abe /arch
parent1e3a171e17224fc4e409b9ed03674cef3f99def3 (diff)
[PATCH 2_3] S3C24xx: make GPIOs end at H10.eml
S3C24xx: make GPIOs end at H10 At least on 2410 and 2442, GPIOs don't end at G10 but at H10 or even J12. Port J is treated as a special case throughout much of the S3C code, so I'm not sure what the plan is for it now. However, it seems safe to include port H. Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/gpio-core.h2
-rw-r--r--arch/arm/plat-s3c24xx/gpiolib.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
index 6c9fbb99ef1..51bc7d1fb5a 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
@@ -24,7 +24,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
{
struct s3c_gpio_chip *chip;
- if (pin > S3C2410_GPG10)
+ if (pin > S3C2410_GPH10)
return NULL;
chip = &s3c24xx_gpios[pin/32];
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c
index 3679323a69c..9f459627b88 100644
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -133,6 +133,16 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
.ngpio = 16,
},
},
+ [7] = {
+ .base = S3C24XX_GPIO_BASE(S3C2410_GPH0),
+ .pm = __gpio_pm(&s3c_gpio_pm_2bit),
+ .chip = {
+ .base = S3C2410_GPH0,
+ .owner = THIS_MODULE,
+ .label = "GPIOH",
+ .ngpio = 11,
+ },
+ },
};
static __init int s3c24xx_gpiolib_init(void)