summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2010-05-12 10:22:41 +0300
committerBen Dooks <ben-linux@fluff.org>2010-05-18 19:06:15 +0900
commita0026418d3d99b68dbd6c91f277d6f764fe41956 (patch)
tree1c50b1fb2e4838f57b8a611508a453873a9d3186 /arch/arm/mach-s3c2410
parentfcef85c0c122f90f57f2f3ef0caeaf6404d6e8f3 (diff)
downloadblackbird-op-linux-a0026418d3d99b68dbd6c91f277d6f764fe41956.tar.gz
blackbird-op-linux-a0026418d3d99b68dbd6c91f277d6f764fe41956.zip
ARM: S3C244X: fix gpiolib port J support
Increase GPIOs number for S3C244X, and make S3C_GPIO_END point to BANKJ end, otherwise gpiolib refuses to register BANKJ Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> [ben-linux@fluff.org: Move pm fix to new patch] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/gpio-track.h2
-rw-r--r--arch/arm/mach-s3c2410/include/mach/gpio.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-track.h b/arch/arm/mach-s3c2410/include/mach/gpio-track.h
index acb259103808..6371eaa5fe4d 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio-track.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio-track.h
@@ -23,7 +23,7 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
{
struct s3c_gpio_chip *chip;
- if (pin > S3C2410_GPG(10))
+ if (pin > S3C_GPIO_END)
return NULL;
chip = &s3c24xx_gpios[pin/32];
diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index 15f0b3e7ce69..b649bf2ccd5c 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -20,10 +20,18 @@
* devices that need GPIO.
*/
+#ifdef CONFIG_CPU_S3C244X
+#define ARCH_NR_GPIOS (32 * 9 + CONFIG_S3C24XX_GPIO_EXTRA)
+#else
#define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)
+#endif
#include <asm-generic/gpio.h>
#include <mach/gpio-nrs.h>
#include <mach/gpio-fns.h>
+#ifdef CONFIG_CPU_S3C24XX
+#define S3C_GPIO_END (S3C2410_GPIO_BANKJ + 32)
+#else
#define S3C_GPIO_END (S3C2410_GPIO_BANKH + 32)
+#endif
OpenPOWER on IntegriCloud