From 907d769325d48ebd48c704febc71a0c8fc9db2da Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Sat, 7 Apr 2012 14:31:33 -0600 Subject: [PATCH] --- yaml --- r: 307667 b: refs/heads/master c: f141ed65f256ec036c7fba604da6b7c448096ef9 h: refs/heads/master i: 307665: a16baaff0463e0794ae46a859a6da8f1a32b9dc5 307663: 91d52494d37c9ea452306eb015aa70f9a4d9f673 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/Kconfig | 4 ++++ trunk/drivers/gpio/Makefile | 1 + trunk/drivers/{of/gpio.c => gpio/gpiolib-of.c} | 0 trunk/drivers/of/Kconfig | 6 ------ trunk/drivers/of/Makefile | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) rename trunk/drivers/{of/gpio.c => gpio/gpiolib-of.c} (100%) diff --git a/[refs] b/[refs] index f202ca256054..0aa2d28c1ddb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93baa65fe50a83056c97973de2300337b000472e +refs/heads/master: f141ed65f256ec036c7fba604da6b7c448096ef9 diff --git a/trunk/drivers/gpio/Kconfig b/trunk/drivers/gpio/Kconfig index e6862f134084..1042c3f534f4 100644 --- a/trunk/drivers/gpio/Kconfig +++ b/trunk/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/trunk/drivers/gpio/Makefile b/trunk/drivers/gpio/Makefile index 007f54bd0081..1c2f6c0a835e 100644 --- a/trunk/drivers/gpio/Makefile +++ b/trunk/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/trunk/drivers/of/gpio.c b/trunk/drivers/gpio/gpiolib-of.c similarity index 100% rename from trunk/drivers/of/gpio.c rename to trunk/drivers/gpio/gpiolib-of.c diff --git a/trunk/drivers/of/Kconfig b/trunk/drivers/of/Kconfig index 8e84ce9765a9..ce00d11144de 100644 --- a/trunk/drivers/of/Kconfig +++ b/trunk/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/trunk/drivers/of/Makefile b/trunk/drivers/of/Makefile index aa90e602c8a7..aff2c6230390 100644 --- a/trunk/drivers/of/Makefile +++ b/trunk/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