gpio: Move DT support code into drivers/gpio

The code in drivers/of/gpio.c isn't shared by any other subsystem since it
is all gpiolib specific.  drivers/gpio is a better place to maintain these
functions.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Linus Walleij <linus.walleij@stericsson.com>

5 files changed, 5 insertions, 7 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index e6862f134084..1042c3f534f4 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -37,6 +37,10 @@ menuconfig GPIOLIB
 
 if GPIOLIB
 
+config OF_GPIO
+        def_bool y
+        depends on OF && !SPARC
+
 config DEBUG_GPIO
         bool "Debug GPIO calls"
         depends on DEBUG_KERNEL
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 007f54bd0081..1c2f6c0a835e 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -3,6 +3,7 @@
 ccflags-$(CONFIG_DEBUG_GPIO)    += -DDEBUG
 
 obj-$(CONFIG_GPIOLIB)           += gpiolib.o devres.o
+obj-$(CONFIG_OF_GPIO)           += gpiolib-of.o
 
 # Device drivers. Generally keep list sorted alphabetically
 obj-$(CONFIG_GPIO_GENERIC)      += gpio-generic.o
diff --git a/drivers/of/gpio.c b/drivers/gpio/gpiolib-of.c
index bba81216b4db..bba81216b4db 100644
--- a/drivers/of/gpio.c
+++ b/drivers/gpio/gpiolib-of.c
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 8e84ce9765a9..ce00d11144de 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -51,12 +51,6 @@ config OF_IRQ
 config OF_DEVICE
         def_bool y
 
-config OF_GPIO
-        def_bool y
-        depends on GPIOLIB && !SPARC
-        help
-          OpenFirmware GPIO accessors
-
 config OF_I2C
         def_tristate I2C
         depends on I2C && !SPARC
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index aa90e602c8a7..aff2c6230390 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -4,7 +4,6 @@ obj-$(CONFIG_OF_PROMTREE) += pdt.o
 obj-$(CONFIG_OF_ADDRESS)  += address.o
 obj-$(CONFIG_OF_IRQ)    += irq.o
 obj-$(CONFIG_OF_DEVICE) += device.o platform.o
-obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)    += of_i2c.o
 obj-$(CONFIG_OF_NET)    += of_net.o
 obj-$(CONFIG_OF_SPI)    += of_spi.o