[ARM] S3C: Move common GPIO code from plat-s3c24xx

Move the common parts of the GPIO code into plat-s3c
for use with both the s3c24xx and s3c64xx systems.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/mach-s3c6400/include/mach/gpio.h b/arch/arm/mach-s3c6400/include/mach/gpio.h
index 8600c818a46facd5914f94a2b687c07d82bd4822..e8e35e8fe73165f2010042d6ba1ba91b484a8b8a 100644 (file)
--- a/arch/arm/mach-s3c6400/include/mach/gpio.h
+++ b/arch/arm/mach-s3c6400/include/mach/gpio.h
@@ -86,6 +86,10 @@ enum s3c_gpio_number {
 #define S3C64XX_GPP(_nr)       (S3C64XX_GPIO_P_START + (_nr))
 #define S3C64XX_GPQ(_nr)       (S3C64XX_GPIO_Q_START + (_nr))
 
+/* the end of the S3C64XX specific gpios */
+#define S3C64XX_GPIO_END       (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1)
+#define S3C_GPIO_END           S3C64XX_GPIO_END
+
 /* define the number of gpios we need to the one after the GPQ() range */
 #define ARCH_NR_GPIOS  (S3C64XX_GPQ(S3C64XX_GPIO_Q_NR) + 1)
 

diff --cc arch/arm/plat-s3c/Makefile
Simple merge

diff --cc arch/arm/plat-s3c/gpio.c
Simple merge

diff --cc arch/arm/plat-s3c/include/plat/gpio-core.h
Simple merge

diff --cc arch/arm/plat-s3c24xx/gpiolib.c
Simple merge