gpio/s5p64x0: move gpio driver into drivers/gpio/

Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-s5p64x0/Makefile b/arch/arm/mach-s5p64x0/Makefile
index 5f6afdf067eda5f4ae6379b661f676c10ae26b75..5b94955388396a6cc60d92dbffa14b8e86f04432 100644 (file)
--- a/arch/arm/mach-s5p64x0/Makefile
+++ b/arch/arm/mach-s5p64x0/Makefile
@@ -12,7 +12,7 @@ obj-                          :=
 
 # Core support for S5P64X0 system
 
-obj-$(CONFIG_ARCH_S5P64X0)     += cpu.o init.o clock.o dma.o gpiolib.o
+obj-$(CONFIG_ARCH_S5P64X0)     += cpu.o init.o clock.o dma.o
 obj-$(CONFIG_ARCH_S5P64X0)     += setup-i2c0.o irq-eint.o
 obj-$(CONFIG_CPU_S5P6440)      += clock-s5p6440.o
 obj-$(CONFIG_CPU_S5P6450)      += clock-s5p6450.o

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 6368730a2e58833f9f1d302525e8a0b333186bf9..5eb29bc18a56f5f9fa22f69ca922a43fe94c4271 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -143,6 +143,10 @@ config GPIO_S3C64XX
        def_bool y
        depends on ARCH_S3C64XX
 
+config GPIO_S5P64X0
+       def_bool y
+       depends on ARCH_S5P64X0
+
 config GPIO_S5PC100
        def_bool y
        depends on CPU_S5PC100

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 8c1fb23285cb6d070e55c1c9597f44d20a2407b3..10f3bbf0eceb6bfeac87b6f321ffc4e552f46e2e 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_GPIO_RDC321X)    += gpio-rdc321x.o
 obj-$(CONFIG_GPIO_PLAT_SAMSUNG)        += gpio-plat-samsung.o
 obj-$(CONFIG_GPIO_S3C24XX)     += gpio-s3c24xx.o
 obj-$(CONFIG_GPIO_S3C64XX)     += gpio-s3c64xx.o
+obj-$(CONFIG_GPIO_S5P64X0)     += gpio-s5p64x0.o
 obj-$(CONFIG_GPIO_S5PC100)     += gpio-s5pc100.o
 obj-$(CONFIG_GPIO_S5PV210)     += gpio-s5pv210.o
 

diff --git a/arch/arm/mach-s5p64x0/gpiolib.c b/drivers/gpio/gpio-s5p64x0.c
similarity index 99%
rename from arch/arm/mach-s5p64x0/gpiolib.c
rename to drivers/gpio/gpio-s5p64x0.c
index e7fb3b004e77b6f3ce90121a41074fa075ddb489..96e816f5cc95157d78185643f8ad3cd32ac52ba5 100644 (file)
--- a/arch/arm/mach-s5p64x0/gpiolib.c
+++ b/drivers/gpio/gpio-s5p64x0.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-s5p64x0/gpiolib.c
- *
+/*
  * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd.
  *             http://www.samsung.com
  *