aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/gpio.txt10
-rw-r--r--Documentation/zh_CN/gpio.txt8
-rw-r--r--arch/alpha/Kconfig3
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--arch/arm/plat-orion/Makefile2
-rw-r--r--arch/arm/plat-orion/gpio.c2
-rw-r--r--arch/arm64/Kconfig3
-rw-r--r--arch/avr32/Kconfig3
-rw-r--r--arch/blackfin/Kconfig5
-rw-r--r--arch/hexagon/Kconfig3
-rw-r--r--arch/ia64/Kconfig3
-rw-r--r--arch/m68k/Kconfig3
-rw-r--r--arch/m68k/Kconfig.cpu3
-rw-r--r--arch/metag/Kconfig3
-rw-r--r--arch/microblaze/Kconfig3
-rw-r--r--arch/mips/Kconfig10
-rw-r--r--arch/mips/loongson/common/Makefile2
-rw-r--r--arch/mips/txx9/generic/setup.c2
-rw-r--r--arch/openrisc/Kconfig3
-rw-r--r--arch/powerpc/Kconfig5
-rw-r--r--arch/powerpc/platforms/40x/Kconfig1
-rw-r--r--arch/powerpc/platforms/44x/Kconfig1
-rw-r--r--arch/powerpc/platforms/85xx/Kconfig3
-rw-r--r--arch/powerpc/platforms/86xx/Kconfig3
-rw-r--r--arch/powerpc/platforms/8xx/Kconfig1
-rw-r--r--arch/powerpc/platforms/Kconfig4
-rw-r--r--arch/sh/Kconfig3
-rw-r--r--arch/sh/boards/mach-sdk7786/Makefile2
-rw-r--r--arch/sh/boards/mach-x3proto/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh2a/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh3/Makefile2
-rw-r--r--arch/sh/kernel/cpu/sh4a/Makefile2
-rw-r--r--arch/sparc/Kconfig5
-rw-r--r--arch/unicore32/Kconfig6
-rw-r--r--arch/x86/Kconfig3
-rw-r--r--arch/xtensa/Kconfig3
-rw-r--r--arch/xtensa/configs/iss_defconfig1
-rw-r--r--arch/xtensa/configs/s6105_defconfig1
-rw-r--r--drivers/extcon/Kconfig2
-rw-r--r--drivers/gpio/Kconfig1
-rw-r--r--drivers/gpio/gpio-lpc32xx.c2
-rw-r--r--drivers/i2c/busses/Kconfig4
-rw-r--r--drivers/i2c/muxes/Kconfig4
-rw-r--r--drivers/input/keyboard/Kconfig6
-rw-r--r--drivers/input/misc/Kconfig8
-rw-r--r--drivers/input/mouse/Kconfig2
-rw-r--r--drivers/leds/Kconfig6
-rw-r--r--drivers/mtd/maps/Kconfig2
-rw-r--r--drivers/mtd/nand/Kconfig2
-rw-r--r--drivers/net/phy/Kconfig2
-rw-r--r--drivers/pinctrl/sh-pfc/Kconfig26
-rw-r--r--drivers/regulator/Kconfig2
-rw-r--r--drivers/spi/Kconfig8
-rw-r--r--drivers/staging/android/Kconfig2
-rw-r--r--drivers/staging/iio/accel/Kconfig2
-rw-r--r--drivers/staging/iio/adc/Kconfig2
-rw-r--r--drivers/staging/iio/addac/Kconfig2
-rw-r--r--drivers/staging/iio/resolver/Kconfig4
-rw-r--r--drivers/staging/iio/trigger/Kconfig2
-rw-r--r--drivers/usb/phy/Kconfig2
-rw-r--r--drivers/video/Kconfig2
-rw-r--r--drivers/video/backlight/Kconfig4
-rw-r--r--drivers/w1/masters/Kconfig2
-rw-r--r--include/linux/gpio.h6
64 files changed, 76 insertions, 155 deletions
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 77a1d11af723..6f83fa965b4b 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -72,11 +72,11 @@ in this document, but drivers acting as clients to the GPIO interface must
72not care how it's implemented.) 72not care how it's implemented.)
73 73
74That said, if the convention is supported on their platform, drivers should 74That said, if the convention is supported on their platform, drivers should
75use it when possible. Platforms must declare GENERIC_GPIO support in their 75use it when possible. Platforms must select ARCH_REQUIRE_GPIOLIB or
76Kconfig (boolean true), and provide an <asm/gpio.h> file. Drivers that can't 76ARCH_WANT_OPTIONAL_GPIOLIB in their Kconfig. Drivers that can't work without
77work without standard GPIO calls should have Kconfig entries which depend 77standard GPIO calls should have Kconfig entries which depend on GPIOLIB. The
78on GENERIC_GPIO. The GPIO calls are available, either as "real code" or as 78GPIO calls are available, either as "real code" or as optimized-away stubs,
79optimized-away stubs, when drivers use the include file: 79when drivers use the include file:
80 80
81 #include <linux/gpio.h> 81 #include <linux/gpio.h>
82 82
diff --git a/Documentation/zh_CN/gpio.txt b/Documentation/zh_CN/gpio.txt
index 4fa7b4e6f856..d5b8f01833f4 100644
--- a/Documentation/zh_CN/gpio.txt
+++ b/Documentation/zh_CN/gpio.txt
@@ -84,10 +84,10 @@ GPIO 公约
84控制器的抽象函数来实现它。(有一些可选的代码能支持这种策略的实现,本文档 84控制器的抽象函数来实现它。(有一些可选的代码能支持这种策略的实现,本文档
85后面会介绍，但作为 GPIO 接口的客户端驱动程序必须与它的实现无关。) 85后面会介绍，但作为 GPIO 接口的客户端驱动程序必须与它的实现无关。)
86 86
87也就是说,如果在他们的平台上支持这个公约，驱动应尽可能的使用它。平台 87也就是说,如果在他们的平台上支持这个公约，驱动应尽可能的使用它。时，台
88必须在 Kconfig 中声对 GENERIC_GPIO的支持 (布尔型 true)，并供 88必须在 Kconfig 中选 ARCH_REQUIRE_GPIOLIB 者 ARCH_WANT_OPTIONAL_GPIOLIB
89个 <asm/gpio.h> 文件。那些调用标准 GPIO 函数的驱动应该在 Kconfig 89项。那些调用标准 GPIO 函数的驱动应该在 Kconfig 入口中声明依赖GENERIC_GPIO。
90口中声明依赖GENERIC_GPIO。驱动包含文件: 90当驱动包含文件:
91 91
92 #include <linux/gpio.h> 92 #include <linux/gpio.h>
93 93
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8629127640cf..837a1f2d8b96 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -55,9 +55,6 @@ config GENERIC_CALIBRATE_DELAY
55 bool 55 bool
56 default y 56 default y
57 57
58config GENERIC_GPIO
59 bool
60
61config ZONE_DMA 58config ZONE_DMA
62 bool 59 bool
63 default y 60 default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aa71a2321040..46e2b5228606 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -109,9 +109,6 @@ config MIGHT_HAVE_PCI
109config SYS_SUPPORTS_APM_EMULATION 109config SYS_SUPPORTS_APM_EMULATION
110 bool 110 bool
111 111
112config GENERIC_GPIO
113 bool
114
115config HAVE_TCM 112config HAVE_TCM
116 bool 113 bool
117 select GENERIC_ALLOCATOR 114 select GENERIC_ALLOCATOR
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 2eca54b65906..9433605cd290 100644
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@ -3,6 +3,6 @@
3# 3#
4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include 4ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include
5 5
6orion-gpio-$(CONFIG_GENERIC_GPIO) += gpio.o 6orion-gpio-$(CONFIG_GPIOLIB) += gpio.o
7obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o 7obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o
8obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y) 8obj-$(CONFIG_PLAT_ORION_LEGACY) += $(orion-gpio-y)
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index e39c2ba6e2fb..249fe6333e18 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -150,7 +150,7 @@ err_out:
150} 150}
151 151
152/* 152/*
153 * GENERIC_GPIO primitives. 153 * GPIO primitives.
154 */ 154 */
155static int orion_gpio_request(struct gpio_chip *chip, unsigned pin) 155static int orion_gpio_request(struct gpio_chip *chip, unsigned pin)
156{ 156{
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 43b0e9f10a39..48347dcf0566 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -95,9 +95,6 @@ config SWIOTLB
95config IOMMU_HELPER 95config IOMMU_HELPER
96 def_bool SWIOTLB 96 def_bool SWIOTLB
97 97
98config GENERIC_GPIO
99 bool
100
101source "init/Kconfig" 98source "init/Kconfig"
102 99
103source "kernel/Kconfig.freezer" 100source "kernel/Kconfig.freezer"
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 22c40308360b..bdc35589277f 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -26,9 +26,6 @@ config AVR32
26 There is an AVR32 Linux project with a web page at 26 There is an AVR32 Linux project with a web page at
27 http://avr32linux.org/. 27 http://avr32linux.org/.
28 28
29config GENERIC_GPIO
30 def_bool y
31
32config STACKTRACE_SUPPORT 29config STACKTRACE_SUPPORT
33 def_bool y 30 def_bool y
34 31
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 453ebe46b065..a117652b5fea 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -27,7 +27,7 @@ config BLACKFIN
27 select HAVE_OPROFILE 27 select HAVE_OPROFILE
28 select HAVE_PERF_EVENTS 28 select HAVE_PERF_EVENTS
29 select ARCH_HAVE_CUSTOM_GPIO_H 29 select ARCH_HAVE_CUSTOM_GPIO_H
30 select ARCH_WANT_OPTIONAL_GPIOLIB 30 select ARCH_REQUIRE_GPIOLIB
31 select HAVE_UID16 31 select HAVE_UID16
32 select HAVE_UNDERSCORE_SYMBOL_PREFIX 32 select HAVE_UNDERSCORE_SYMBOL_PREFIX
33 select VIRT_TO_BUS 33 select VIRT_TO_BUS
@@ -52,9 +52,6 @@ config GENERIC_BUG
52config ZONE_DMA 52config ZONE_DMA
53 def_bool y 53 def_bool y
54 54
55config GENERIC_GPIO
56 def_bool y
57
58config FORCE_MAX_ZONEORDER 55config FORCE_MAX_ZONEORDER
59 int 56 int
60 default "14" 57 default "14"
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 841325f60df8..33a97929d055 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -155,9 +155,6 @@ source "mm/Kconfig"
155 155
156source "kernel/Kconfig.hz" 156source "kernel/Kconfig.hz"
157 157
158config GENERIC_GPIO
159 def_bool n
160
161endmenu 158endmenu
162 159
163source "init/Kconfig" 160source "init/Kconfig"
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d393f841ff5a..1a2b7749b047 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -101,9 +101,6 @@ config GENERIC_CALIBRATE_DELAY
101config HAVE_SETUP_PER_CPU_AREA 101config HAVE_SETUP_PER_CPU_AREA
102 def_bool y 102 def_bool y
103 103
104config GENERIC_GPIO
105 bool
106
107config DMI 104config DMI
108 bool 105 bool
109 default y 106 default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6de813370b8c..821170e5f6ed 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -35,9 +35,6 @@ config ARCH_HAS_ILOG2_U32
35config ARCH_HAS_ILOG2_U64 35config ARCH_HAS_ILOG2_U64
36 bool 36 bool
37 37
38config GENERIC_GPIO
39 bool
40
41config GENERIC_HWEIGHT 38config GENERIC_HWEIGHT
42 bool 39 bool
43 default y 40 default y
diff --git a/arch/m68k/Kconfig.cpu b/arch/m68k/Kconfig.cpu
index b1cfff832fb5..d266787725b4 100644
--- a/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@ -22,8 +22,7 @@ config M68KCLASSIC
22 22
23config COLDFIRE 23config COLDFIRE
24 bool "Coldfire CPU family support" 24 bool "Coldfire CPU family support"
25 select GENERIC_GPIO 25 select ARCH_REQUIRE_GPIOLIB
26 select ARCH_WANT_OPTIONAL_GPIOLIB
27 select ARCH_HAVE_CUSTOM_GPIO_H 26 select ARCH_HAVE_CUSTOM_GPIO_H
28 select CPU_HAS_NO_BITFIELDS 27 select CPU_HAS_NO_BITFIELDS
29 select CPU_HAS_NO_MULDIV64 28 select CPU_HAS_NO_MULDIV64
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 6f16c1469327..dcd94406030e 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -52,9 +52,6 @@ config GENERIC_HWEIGHT
52config GENERIC_CALIBRATE_DELAY 52config GENERIC_CALIBRATE_DELAY
53 def_bool y 53 def_bool y
54 54
55config GENERIC_GPIO
56 def_bool n
57
58config NO_IOPORT 55config NO_IOPORT
59 def_bool y 56 def_bool y
60 57
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 54237af0b07c..d22a4ecffff4 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -54,9 +54,6 @@ config GENERIC_HWEIGHT
54config GENERIC_CALIBRATE_DELAY 54config GENERIC_CALIBRATE_DELAY
55 def_bool y 55 def_bool y
56 56
57config GENERIC_GPIO
58 bool
59
60config GENERIC_CSUM 57config GENERIC_CSUM
61 def_bool y 58 def_bool y
62 59
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e5f3794744f1..a90cfc702bb1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -61,8 +61,7 @@ config MIPS_ALCHEMY
61 select SYS_HAS_CPU_MIPS32_R1 61 select SYS_HAS_CPU_MIPS32_R1
62 select SYS_SUPPORTS_32BIT_KERNEL 62 select SYS_SUPPORTS_32BIT_KERNEL
63 select SYS_SUPPORTS_APM_EMULATION 63 select SYS_SUPPORTS_APM_EMULATION
64 select GENERIC_GPIO 64 select ARCH_REQUIRE_GPIOLIB
65 select ARCH_WANT_OPTIONAL_GPIOLIB
66 select SYS_SUPPORTS_ZBOOT 65 select SYS_SUPPORTS_ZBOOT
67 select USB_ARCH_HAS_OHCI 66 select USB_ARCH_HAS_OHCI
68 select USB_ARCH_HAS_EHCI 67 select USB_ARCH_HAS_EHCI
@@ -225,7 +224,6 @@ config MACH_JZ4740
225 select SYS_SUPPORTS_ZBOOT_UART16550 224 select SYS_SUPPORTS_ZBOOT_UART16550
226 select DMA_NONCOHERENT 225 select DMA_NONCOHERENT
227 select IRQ_CPU 226 select IRQ_CPU
228 select GENERIC_GPIO
229 select ARCH_REQUIRE_GPIOLIB 227 select ARCH_REQUIRE_GPIOLIB
230 select SYS_HAS_EARLY_PRINTK 228 select SYS_HAS_EARLY_PRINTK
231 select HAVE_PWM 229 select HAVE_PWM
@@ -937,7 +935,6 @@ config CSRC_SB1250
937 bool 935 bool
938 936
939config GPIO_TXX9 937config GPIO_TXX9
940 select GENERIC_GPIO
941 select ARCH_REQUIRE_GPIOLIB 938 select ARCH_REQUIRE_GPIOLIB
942 bool 939 bool
943 940
@@ -1009,9 +1006,6 @@ config GENERIC_ISA_DMA_SUPPORT_BROKEN
1009config ISA_DMA_API 1006config ISA_DMA_API
1010 bool 1007 bool
1011 1008
1012config GENERIC_GPIO
1013 bool
1014
1015config HOLES_IN_ZONE 1009config HOLES_IN_ZONE
1016 bool 1010 bool
1017 1011
@@ -1112,7 +1106,6 @@ config SOC_PNX833X
1112 select SYS_SUPPORTS_32BIT_KERNEL 1106 select SYS_SUPPORTS_32BIT_KERNEL
1113 select SYS_SUPPORTS_LITTLE_ENDIAN 1107 select SYS_SUPPORTS_LITTLE_ENDIAN
1114 select SYS_SUPPORTS_BIG_ENDIAN 1108 select SYS_SUPPORTS_BIG_ENDIAN
1115 select GENERIC_GPIO
1116 select CPU_MIPSR2_IRQ_VI 1109 select CPU_MIPSR2_IRQ_VI
1117 1110
1118config SOC_PNX8335 1111config SOC_PNX8335
@@ -1203,7 +1196,6 @@ config CPU_LOONGSON2F
1203 bool "Loongson 2F" 1196 bool "Loongson 2F"
1204 depends on SYS_HAS_CPU_LOONGSON2F 1197 depends on SYS_HAS_CPU_LOONGSON2F
1205 select CPU_LOONGSON2 1198 select CPU_LOONGSON2
1206 select GENERIC_GPIO
1207 select ARCH_REQUIRE_GPIOLIB 1199 select ARCH_REQUIRE_GPIOLIB
1208 help 1200 help
1209 The Loongson 2F processor implements the MIPS III instruction set 1201 The Loongson 2F processor implements the MIPS III instruction set
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index e526488df655..4c57b3e5743f 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -4,7 +4,7 @@
4 4
5obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ 5obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
6 pci.o bonito-irq.o mem.o machtype.o platform.o 6 pci.o bonito-irq.o mem.o machtype.o platform.o
7obj-$(CONFIG_GENERIC_GPIO) += gpio.o 7obj-$(CONFIG_GPIOLIB) += gpio.o
8 8
9# 9#
10# Serial port support 10# Serial port support
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 5524f2c7b05c..5364aabc2102 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -118,7 +118,7 @@ EXPORT_SYMBOL(clk_put);
118 118
119/* GPIO support */ 119/* GPIO support */
120 120
121#ifdef CONFIG_GENERIC_GPIO 121#ifdef CONFIG_GPIOLIB
122int gpio_to_irq(unsigned gpio) 122int gpio_to_irq(unsigned gpio)
123{ 123{
124 return -EINVAL; 124 return -EINVAL;
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 81b9ddbc9166..1072bfd18c50 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -44,9 +44,6 @@ config GENERIC_HWEIGHT
44config NO_IOPORT 44config NO_IOPORT
45 def_bool y 45 def_bool y
46 46
47config GENERIC_GPIO
48 def_bool y
49
50config TRACE_IRQFLAGS_SUPPORT 47config TRACE_IRQFLAGS_SUPPORT
51 def_bool y 48 def_bool y
52 49
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index bbbe02197afb..c33e3ad2c8fd 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -82,11 +82,6 @@ config GENERIC_HWEIGHT
82 bool 82 bool
83 default y 83 default y
84 84
85config GENERIC_GPIO
86 bool
87 help
88 Generic GPIO API support
89
90config PPC 85config PPC
91 bool 86 bool
92 default y 87 default y
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index bd40bbb15e14..6e287f1294fa 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -138,7 +138,6 @@ config PPC4xx_GPIO
138 bool "PPC4xx GPIO support" 138 bool "PPC4xx GPIO support"
139 depends on 40x 139 depends on 40x
140 select ARCH_REQUIRE_GPIOLIB 140 select ARCH_REQUIRE_GPIOLIB
141 select GENERIC_GPIO
142 help 141 help
143 Enable gpiolib support for ppc40x based boards 142 Enable gpiolib support for ppc40x based boards
144 143
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 7be93367d92f..d6c7506ec7d9 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -248,7 +248,6 @@ config PPC4xx_GPIO
248 bool "PPC4xx GPIO support" 248 bool "PPC4xx GPIO support"
249 depends on 44x 249 depends on 44x
250 select ARCH_REQUIRE_GPIOLIB 250 select ARCH_REQUIRE_GPIOLIB
251 select GENERIC_GPIO
252 help 251 help
253 Enable gpiolib support for ppc440 based boards 252 Enable gpiolib support for ppc440 based boards
254 253
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 8f02b05f4c96..efdd37c775ad 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -203,7 +203,6 @@ config GE_IMP3A
203 select DEFAULT_UIMAGE 203 select DEFAULT_UIMAGE
204 select SWIOTLB 204 select SWIOTLB
205 select MMIO_NVRAM 205 select MMIO_NVRAM
206 select GENERIC_GPIO
207 select ARCH_REQUIRE_GPIOLIB 206 select ARCH_REQUIRE_GPIOLIB
208 select GE_FPGA 207 select GE_FPGA
209 help 208 help
@@ -328,7 +327,7 @@ config B4_QDS
328 select PPC_E500MC 327 select PPC_E500MC
329 select PHYS_64BIT 328 select PHYS_64BIT
330 select SWIOTLB 329 select SWIOTLB
331 select GENERIC_GPIO 330 select GPIOLIB
332 select ARCH_REQUIRE_GPIOLIB 331 select ARCH_REQUIRE_GPIOLIB
333 select HAS_RAPIDIO 332 select HAS_RAPIDIO
334 select PPC_EPAPR_HV_PIC 333 select PPC_EPAPR_HV_PIC
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 7a6279e38213..1afd1e4a2dd2 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -37,7 +37,6 @@ config GEF_PPC9A
37 bool "GE PPC9A" 37 bool "GE PPC9A"
38 select DEFAULT_UIMAGE 38 select DEFAULT_UIMAGE
39 select MMIO_NVRAM 39 select MMIO_NVRAM
40 select GENERIC_GPIO
41 select ARCH_REQUIRE_GPIOLIB 40 select ARCH_REQUIRE_GPIOLIB
42 select GE_FPGA 41 select GE_FPGA
43 help 42 help
@@ -47,7 +46,6 @@ config GEF_SBC310
47 bool "GE SBC310" 46 bool "GE SBC310"
48 select DEFAULT_UIMAGE 47 select DEFAULT_UIMAGE
49 select MMIO_NVRAM 48 select MMIO_NVRAM
50 select GENERIC_GPIO
51 select ARCH_REQUIRE_GPIOLIB 49 select ARCH_REQUIRE_GPIOLIB
52 select GE_FPGA 50 select GE_FPGA
53 help 51 help
@@ -57,7 +55,6 @@ config GEF_SBC610
57 bool "GE SBC610" 55 bool "GE SBC610"
58 select DEFAULT_UIMAGE 56 select DEFAULT_UIMAGE
59 select MMIO_NVRAM 57 select MMIO_NVRAM
60 select GENERIC_GPIO
61 select ARCH_REQUIRE_GPIOLIB 58 select ARCH_REQUIRE_GPIOLIB
62 select GE_FPGA 59 select GE_FPGA
63 select HAS_RAPIDIO 60 select HAS_RAPIDIO
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 1fb0b3cddeb3..8dec3c0911ad 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -114,7 +114,6 @@ config 8xx_COPYBACK
114 114
115config 8xx_GPIO 115config 8xx_GPIO
116 bool "GPIO API Support" 116 bool "GPIO API Support"
117 select GENERIC_GPIO
118 select ARCH_REQUIRE_GPIOLIB 117 select ARCH_REQUIRE_GPIOLIB
119 help 118 help
120 Saying Y here will cause the ports on an MPC8xx processor to be used 119 Saying Y here will cause the ports on an MPC8xx processor to be used
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 34d224be93ba..a881232a3cce 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -302,7 +302,6 @@ config QUICC_ENGINE
302config QE_GPIO 302config QE_GPIO
303 bool "QE GPIO support" 303 bool "QE GPIO support"
304 depends on QUICC_ENGINE 304 depends on QUICC_ENGINE
305 select GENERIC_GPIO
306 select ARCH_REQUIRE_GPIOLIB 305 select ARCH_REQUIRE_GPIOLIB
307 help 306 help
308 Say Y here if you're going to use hardware that connects to the 307 Say Y here if you're going to use hardware that connects to the
@@ -315,7 +314,6 @@ config CPM2
315 select PPC_LIB_RHEAP 314 select PPC_LIB_RHEAP
316 select PPC_PCI_CHOICE 315 select PPC_PCI_CHOICE
317 select ARCH_REQUIRE_GPIOLIB 316 select ARCH_REQUIRE_GPIOLIB
318 select GENERIC_GPIO
319 help 317 help
320 The CPM2 (Communications Processor Module) is a coprocessor on 318 The CPM2 (Communications Processor Module) is a coprocessor on
321 embedded CPUs made by Freescale. Selecting this option means that 319 embedded CPUs made by Freescale. Selecting this option means that
@@ -353,7 +351,6 @@ config OF_RTC
353config SIMPLE_GPIO 351config SIMPLE_GPIO
354 bool "Support for simple, memory-mapped GPIO controllers" 352 bool "Support for simple, memory-mapped GPIO controllers"
355 depends on PPC 353 depends on PPC
356 select GENERIC_GPIO
357 select ARCH_REQUIRE_GPIOLIB 354 select ARCH_REQUIRE_GPIOLIB
358 help 355 help
359 Say Y here to support simple, memory-mapped GPIO controllers. 356 Say Y here to support simple, memory-mapped GPIO controllers.
@@ -364,7 +361,6 @@ config SIMPLE_GPIO
364config MCU_MPC8349EMITX 361config MCU_MPC8349EMITX
365 bool "MPC8349E-mITX MCU driver" 362 bool "MPC8349E-mITX MCU driver"
366 depends on I2C=y && PPC_83xx 363 depends on I2C=y && PPC_83xx
367 select GENERIC_GPIO
368 select ARCH_REQUIRE_GPIOLIB 364 select ARCH_REQUIRE_GPIOLIB
369 help 365 help
370 Say Y here to enable soft power-off functionality on the Freescale 366 Say Y here to enable soft power-off functionality on the Freescale
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 78d8ace57272..8c868cf2cf93 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -93,9 +93,6 @@ config GENERIC_CSUM
93config GENERIC_HWEIGHT 93config GENERIC_HWEIGHT
94 def_bool y 94 def_bool y
95 95
96config GENERIC_GPIO
97 def_bool n
98
99config GENERIC_CALIBRATE_DELAY 96config GENERIC_CALIBRATE_DELAY
100 bool 97 bool
101 98
diff --git a/arch/sh/boards/mach-sdk7786/Makefile b/arch/sh/boards/mach-sdk7786/Makefile
index 8ae56e9560ac..45d32e3590b9 100644
--- a/arch/sh/boards/mach-sdk7786/Makefile
+++ b/arch/sh/boards/mach-sdk7786/Makefile
@@ -1,4 +1,4 @@
1obj-y := fpga.o irq.o nmi.o setup.o 1obj-y := fpga.o irq.o nmi.o setup.o
2 2
3obj-$(CONFIG_GENERIC_GPIO) += gpio.o 3obj-$(CONFIG_GPIOLIB) += gpio.o
4obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o 4obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o
diff --git a/arch/sh/boards/mach-x3proto/Makefile b/arch/sh/boards/mach-x3proto/Makefile
index 708c21c919ff..0cbe3d02dea3 100644
--- a/arch/sh/boards/mach-x3proto/Makefile
+++ b/arch/sh/boards/mach-x3proto/Makefile
@@ -1,3 +1,3 @@
1obj-y += setup.o ilsel.o 1obj-y += setup.o ilsel.o
2 2
3obj-$(CONFIG_GENERIC_GPIO) += gpio.o 3obj-$(CONFIG_GPIOLIB) += gpio.o
diff --git a/arch/sh/kernel/cpu/sh2a/Makefile b/arch/sh/kernel/cpu/sh2a/Makefile
index 7fdc102d0dd6..990195d98456 100644
--- a/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@ -21,4 +21,4 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203) := pinmux-sh7203.o
21pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o 21pinmux-$(CONFIG_CPU_SUBTYPE_SH7264) := pinmux-sh7264.o
22pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o 22pinmux-$(CONFIG_CPU_SUBTYPE_SH7269) := pinmux-sh7269.o
23 23
24obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 24obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
diff --git a/arch/sh/kernel/cpu/sh3/Makefile b/arch/sh/kernel/cpu/sh3/Makefile
index 6f13f33a35ff..d3634ae7b71a 100644
--- a/arch/sh/kernel/cpu/sh3/Makefile
+++ b/arch/sh/kernel/cpu/sh3/Makefile
@@ -30,4 +30,4 @@ clock-$(CONFIG_CPU_SUBTYPE_SH7712) := clock-sh7712.o
30pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o 30pinmux-$(CONFIG_CPU_SUBTYPE_SH7720) := pinmux-sh7720.o
31 31
32obj-y += $(clock-y) 32obj-y += $(clock-y)
33obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 33obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
diff --git a/arch/sh/kernel/cpu/sh4a/Makefile b/arch/sh/kernel/cpu/sh4a/Makefile
index 8fc6ec2be2fa..0705df775208 100644
--- a/arch/sh/kernel/cpu/sh4a/Makefile
+++ b/arch/sh/kernel/cpu/sh4a/Makefile
@@ -47,6 +47,6 @@ pinmux-$(CONFIG_CPU_SUBTYPE_SHX3) := pinmux-shx3.o
47 47
48obj-y += $(clock-y) 48obj-y += $(clock-y)
49obj-$(CONFIG_SMP) += $(smp-y) 49obj-$(CONFIG_SMP) += $(smp-y)
50obj-$(CONFIG_GENERIC_GPIO) += $(pinmux-y) 50obj-$(CONFIG_GPIOLIB) += $(pinmux-y)
51obj-$(CONFIG_PERF_EVENTS) += perf_event.o 51obj-$(CONFIG_PERF_EVENTS) += perf_event.o
52obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o 52obj-$(CONFIG_HAVE_HW_BREAKPOINT) += ubc.o
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index a639c0d07b8b..9ac9f1666339 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -137,11 +137,6 @@ config GENERIC_ISA_DMA
137 bool 137 bool
138 default y if SPARC32 138 default y if SPARC32
139 139
140config GENERIC_GPIO
141 bool
142 help
143 Generic GPIO API support
144
145config ARCH_SUPPORTS_DEBUG_PAGEALLOC 140config ARCH_SUPPORTS_DEBUG_PAGEALLOC
146 def_bool y if SPARC64 141 def_bool y if SPARC64
147 142
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 2943e3acdf0c..41bcc0013442 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -23,9 +23,6 @@ config UNICORE32
23 designs licensed by PKUnity Ltd. 23 designs licensed by PKUnity Ltd.
24 Please see web page at <http://www.pkunity.com/>. 24 Please see web page at <http://www.pkunity.com/>.
25 25
26config GENERIC_GPIO
27 def_bool y
28
29config GENERIC_CSUM 26config GENERIC_CSUM
30 def_bool y 27 def_bool y
31 28
@@ -156,7 +153,7 @@ source "mm/Kconfig"
156 153
157config LEDS 154config LEDS
158 def_bool y 155 def_bool y
159 depends on GENERIC_GPIO 156 depends on GPIOLIB
160 157
161config ALIGNMENT_TRAP 158config ALIGNMENT_TRAP
162 def_bool y 159 def_bool y
@@ -219,7 +216,6 @@ if ARCH_PUV3
219config PUV3_GPIO 216config PUV3_GPIO
220 bool 217 bool
221 depends on !ARCH_FPGA 218 depends on !ARCH_FPGA
222 select GENERIC_GPIO
223 select GPIO_SYSFS 219 select GPIO_SYSFS
224 default y 220 default y
225 221
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5db2117ae288..6a154a91c7e7 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -174,9 +174,6 @@ config GENERIC_BUG_RELATIVE_POINTERS
174config GENERIC_HWEIGHT 174config GENERIC_HWEIGHT
175 def_bool y 175 def_bool y
176 176
177config GENERIC_GPIO
178 bool
179
180config ARCH_MAY_HAVE_PC_FDC 177config ARCH_MAY_HAVE_PC_FDC
181 def_bool y 178 def_bool y
182 depends on ISA_DMA_API 179 depends on ISA_DMA_API
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index b09de49dbec5..acdfc615cca2 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -33,9 +33,6 @@ config RWSEM_XCHGADD_ALGORITHM
33config GENERIC_HWEIGHT 33config GENERIC_HWEIGHT
34 def_bool y 34 def_bool y
35 35
36config GENERIC_GPIO
37 bool
38
39config ARCH_HAS_ILOG2_U32 36config ARCH_HAS_ILOG2_U32
40 def_bool n 37 def_bool n
41 38
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index ddab37b24741..77c52f80187a 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -10,7 +10,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
13CONFIG_GENERIC_GPIO=y
14# CONFIG_ARCH_HAS_ILOG2_U32 is not set 13# CONFIG_ARCH_HAS_ILOG2_U32 is not set
15# CONFIG_ARCH_HAS_ILOG2_U64 is not set 14# CONFIG_ARCH_HAS_ILOG2_U64 is not set
16CONFIG_NO_IOPORT=y 15CONFIG_NO_IOPORT=y
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index eaf1b8fc6556..4799c6a526b5 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -10,7 +10,6 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
10CONFIG_GENERIC_FIND_NEXT_BIT=y 10CONFIG_GENERIC_FIND_NEXT_BIT=y
11CONFIG_GENERIC_HWEIGHT=y 11CONFIG_GENERIC_HWEIGHT=y
12CONFIG_GENERIC_HARDIRQS=y 12CONFIG_GENERIC_HARDIRQS=y
13CONFIG_GENERIC_GPIO=y
14# CONFIG_ARCH_HAS_ILOG2_U32 is not set 13# CONFIG_ARCH_HAS_ILOG2_U32 is not set
15# CONFIG_ARCH_HAS_ILOG2_U64 is not set 14# CONFIG_ARCH_HAS_ILOG2_U64 is not set
16CONFIG_NO_IOPORT=y 15CONFIG_NO_IOPORT=y
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 5168a1324a65..3297301a42d4 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -16,7 +16,7 @@ comment "Extcon Device Drivers"
16 16
17config EXTCON_GPIO 17config EXTCON_GPIO
18 tristate "GPIO extcon support" 18 tristate "GPIO extcon support"
19 depends on GENERIC_GPIO 19 depends on GPIOLIB
20 help 20 help
21 Say Y here to enable GPIO based extcon support. Note that GPIO 21 Say Y here to enable GPIO based extcon support. Note that GPIO
22 extcon supports single state per extcon instance. 22 extcon supports single state per extcon instance.
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index c22eed9481e3..87d567089f13 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -38,7 +38,6 @@ config GPIO_DEVRES
38menuconfig GPIOLIB 38menuconfig GPIOLIB
39 bool "GPIO Support" 39 bool "GPIO Support"
40 depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB 40 depends on ARCH_WANT_OPTIONAL_GPIOLIB || ARCH_REQUIRE_GPIOLIB
41 select GENERIC_GPIO
42 help 41 help
43 This enables GPIO support through the generic GPIO library. 42 This enables GPIO support through the generic GPIO library.
44 You only need to enable this, if you also want to enable 43 You only need to enable this, if you also want to enable
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c
index dda6a756a3d9..90a80eb688a9 100644
--- a/drivers/gpio/gpio-lpc32xx.c
+++ b/drivers/gpio/gpio-lpc32xx.c
@@ -255,7 +255,7 @@ static int __get_gpo_state_p3(struct lpc32xx_gpio_chip *group,
255} 255}
256 256
257/* 257/*
258 * GENERIC_GPIO primitives. 258 * GPIO primitives.
259 */ 259 */
260static int lpc32xx_gpio_dir_input_p012(struct gpio_chip *chip, 260static int lpc32xx_gpio_dir_input_p012(struct gpio_chip *chip,
261 unsigned pin) 261 unsigned pin)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index adfee98486b1..631736e2e7ed 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -363,7 +363,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ
363 363
364config I2C_CBUS_GPIO 364config I2C_CBUS_GPIO
365 tristate "CBUS I2C driver" 365 tristate "CBUS I2C driver"
366 depends on GENERIC_GPIO 366 depends on GPIOLIB
367 help 367 help
368 Support for CBUS access using I2C API. Mostly relevant for Nokia 368 Support for CBUS access using I2C API. Mostly relevant for Nokia
369 Internet Tablets (770, N800 and N810). 369 Internet Tablets (770, N800 and N810).
@@ -436,7 +436,7 @@ config I2C_EG20T
436 436
437config I2C_GPIO 437config I2C_GPIO
438 tristate "GPIO-based bitbanging I2C" 438 tristate "GPIO-based bitbanging I2C"
439 depends on GENERIC_GPIO 439 depends on GPIOLIB
440 select I2C_ALGOBIT 440 select I2C_ALGOBIT
441 help 441 help
442 This is a very simple bitbanging I2C driver utilizing the 442 This is a very simple bitbanging I2C driver utilizing the
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 5faf244d2476..f7f9865b8b89 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -7,7 +7,7 @@ menu "Multiplexer I2C Chip support"
7 7
8config I2C_ARB_GPIO_CHALLENGE 8config I2C_ARB_GPIO_CHALLENGE
9 tristate "GPIO-based I2C arbitration" 9 tristate "GPIO-based I2C arbitration"
10 depends on GENERIC_GPIO && OF 10 depends on GPIOLIB && OF
11 help 11 help
12 If you say yes to this option, support will be included for an 12 If you say yes to this option, support will be included for an
13 I2C multimaster arbitration scheme using GPIOs and a challenge & 13 I2C multimaster arbitration scheme using GPIOs and a challenge &
@@ -19,7 +19,7 @@ config I2C_ARB_GPIO_CHALLENGE
19 19
20config I2C_MUX_GPIO 20config I2C_MUX_GPIO
21 tristate "GPIO-based I2C multiplexer" 21 tristate "GPIO-based I2C multiplexer"
22 depends on GENERIC_GPIO 22 depends on GPIOLIB
23 help 23 help
24 If you say yes to this option, support will be included for a 24 If you say yes to this option, support will be included for a
25 GPIO based I2C multiplexer. This driver provides access to 25 GPIO based I2C multiplexer. This driver provides access to
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 6a195d5e90ff..62a2c0e4cc99 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -175,7 +175,7 @@ config KEYBOARD_EP93XX
175 175
176config KEYBOARD_GPIO 176config KEYBOARD_GPIO
177 tristate "GPIO Buttons" 177 tristate "GPIO Buttons"
178 depends on GENERIC_GPIO 178 depends on GPIOLIB
179 help 179 help
180 This driver implements support for buttons connected 180 This driver implements support for buttons connected
181 to GPIO pins of various CPUs (and some other chips). 181 to GPIO pins of various CPUs (and some other chips).
@@ -190,7 +190,7 @@ config KEYBOARD_GPIO
190 190
191config KEYBOARD_GPIO_POLLED 191config KEYBOARD_GPIO_POLLED
192 tristate "Polled GPIO buttons" 192 tristate "Polled GPIO buttons"
193 depends on GENERIC_GPIO 193 depends on GPIOLIB
194 select INPUT_POLLDEV 194 select INPUT_POLLDEV
195 help 195 help
196 This driver implements support for buttons connected 196 This driver implements support for buttons connected
@@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
241 241
242config KEYBOARD_MATRIX 242config KEYBOARD_MATRIX
243 tristate "GPIO driven matrix keypad support" 243 tristate "GPIO driven matrix keypad support"
244 depends on GENERIC_GPIO 244 depends on GPIOLIB
245 select INPUT_MATRIXKMAP 245 select INPUT_MATRIXKMAP
246 help 246 help
247 Enable support for GPIO driven matrix keypad. 247 Enable support for GPIO driven matrix keypad.
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index af80928a46b4..bb698e1f9e42 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -214,7 +214,7 @@ config INPUT_APANEL
214config INPUT_GP2A 214config INPUT_GP2A
215 tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver" 215 tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
216 depends on I2C 216 depends on I2C
217 depends on GENERIC_GPIO 217 depends on GPIOLIB
218 help 218 help
219 Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip 219 Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
220 hooked to an I2C bus. 220 hooked to an I2C bus.
@@ -224,7 +224,7 @@ config INPUT_GP2A
224 224
225config INPUT_GPIO_TILT_POLLED 225config INPUT_GPIO_TILT_POLLED
226 tristate "Polled GPIO tilt switch" 226 tristate "Polled GPIO tilt switch"
227 depends on GENERIC_GPIO 227 depends on GPIOLIB
228 select INPUT_POLLDEV 228 select INPUT_POLLDEV
229 help 229 help
230 This driver implements support for tilt switches connected 230 This driver implements support for tilt switches connected
@@ -472,7 +472,7 @@ config INPUT_PWM_BEEPER
472 472
473config INPUT_GPIO_ROTARY_ENCODER 473config INPUT_GPIO_ROTARY_ENCODER
474 tristate "Rotary encoders connected to GPIO pins" 474 tristate "Rotary encoders connected to GPIO pins"
475 depends on GPIOLIB && GENERIC_GPIO 475 depends on GPIOLIB
476 help 476 help
477 Say Y here to add support for rotary encoders connected to GPIO lines. 477 Say Y here to add support for rotary encoders connected to GPIO lines.
478 Check file:Documentation/input/rotary-encoder.txt for more 478 Check file:Documentation/input/rotary-encoder.txt for more
@@ -484,7 +484,7 @@ config INPUT_GPIO_ROTARY_ENCODER
484config INPUT_RB532_BUTTON 484config INPUT_RB532_BUTTON
485 tristate "Mikrotik Routerboard 532 button interface" 485 tristate "Mikrotik Routerboard 532 button interface"
486 depends on MIKROTIK_RB532 486 depends on MIKROTIK_RB532
487 depends on GPIOLIB && GENERIC_GPIO 487 depends on GPIOLIB
488 select INPUT_POLLDEV 488 select INPUT_POLLDEV
489 help 489 help
490 Say Y here if you want support for the S1 button built into 490 Say Y here if you want support for the S1 button built into
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 802bd6a72d73..effa9c5f2c5c 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -295,7 +295,7 @@ config MOUSE_VSXXXAA
295 295
296config MOUSE_GPIO 296config MOUSE_GPIO
297 tristate "GPIO mouse" 297 tristate "GPIO mouse"
298 depends on GENERIC_GPIO 298 depends on GPIOLIB
299 select INPUT_POLLDEV 299 select INPUT_POLLDEV
300 help 300 help
301 This driver simulates a mouse on GPIO lines of various CPUs (and some 301 This driver simulates a mouse on GPIO lines of various CPUs (and some
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index d44806d41b44..ef992293598a 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -173,7 +173,7 @@ config LEDS_PCA9532_GPIO
173config LEDS_GPIO 173config LEDS_GPIO
174 tristate "LED Support for GPIO connected LEDs" 174 tristate "LED Support for GPIO connected LEDs"
175 depends on LEDS_CLASS 175 depends on LEDS_CLASS
176 depends on GENERIC_GPIO 176 depends on GPIOLIB
177 help 177 help
178 This option enables support for the LEDs connected to GPIO 178 This option enables support for the LEDs connected to GPIO
179 outputs. To be useful the particular board must have LEDs 179 outputs. To be useful the particular board must have LEDs
@@ -362,7 +362,7 @@ config LEDS_INTEL_SS4200
362config LEDS_LT3593 362config LEDS_LT3593
363 tristate "LED driver for LT3593 controllers" 363 tristate "LED driver for LT3593 controllers"
364 depends on LEDS_CLASS 364 depends on LEDS_CLASS
365 depends on GENERIC_GPIO 365 depends on GPIOLIB
366 help 366 help
367 This option enables support for LEDs driven by a Linear Technology 367 This option enables support for LEDs driven by a Linear Technology
368 LT3593 controller. This controller uses a special one-wire pulse 368 LT3593 controller. This controller uses a special one-wire pulse
@@ -431,7 +431,7 @@ config LEDS_ASIC3
431 431
432config LEDS_RENESAS_TPU 432config LEDS_RENESAS_TPU
433 bool "LED support for Renesas TPU" 433 bool "LED support for Renesas TPU"
434 depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO 434 depends on LEDS_CLASS=y && HAVE_CLK && GPIOLIB
435 help 435 help
436 This option enables build of the LED TPU platform driver, 436 This option enables build of the LED TPU platform driver,
437 suitable to drive any TPU channel on newer Renesas SoCs. 437 suitable to drive any TPU channel on newer Renesas SoCs.
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 3ed17c4d4358..c26938382f64 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -419,7 +419,7 @@ config MTD_BFIN_ASYNC
419 419
420config MTD_GPIO_ADDR 420config MTD_GPIO_ADDR
421 tristate "GPIO-assisted Flash Chip Support" 421 tristate "GPIO-assisted Flash Chip Support"
422 depends on GENERIC_GPIO || GPIOLIB 422 depends on GPIOLIB
423 depends on MTD_COMPLEX_MAPPINGS 423 depends on MTD_COMPLEX_MAPPINGS
424 help 424 help
425 Map driver which allows flashes to be partially physically addressed 425 Map driver which allows flashes to be partially physically addressed
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 81bf5e52601e..5d54ad32697f 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -89,7 +89,7 @@ config MTD_NAND_H1900
89 89
90config MTD_NAND_GPIO 90config MTD_NAND_GPIO
91 tristate "GPIO NAND Flash driver" 91 tristate "GPIO NAND Flash driver"
92 depends on GENERIC_GPIO && ARM 92 depends on GPIOLIB && ARM
93 help 93 help
94 This enables a GPIO based NAND flash driver. 94 This enables a GPIO based NAND flash driver.
95 95
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 450345261bd3..1e11f2bfd9ce 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -126,7 +126,7 @@ config MDIO_BITBANG
126 126
127config MDIO_GPIO 127config MDIO_GPIO
128 tristate "Support for GPIO lib-based bitbanged MDIO buses" 128 tristate "Support for GPIO lib-based bitbanged MDIO buses"
129 depends on MDIO_BITBANG && GENERIC_GPIO 129 depends on MDIO_BITBANG && GPIOLIB
130 ---help--- 130 ---help---
131 Supports GPIO lib-based MDIO busses. 131 Supports GPIO lib-based MDIO busses.
132 132
diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 0e1f99c33d47..f8a2ae413c7f 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -6,7 +6,7 @@ if ARCH_SHMOBILE || SUPERH
6 6
7config PINCTRL_SH_PFC 7config PINCTRL_SH_PFC
8 # XXX move off the gpio dependency 8 # XXX move off the gpio dependency
9 depends on GENERIC_GPIO 9 depends on GPIOLIB
10 select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB 10 select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
11 select PINMUX 11 select PINMUX
12 select PINCONF 12 select PINCONF
@@ -40,19 +40,19 @@ config PINCTRL_PFC_R8A7779
40config PINCTRL_PFC_SH7203 40config PINCTRL_PFC_SH7203
41 def_bool y 41 def_bool y
42 depends on CPU_SUBTYPE_SH7203 42 depends on CPU_SUBTYPE_SH7203
43 depends on GENERIC_GPIO 43 depends on GPIOLIB
44 select PINCTRL_SH_PFC 44 select PINCTRL_SH_PFC
45 45
46config PINCTRL_PFC_SH7264 46config PINCTRL_PFC_SH7264
47 def_bool y 47 def_bool y
48 depends on CPU_SUBTYPE_SH7264 48 depends on CPU_SUBTYPE_SH7264
49 depends on GENERIC_GPIO 49 depends on GPIOLIB
50 select PINCTRL_SH_PFC 50 select PINCTRL_SH_PFC
51 51
52config PINCTRL_PFC_SH7269 52config PINCTRL_PFC_SH7269
53 def_bool y 53 def_bool y
54 depends on CPU_SUBTYPE_SH7269 54 depends on CPU_SUBTYPE_SH7269
55 depends on GENERIC_GPIO 55 depends on GPIOLIB
56 select PINCTRL_SH_PFC 56 select PINCTRL_SH_PFC
57 57
58config PINCTRL_PFC_SH7372 58config PINCTRL_PFC_SH7372
@@ -68,55 +68,55 @@ config PINCTRL_PFC_SH73A0
68config PINCTRL_PFC_SH7720 68config PINCTRL_PFC_SH7720
69 def_bool y 69 def_bool y
70 depends on CPU_SUBTYPE_SH7720 70 depends on CPU_SUBTYPE_SH7720
71 depends on GENERIC_GPIO 71 depends on GPIOLIB
72 select PINCTRL_SH_PFC 72 select PINCTRL_SH_PFC
73 73
74config PINCTRL_PFC_SH7722 74config PINCTRL_PFC_SH7722
75 def_bool y 75 def_bool y
76 depends on CPU_SUBTYPE_SH7722 76 depends on CPU_SUBTYPE_SH7722
77 depends on GENERIC_GPIO 77 depends on GPIOLIB
78 select PINCTRL_SH_PFC 78 select PINCTRL_SH_PFC
79 79
80config PINCTRL_PFC_SH7723 80config PINCTRL_PFC_SH7723
81 def_bool y 81 def_bool y
82 depends on CPU_SUBTYPE_SH7723 82 depends on CPU_SUBTYPE_SH7723
83 depends on GENERIC_GPIO 83 depends on GPIOLIB
84 select PINCTRL_SH_PFC 84 select PINCTRL_SH_PFC
85 85
86config PINCTRL_PFC_SH7724 86config PINCTRL_PFC_SH7724
87 def_bool y 87 def_bool y
88 depends on CPU_SUBTYPE_SH7724 88 depends on CPU_SUBTYPE_SH7724
89 depends on GENERIC_GPIO 89 depends on GPIOLIB
90 select PINCTRL_SH_PFC 90 select PINCTRL_SH_PFC
91 91
92config PINCTRL_PFC_SH7734 92config PINCTRL_PFC_SH7734
93 def_bool y 93 def_bool y
94 depends on CPU_SUBTYPE_SH7734 94 depends on CPU_SUBTYPE_SH7734
95 depends on GENERIC_GPIO 95 depends on GPIOLIB
96 select PINCTRL_SH_PFC 96 select PINCTRL_SH_PFC
97 97
98config PINCTRL_PFC_SH7757 98config PINCTRL_PFC_SH7757
99 def_bool y 99 def_bool y
100 depends on CPU_SUBTYPE_SH7757 100 depends on CPU_SUBTYPE_SH7757
101 depends on GENERIC_GPIO 101 depends on GPIOLIB
102 select PINCTRL_SH_PFC 102 select PINCTRL_SH_PFC
103 103
104config PINCTRL_PFC_SH7785 104config PINCTRL_PFC_SH7785
105 def_bool y 105 def_bool y
106 depends on CPU_SUBTYPE_SH7785 106 depends on CPU_SUBTYPE_SH7785
107 depends on GENERIC_GPIO 107 depends on GPIOLIB
108 select PINCTRL_SH_PFC 108 select PINCTRL_SH_PFC
109 109
110config PINCTRL_PFC_SH7786 110config PINCTRL_PFC_SH7786
111 def_bool y 111 def_bool y
112 depends on CPU_SUBTYPE_SH7786 112 depends on CPU_SUBTYPE_SH7786
113 depends on GENERIC_GPIO 113 depends on GPIOLIB
114 select PINCTRL_SH_PFC 114 select PINCTRL_SH_PFC
115 115
116config PINCTRL_PFC_SHX3 116config PINCTRL_PFC_SHX3
117 def_bool y 117 def_bool y
118 depends on CPU_SUBTYPE_SHX3 118 depends on CPU_SUBTYPE_SHX3
119 depends on GENERIC_GPIO 119 depends on GPIOLIB
120 select PINCTRL_SH_PFC 120 select PINCTRL_SH_PFC
121 121
122endif 122endif
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index a5d97eaee99e..8bb26446037e 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -66,7 +66,7 @@ config REGULATOR_USERSPACE_CONSUMER
66 66
67config REGULATOR_GPIO 67config REGULATOR_GPIO
68 tristate "GPIO regulator support" 68 tristate "GPIO regulator support"
69 depends on GENERIC_GPIO 69 depends on GPIOLIB
70 help 70 help
71 This driver provides support for regulators that can be 71 This driver provides support for regulators that can be
72 controlled via gpios. 72 controlled via gpios.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 141d8c10b764..92a9345d7a6b 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -62,7 +62,7 @@ config SPI_ALTERA
62 62
63config SPI_ATH79 63config SPI_ATH79
64 tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver" 64 tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
65 depends on ATH79 && GENERIC_GPIO 65 depends on ATH79 && GPIOLIB
66 select SPI_BITBANG 66 select SPI_BITBANG
67 help 67 help
68 This enables support for the SPI controller present on the 68 This enables support for the SPI controller present on the
@@ -175,7 +175,7 @@ config SPI_FALCON
175 175
176config SPI_GPIO 176config SPI_GPIO
177 tristate "GPIO-based bitbanging SPI Master" 177 tristate "GPIO-based bitbanging SPI Master"
178 depends on GENERIC_GPIO 178 depends on GPIOLIB
179 select SPI_BITBANG 179 select SPI_BITBANG
180 help 180 help
181 This simple GPIO bitbanging SPI master uses the arch-neutral GPIO 181 This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
@@ -259,7 +259,7 @@ config SPI_FSL_ESPI
259 259
260config SPI_OC_TINY 260config SPI_OC_TINY
261 tristate "OpenCores tiny SPI" 261 tristate "OpenCores tiny SPI"
262 depends on GENERIC_GPIO 262 depends on GPIOLIB
263 select SPI_BITBANG 263 select SPI_BITBANG
264 help 264 help
265 This is the driver for OpenCores tiny SPI master controller. 265 This is the driver for OpenCores tiny SPI master controller.
@@ -457,7 +457,7 @@ config SPI_TOPCLIFF_PCH
457 457
458config SPI_TXX9 458config SPI_TXX9
459 tristate "Toshiba TXx9 SPI controller" 459 tristate "Toshiba TXx9 SPI controller"
460 depends on GENERIC_GPIO && CPU_TX49XX 460 depends on GPIOLIB && CPU_TX49XX
461 help 461 help
462 SPI driver for Toshiba TXx9 MIPS SoCs 462 SPI driver for Toshiba TXx9 MIPS SoCs
463 463
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig
index 9f61d46da157..c0c95be0f969 100644
--- a/drivers/staging/android/Kconfig
+++ b/drivers/staging/android/Kconfig
@@ -54,7 +54,7 @@ config ANDROID_TIMED_OUTPUT
54 54
55config ANDROID_TIMED_GPIO 55config ANDROID_TIMED_GPIO
56 tristate "Android timed gpio driver" 56 tristate "Android timed gpio driver"
57 depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT 57 depends on GPIOLIB && ANDROID_TIMED_OUTPUT
58 default n 58 default n
59 59
60config ANDROID_LOW_MEMORY_KILLER 60config ANDROID_LOW_MEMORY_KILLER
diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
index e2e786dc9c7b..ad45dfbdf417 100644
--- a/drivers/staging/iio/accel/Kconfig
+++ b/drivers/staging/iio/accel/Kconfig
@@ -61,7 +61,7 @@ config LIS3L02DQ
61 depends on SPI 61 depends on SPI
62 select IIO_TRIGGER if IIO_BUFFER 62 select IIO_TRIGGER if IIO_BUFFER
63 depends on !IIO_BUFFER || IIO_KFIFO_BUF 63 depends on !IIO_BUFFER || IIO_KFIFO_BUF
64 depends on GENERIC_GPIO 64 depends on GPIOLIB
65 help 65 help
66 Say yes here to build SPI support for the ST microelectronics 66 Say yes here to build SPI support for the ST microelectronics
67 accelerometer. The driver supplies direct access via sysfs files 67 accelerometer. The driver supplies direct access via sysfs files
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index d990829008ff..cabc7a367db5 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -73,7 +73,7 @@ config AD7780
73config AD7816 73config AD7816
74 tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver" 74 tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
75 depends on SPI 75 depends on SPI
76 depends on GENERIC_GPIO 76 depends on GPIOLIB
77 help 77 help
78 Say yes here to build support for Analog Devices AD7816/7/8 78 Say yes here to build support for Analog Devices AD7816/7/8
79 temperature sensors and ADC. 79 temperature sensors and ADC.
diff --git a/drivers/staging/iio/addac/Kconfig b/drivers/staging/iio/addac/Kconfig
index 698a8970b372..e6795e0bed1d 100644
--- a/drivers/staging/iio/addac/Kconfig
+++ b/drivers/staging/iio/addac/Kconfig
@@ -5,7 +5,7 @@ menu "Analog digital bi-direction converters"
5 5
6config ADT7316 6config ADT7316
7 tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver" 7 tristate "Analog Devices ADT7316/7/8 ADT7516/7/9 temperature sensor, ADC and DAC driver"
8 depends on GENERIC_GPIO 8 depends on GPIOLIB
9 help 9 help
10 Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318 10 Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
11 and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC. 11 and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
diff --git a/drivers/staging/iio/resolver/Kconfig b/drivers/staging/iio/resolver/Kconfig
index 49f69ef986fc..ce360f163216 100644
--- a/drivers/staging/iio/resolver/Kconfig
+++ b/drivers/staging/iio/resolver/Kconfig
@@ -13,7 +13,7 @@ config AD2S90
13config AD2S1200 13config AD2S1200
14 tristate "Analog Devices ad2s1200/ad2s1205 driver" 14 tristate "Analog Devices ad2s1200/ad2s1205 driver"
15 depends on SPI 15 depends on SPI
16 depends on GENERIC_GPIO 16 depends on GPIOLIB
17 help 17 help
18 Say yes here to build support for Analog Devices spi resolver 18 Say yes here to build support for Analog Devices spi resolver
19 to digital converters, ad2s1200 and ad2s1205, provides direct access 19 to digital converters, ad2s1200 and ad2s1205, provides direct access
@@ -22,7 +22,7 @@ config AD2S1200
22config AD2S1210 22config AD2S1210
23 tristate "Analog Devices ad2s1210 driver" 23 tristate "Analog Devices ad2s1210 driver"
24 depends on SPI 24 depends on SPI
25 depends on GENERIC_GPIO 25 depends on GPIOLIB
26 help 26 help
27 Say yes here to build support for Analog Devices spi resolver 27 Say yes here to build support for Analog Devices spi resolver
28 to digital converters, ad2s1210, provides direct access via sysfs. 28 to digital converters, ad2s1210, provides direct access via sysfs.
diff --git a/drivers/staging/iio/trigger/Kconfig b/drivers/staging/iio/trigger/Kconfig
index d44d3ad26fa5..1a051da62505 100644
--- a/drivers/staging/iio/trigger/Kconfig
+++ b/drivers/staging/iio/trigger/Kconfig
@@ -14,7 +14,7 @@ config IIO_PERIODIC_RTC_TRIGGER
14 14
15config IIO_GPIO_TRIGGER 15config IIO_GPIO_TRIGGER
16 tristate "GPIO trigger" 16 tristate "GPIO trigger"
17 depends on GENERIC_GPIO 17 depends on GPIOLIB
18 help 18 help
19 Provides support for using GPIO pins as IIO triggers. 19 Provides support for using GPIO pins as IIO triggers.
20 20
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index aab2ab2fbc90..371d0e74e909 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -128,7 +128,7 @@ config TWL6030_USB
128 128
129config USB_GPIO_VBUS 129config USB_GPIO_VBUS
130 tristate "GPIO based peripheral-only VBUS sensing 'transceiver'" 130 tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
131 depends on GENERIC_GPIO 131 depends on GPIOLIB
132 help 132 help
133 Provides simple GPIO VBUS sensing for controllers with an 133 Provides simple GPIO VBUS sensing for controllers with an
134 internal transceiver via the usb_phy interface, and 134 internal transceiver via the usb_phy interface, and
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index c04ccdf60eaa..1534cf3c1423 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2483,7 +2483,7 @@ config FB_SSD1307
2483 tristate "Solomon SSD1307 framebuffer support" 2483 tristate "Solomon SSD1307 framebuffer support"
2484 depends on FB && I2C 2484 depends on FB && I2C
2485 depends on OF 2485 depends on OF
2486 depends on GENERIC_GPIO 2486 depends on GPIOLIB
2487 select FB_SYS_FOPS 2487 select FB_SYS_FOPS
2488 select FB_SYS_FILLRECT 2488 select FB_SYS_FILLRECT
2489 select FB_SYS_COPYAREA 2489 select FB_SYS_COPYAREA
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 2e166c3fc4c3..d5ab6583f440 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -36,14 +36,14 @@ config LCD_CORGI
36 36
37config LCD_L4F00242T03 37config LCD_L4F00242T03
38 tristate "Epson L4F00242T03 LCD" 38 tristate "Epson L4F00242T03 LCD"
39 depends on SPI_MASTER && GENERIC_GPIO 39 depends on SPI_MASTER && GPIOLIB
40 help 40 help
41 SPI driver for Epson L4F00242T03. This provides basic support 41 SPI driver for Epson L4F00242T03. This provides basic support
42 for init and powering the LCD up/down through a sysfs interface. 42 for init and powering the LCD up/down through a sysfs interface.
43 43
44config LCD_LMS283GF05 44config LCD_LMS283GF05
45 tristate "Samsung LMS283GF05 LCD" 45 tristate "Samsung LMS283GF05 LCD"
46 depends on SPI_MASTER && GENERIC_GPIO 46 depends on SPI_MASTER && GPIOLIB
47 help 47 help
48 SPI driver for Samsung LMS283GF05. This provides basic support 48 SPI driver for Samsung LMS283GF05. This provides basic support
49 for powering the LCD up/down through a sysfs interface. 49 for powering the LCD up/down through a sysfs interface.
diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index e8ca63a82b97..2bd1257dcc1c 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -50,7 +50,7 @@ config W1_MASTER_DS1WM
50 50
51config W1_MASTER_GPIO 51config W1_MASTER_GPIO
52 tristate "GPIO 1-wire busmaster" 52 tristate "GPIO 1-wire busmaster"
53 depends on GENERIC_GPIO 53 depends on GPIOLIB
54 help 54 help
55 Say Y here if you want to communicate with your 1-wire devices using 55 Say Y here if you want to communicate with your 1-wire devices using
56 GPIO pins. This driver uses the GPIO API to control the wire. 56 GPIO pins. This driver uses the GPIO API to control the wire.
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index f6c7ae3e223b..552e3f46e4a3 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -39,7 +39,7 @@ struct gpio {
39 const char *label; 39 const char *label;
40}; 40};
41 41
42#ifdef CONFIG_GENERIC_GPIO 42#ifdef CONFIG_GPIOLIB
43 43
44#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H 44#ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
45#include <asm/gpio.h> 45#include <asm/gpio.h>
@@ -74,7 +74,7 @@ static inline int irq_to_gpio(unsigned int irq)
74 74
75#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */ 75#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
76 76
77#else /* ! CONFIG_GENERIC_GPIO */ 77#else /* ! CONFIG_GPIOLIB */
78 78
79#include <linux/kernel.h> 79#include <linux/kernel.h>
80#include <linux/types.h> 80#include <linux/types.h>
@@ -226,7 +226,7 @@ gpiochip_remove_pin_ranges(struct gpio_chip *chip)
226 WARN_ON(1); 226 WARN_ON(1);
227} 227}
228 228
229#endif /* ! CONFIG_GENERIC_GPIO */ 229#endif /* ! CONFIG_GPIOLIB */
230 230
231struct device; 231struct device;
232 232
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-09 19:37:03 -0400