aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-08-25 22:06:25 -0400
committerKukjin Kim <kgene.kim@samsung.com>2011-09-20 21:52:32 -0400
commitec080059c1ce7bfdc8453bf4f3328ac0315a66a1 (patch)
treeeeed0e6c33cbd301bfaa753142a3594feb58598f
parent536137bc9ff1738a7bee9b31047a7cd56860180e (diff)
gpio/s3c64xx: move gpio driver into drivers/gpio/
Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/Makefile1
-rw-r--r--drivers/gpio/Kconfig4
-rw-r--r--drivers/gpio/Makefile1
-rw-r--r--drivers/gpio/gpio-s3c64xx.c (renamed from arch/arm/mach-s3c64xx/gpiolib.c)3
4 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile
index 61b4034a0c22..f0102d7b531b 100644
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@ -13,7 +13,6 @@ obj- :=
13# Core files 13# Core files
14obj-y += cpu.o 14obj-y += cpu.o
15obj-y += clock.o 15obj-y += clock.o
16obj-y += gpiolib.o
17 16
18# Core support for S3C6400 system 17# Core support for S3C6400 system
19 18
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 5654e1b082af..6368730a2e58 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -139,6 +139,10 @@ config GPIO_S3C24XX
139 def_bool y 139 def_bool y
140 depends on PLAT_S3C24XX 140 depends on PLAT_S3C24XX
141 141
142config GPIO_S3C64XX
143 def_bool y
144 depends on ARCH_S3C64XX
145
142config GPIO_S5PC100 146config GPIO_S5PC100
143 def_bool y 147 def_bool y
144 depends on CPU_S5PC100 148 depends on CPU_S5PC100
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index c7f1c00986c9..8c1fb23285cb 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o
41 41
42obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o 42obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o
43obj-$(CONFIG_GPIO_S3C24XX) += gpio-s3c24xx.o 43obj-$(CONFIG_GPIO_S3C24XX) += gpio-s3c24xx.o
44obj-$(CONFIG_GPIO_S3C64XX) += gpio-s3c64xx.o
44obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o 45obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o
45obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o 46obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o
46 47
diff --git a/arch/arm/mach-s3c64xx/gpiolib.c b/drivers/gpio/gpio-s3c64xx.c
index 92b09085caaa..b4f1c8204f03 100644
--- a/arch/arm/mach-s3c64xx/gpiolib.c
+++ b/drivers/gpio/gpio-s3c64xx.c
@@ -1,5 +1,4 @@
1/* arch/arm/plat-s3c64xx/gpiolib.c 1/*
2 *
3 * Copyright 2008 Openmoko, Inc. 2 * Copyright 2008 Openmoko, Inc.
4 * Copyright 2008 Simtec Electronics 3 * Copyright 2008 Simtec Electronics
5 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>