diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 12:59:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-09 12:59:16 -0400 |
commit | 5647ac0ad4f355817b788372a01cb293ed63bde4 (patch) | |
tree | bb454ce9bf63f145c467e042cd2f5b3367c1a9aa /drivers | |
parent | 1763e735b0a093a6747078b3bd101f079e576ab6 (diff) | |
parent | f4c54050640e7afa4749875cf9b900d42db361c0 (diff) |
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
Pull removal of GENERIC_GPIO from Grant Likely:
"GENERIC_GPIO now synonymous with GPIOLIB. There are no longer any
valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
is possible to do so which has been causing confusion and breakage.
This branch does the work to completely eliminate GENERIC_GPIO."
* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
gpio: update gpio Chinese documentation
Remove GENERIC_GPIO config option
Convert selectors of GENERIC_GPIO to GPIOLIB
blackfin: force use of gpiolib
m68k: coldfire: use gpiolib
mips: pnx833x: remove requirement for GENERIC_GPIO
openrisc: default GENERIC_GPIO to false
avr32: default GENERIC_GPIO to false
xtensa: remove explicit selection of GENERIC_GPIO
sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
powerpc: remove redundant GENERIC_GPIO selection
unicore32: default GENERIC_GPIO to false
unicore32: remove unneeded select GENERIC_GPIO
arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
arm: remove redundant GENERIC_GPIO selection
mips: alchemy: require gpiolib
mips: txx9: change GENERIC_GPIO to GPIOLIB
mips: loongson: use GPIO driver on CONFIG_GPIOLIB
mips: remove redundant GENERIC_GPIO select
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/extcon/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpio/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpio/gpio-lpc32xx.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/Kconfig | 4 | ||||
-rw-r--r-- | drivers/i2c/muxes/Kconfig | 4 | ||||
-rw-r--r-- | drivers/input/keyboard/Kconfig | 6 | ||||
-rw-r--r-- | drivers/input/misc/Kconfig | 8 | ||||
-rw-r--r-- | drivers/input/mouse/Kconfig | 2 | ||||
-rw-r--r-- | drivers/leds/Kconfig | 6 | ||||
-rw-r--r-- | drivers/mtd/maps/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mtd/nand/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/phy/Kconfig | 2 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/Kconfig | 26 | ||||
-rw-r--r-- | drivers/regulator/Kconfig | 2 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 8 | ||||
-rw-r--r-- | drivers/staging/android/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/iio/accel/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/iio/adc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/iio/addac/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/iio/resolver/Kconfig | 4 | ||||
-rw-r--r-- | drivers/staging/iio/trigger/Kconfig | 2 | ||||
-rw-r--r-- | drivers/usb/phy/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/backlight/Kconfig | 4 | ||||
-rw-r--r-- | drivers/w1/masters/Kconfig | 2 |
25 files changed, 50 insertions, 51 deletions
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 | ||
17 | config EXTCON_GPIO | 17 | config 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 | |||
38 | menuconfig GPIOLIB | 38 | menuconfig 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 | */ |
260 | static int lpc32xx_gpio_dir_input_p012(struct gpio_chip *chip, | 260 | static 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 | ||
364 | config I2C_CBUS_GPIO | 364 | config 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 | ||
437 | config I2C_GPIO | 437 | config 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 | ||
8 | config I2C_ARB_GPIO_CHALLENGE | 8 | config 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 | ||
20 | config I2C_MUX_GPIO | 20 | config 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 | ||
176 | config KEYBOARD_GPIO | 176 | config 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 | ||
191 | config KEYBOARD_GPIO_POLLED | 191 | config 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 | ||
242 | config KEYBOARD_MATRIX | 242 | config 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 | |||
214 | config INPUT_GP2A | 214 | config 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 | ||
225 | config INPUT_GPIO_TILT_POLLED | 225 | config 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 | ||
473 | config INPUT_GPIO_ROTARY_ENCODER | 473 | config 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 | |||
484 | config INPUT_RB532_BUTTON | 484 | config 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 | ||
296 | config MOUSE_GPIO | 296 | config 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 | |||
173 | config LEDS_GPIO | 173 | config 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 | |||
362 | config LEDS_LT3593 | 362 | config 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 | ||
432 | config LEDS_RENESAS_TPU | 432 | config 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 | ||
420 | config MTD_GPIO_ADDR | 420 | config 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 | ||
90 | config MTD_NAND_GPIO | 90 | config 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 | ||
127 | config MDIO_GPIO | 127 | config 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 | ||
7 | config PINCTRL_SH_PFC | 7 | config 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 | |||
40 | config PINCTRL_PFC_SH7203 | 40 | config 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 | ||
46 | config PINCTRL_PFC_SH7264 | 46 | config 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 | ||
52 | config PINCTRL_PFC_SH7269 | 52 | config 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 | ||
58 | config PINCTRL_PFC_SH7372 | 58 | config PINCTRL_PFC_SH7372 |
@@ -68,55 +68,55 @@ config PINCTRL_PFC_SH73A0 | |||
68 | config PINCTRL_PFC_SH7720 | 68 | config 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 | ||
74 | config PINCTRL_PFC_SH7722 | 74 | config 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 | ||
80 | config PINCTRL_PFC_SH7723 | 80 | config 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 | ||
86 | config PINCTRL_PFC_SH7724 | 86 | config 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 | ||
92 | config PINCTRL_PFC_SH7734 | 92 | config 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 | ||
98 | config PINCTRL_PFC_SH7757 | 98 | config 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 | ||
104 | config PINCTRL_PFC_SH7785 | 104 | config 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 | ||
110 | config PINCTRL_PFC_SH7786 | 110 | config 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 | ||
116 | config PINCTRL_PFC_SHX3 | 116 | config 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 | ||
122 | endif | 122 | endif |
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 | ||
67 | config REGULATOR_GPIO | 67 | config 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 | ||
63 | config SPI_ATH79 | 63 | config 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 | ||
176 | config SPI_GPIO | 176 | config 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 | ||
260 | config SPI_OC_TINY | 260 | config 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 | ||
458 | config SPI_TXX9 | 458 | config 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 | ||
55 | config ANDROID_TIMED_GPIO | 55 | config 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 | ||
60 | config ANDROID_LOW_MEMORY_KILLER | 60 | config 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 | |||
73 | config AD7816 | 73 | config 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 | ||
6 | config ADT7316 | 6 | config 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 | |||
13 | config AD2S1200 | 13 | config 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 | |||
22 | config AD2S1210 | 22 | config 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 | ||
15 | config IIO_GPIO_TRIGGER | 15 | config 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 | ||
129 | config USB_GPIO_VBUS | 129 | config 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 | ||
37 | config LCD_L4F00242T03 | 37 | config 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 | ||
44 | config LCD_LMS283GF05 | 44 | config 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 | ||
51 | config W1_MASTER_GPIO | 51 | config 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. |