From 6b402a65031af570d7696dc545aeb7960ae41b6b Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Tue, 3 Nov 2009 00:29:53 +0100
Subject: s3c: Register gpio bank J with gpiolib

This is nonportable and wastes a lot of memory and thus should be replaced with
a prober solution asap.
---
 arch/arm/mach-s3c2410/include/mach/gpio.h |  5 +++--
 arch/arm/plat-s3c24xx/gpiolib.c           | 13 +++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-s3c2410/include/mach/gpio.h
index 15f0b3e7ce6..0b53cad80fe 100644
--- a/arch/arm/mach-s3c2410/include/mach/gpio.h
+++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
@@ -20,10 +20,11 @@
  * devices that need GPIO.
  */
 
-#define ARCH_NR_GPIOS	(256 + CONFIG_S3C24XX_GPIO_EXTRA)
+#define ARCH_NR_GPIOS	(512 + CONFIG_S3C24XX_GPIO_EXTRA)
 
 #include <asm-generic/gpio.h>
 #include <mach/gpio-nrs.h>
 #include <mach/gpio-fns.h>
+#include <mach/regs-gpioj.h>
 
-#define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)
+#define S3C_GPIO_END	(S3C2440_GPIO_BANKJ + 32)
diff --git a/arch/arm/plat-s3c24xx/gpiolib.c b/arch/arm/plat-s3c24xx/gpiolib.c
index 6d7a961d326..c2dd900660b 100644
--- a/arch/arm/plat-s3c24xx/gpiolib.c
+++ b/arch/arm/plat-s3c24xx/gpiolib.c
@@ -26,6 +26,7 @@
 #include <plat/pm.h>
 
 #include <mach/regs-gpio.h>
+#include <mach/regs-gpioj.h>
 
 static int s3c24xx_gpiolib_banka_input(struct gpio_chip *chip, unsigned offset)
 {
@@ -160,8 +161,16 @@ struct s3c_gpio_chip s3c24xx_gpios[] = {
 			.label			= "GPIOH",
 			.ngpio			= 11,
 		},
-	},
-};
+	}, {
+		.base	= S3C2440_GPJCON,
+		.pm	= __gpio_pm(&s3c_gpio_pm_2bit),
+		.chip	= {
+			.base			= S3C2440_GPJ0,
+			.owner			= THIS_MODULE,
+			.label			= "GPIOJ",
+			.ngpio			= 11,
+		},
+	},};
 
 static __init int s3c24xx_gpiolib_init(void)
 {
-- 
cgit v1.2.3