Skip to content

Commit f141ed6

Browse files
committed
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 <[email protected]> Cc: Rob Herring <[email protected]> Cc: Linus Walleij <[email protected]>
1 parent 93baa65 commit f141ed6

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

drivers/gpio/Kconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ menuconfig GPIOLIB
3737

3838
if GPIOLIB
3939

40+
config OF_GPIO
41+
def_bool y
42+
depends on OF && !SPARC
43+
4044
config DEBUG_GPIO
4145
bool "Debug GPIO calls"
4246
depends on DEBUG_KERNEL

drivers/gpio/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
ccflags-$(CONFIG_DEBUG_GPIO) += -DDEBUG
44

55
obj-$(CONFIG_GPIOLIB) += gpiolib.o devres.o
6+
obj-$(CONFIG_OF_GPIO) += gpiolib-of.o
67

78
# Device drivers. Generally keep list sorted alphabetically
89
obj-$(CONFIG_GPIO_GENERIC) += gpio-generic.o
File renamed without changes.

drivers/of/Kconfig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ config OF_IRQ
5151
config OF_DEVICE
5252
def_bool y
5353

54-
config OF_GPIO
55-
def_bool y
56-
depends on GPIOLIB && !SPARC
57-
help
58-
OpenFirmware GPIO accessors
59-
6054
config OF_I2C
6155
def_tristate I2C
6256
depends on I2C && !SPARC

drivers/of/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ obj-$(CONFIG_OF_PROMTREE) += pdt.o
44
obj-$(CONFIG_OF_ADDRESS) += address.o
55
obj-$(CONFIG_OF_IRQ) += irq.o
66
obj-$(CONFIG_OF_DEVICE) += device.o platform.o
7-
obj-$(CONFIG_OF_GPIO) += gpio.o
87
obj-$(CONFIG_OF_I2C) += of_i2c.o
98
obj-$(CONFIG_OF_NET) += of_net.o
109
obj-$(CONFIG_OF_SPI) += of_spi.o

0 commit comments

Comments
 (0)