Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 76ec9d18b8972f1b228f819f6126c9f022b3e642

Authored by Alexandre Courbot
1 parent a2523d3cda
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Convert selectors of GENERIC_GPIO to GPIOLIB 

GENERIC_GPIO is now equivalent to GPIOLIB and features that depended on
GENERIC_GPIO can now depend on GPIOLIB to allow removal of this option.

Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>

Showing 25 changed files with 52 additions and 52 deletions Side-by-side Diff

arch/unicore32/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -156,7 +156,7 @@
156 156  
157 157 config LEDS
158 158 def_bool y
159   - depends on GENERIC_GPIO
  159 + depends on GPIOLIB
160 160  
161 161 config ALIGNMENT_TRAP
162 162 def_bool y
drivers/extcon/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -16,7 +16,7 @@
16 16  
17 17 config EXTCON_GPIO
18 18 tristate "GPIO extcon support"
19   - depends on GENERIC_GPIO
  19 + depends on GPIOLIB
20 20 help
21 21 Say Y here to enable GPIO based extcon support. Note that GPIO
22 22 extcon supports single state per extcon instance.
drivers/i2c/busses/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -363,7 +363,7 @@
363 363  
364 364 config I2C_CBUS_GPIO
365 365 tristate "CBUS I2C driver"
366   - depends on GENERIC_GPIO
  366 + depends on GPIOLIB
367 367 help
368 368 Support for CBUS access using I2C API. Mostly relevant for Nokia
369 369 Internet Tablets (770, N800 and N810).
... ... @@ -436,7 +436,7 @@
436 436  
437 437 config I2C_GPIO
438 438 tristate "GPIO-based bitbanging I2C"
439   - depends on GENERIC_GPIO
  439 + depends on GPIOLIB
440 440 select I2C_ALGOBIT
441 441 help
442 442 This is a very simple bitbanging I2C driver utilizing the
drivers/i2c/muxes/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -7,7 +7,7 @@
7 7  
8 8 config I2C_MUX_GPIO
9 9 tristate "GPIO-based I2C multiplexer"
10   - depends on GENERIC_GPIO
  10 + depends on GPIOLIB
11 11 help
12 12 If you say yes to this option, support will be included for a
13 13 GPIO based I2C multiplexer. This driver provides access to
drivers/input/keyboard/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -175,7 +175,7 @@
175 175  
176 176 config KEYBOARD_GPIO
177 177 tristate "GPIO Buttons"
178   - depends on GENERIC_GPIO
  178 + depends on GPIOLIB
179 179 help
180 180 This driver implements support for buttons connected
181 181 to GPIO pins of various CPUs (and some other chips).
... ... @@ -190,7 +190,7 @@
190 190  
191 191 config KEYBOARD_GPIO_POLLED
192 192 tristate "Polled GPIO buttons"
193   - depends on GENERIC_GPIO
  193 + depends on GPIOLIB
194 194 select INPUT_POLLDEV
195 195 help
196 196 This driver implements support for buttons connected
... ... @@ -241,7 +241,7 @@
241 241  
242 242 config KEYBOARD_MATRIX
243 243 tristate "GPIO driven matrix keypad support"
244   - depends on GENERIC_GPIO
  244 + depends on GPIOLIB
245 245 select INPUT_MATRIXKMAP
246 246 help
247 247 Enable support for GPIO driven matrix keypad.
drivers/input/misc/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -214,7 +214,7 @@
214 214 config INPUT_GP2A
215 215 tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
216 216 depends on I2C
217   - depends on GENERIC_GPIO
  217 + depends on GPIOLIB
218 218 help
219 219 Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
220 220 hooked to an I2C bus.
... ... @@ -224,7 +224,7 @@
224 224  
225 225 config INPUT_GPIO_TILT_POLLED
226 226 tristate "Polled GPIO tilt switch"
227   - depends on GENERIC_GPIO
  227 + depends on GPIOLIB
228 228 select INPUT_POLLDEV
229 229 help
230 230 This driver implements support for tilt switches connected
... ... @@ -472,7 +472,7 @@
472 472  
473 473 config INPUT_GPIO_ROTARY_ENCODER
474 474 tristate "Rotary encoders connected to GPIO pins"
475   - depends on GPIOLIB && GENERIC_GPIO
  475 + depends on GPIOLIB
476 476 help
477 477 Say Y here to add support for rotary encoders connected to GPIO lines.
478 478 Check file:Documentation/input/rotary-encoder.txt for more
... ... @@ -484,7 +484,7 @@
484 484 config INPUT_RB532_BUTTON
485 485 tristate "Mikrotik Routerboard 532 button interface"
486 486 depends on MIKROTIK_RB532
487   - depends on GPIOLIB && GENERIC_GPIO
  487 + depends on GPIOLIB
488 488 select INPUT_POLLDEV
489 489 help
490 490 Say Y here if you want support for the S1 button built into
drivers/input/mouse/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -295,7 +295,7 @@
295 295  
296 296 config MOUSE_GPIO
297 297 tristate "GPIO mouse"
298   - depends on GENERIC_GPIO
  298 + depends on GPIOLIB
299 299 select INPUT_POLLDEV
300 300 help
301 301 This driver simulates a mouse on GPIO lines of various CPUs (and some
drivers/leds/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -173,7 +173,7 @@
173 173 config LEDS_GPIO
174 174 tristate "LED Support for GPIO connected LEDs"
175 175 depends on LEDS_CLASS
176   - depends on GENERIC_GPIO
  176 + depends on GPIOLIB
177 177 help
178 178 This option enables support for the LEDs connected to GPIO
179 179 outputs. To be useful the particular board must have LEDs
... ... @@ -352,7 +352,7 @@
352 352 config LEDS_LT3593
353 353 tristate "LED driver for LT3593 controllers"
354 354 depends on LEDS_CLASS
355   - depends on GENERIC_GPIO
  355 + depends on GPIOLIB
356 356 help
357 357 This option enables support for LEDs driven by a Linear Technology
358 358 LT3593 controller. This controller uses a special one-wire pulse
... ... @@ -421,7 +421,7 @@
421 421  
422 422 config LEDS_RENESAS_TPU
423 423 bool "LED support for Renesas TPU"
424   - depends on LEDS_CLASS=y && HAVE_CLK && GENERIC_GPIO
  424 + depends on LEDS_CLASS=y && HAVE_CLK && GPIOLIB
425 425 help
426 426 This option enables build of the LED TPU platform driver,
427 427 suitable to drive any TPU channel on newer Renesas SoCs.
drivers/mtd/maps/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -419,7 +419,7 @@
419 419  
420 420 config MTD_GPIO_ADDR
421 421 tristate "GPIO-assisted Flash Chip Support"
422   - depends on GENERIC_GPIO || GPIOLIB
  422 + depends on GPIOLIB
423 423 depends on MTD_COMPLEX_MAPPINGS
424 424 help
425 425 Map driver which allows flashes to be partially physically addressed
drivers/mtd/nand/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -89,7 +89,7 @@
89 89  
90 90 config MTD_NAND_GPIO
91 91 tristate "GPIO NAND Flash driver"
92   - depends on GENERIC_GPIO && ARM
  92 + depends on GPIOLIB && ARM
93 93 help
94 94 This enables a GPIO based NAND flash driver.
95 95  
drivers/net/phy/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -126,7 +126,7 @@
126 126  
127 127 config MDIO_GPIO
128 128 tristate "Support for GPIO lib-based bitbanged MDIO buses"
129   - depends on MDIO_BITBANG && GENERIC_GPIO
  129 + depends on MDIO_BITBANG && GPIOLIB
130 130 ---help---
131 131 Supports GPIO lib-based MDIO busses.
132 132  
drivers/pinctrl/sh-pfc/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -6,7 +6,7 @@
6 6  
7 7 config PINCTRL_SH_PFC
8 8 # XXX move off the gpio dependency
9   - depends on GENERIC_GPIO
  9 + depends on GPIOLIB
10 10 select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
11 11 select PINMUX
12 12 select PINCONF
13 13  
14 14  
... ... @@ -34,19 +34,19 @@
34 34 config PINCTRL_PFC_SH7203
35 35 def_bool y
36 36 depends on CPU_SUBTYPE_SH7203
37   - depends on GENERIC_GPIO
  37 + depends on GPIOLIB
38 38 select PINCTRL_SH_PFC
39 39  
40 40 config PINCTRL_PFC_SH7264
41 41 def_bool y
42 42 depends on CPU_SUBTYPE_SH7264
43   - depends on GENERIC_GPIO
  43 + depends on GPIOLIB
44 44 select PINCTRL_SH_PFC
45 45  
46 46 config PINCTRL_PFC_SH7269
47 47 def_bool y
48 48 depends on CPU_SUBTYPE_SH7269
49   - depends on GENERIC_GPIO
  49 + depends on GPIOLIB
50 50 select PINCTRL_SH_PFC
51 51  
52 52 config PINCTRL_PFC_SH7372
53 53  
54 54  
55 55  
56 56  
57 57  
58 58  
59 59  
60 60  
... ... @@ -62,55 +62,55 @@
62 62 config PINCTRL_PFC_SH7720
63 63 def_bool y
64 64 depends on CPU_SUBTYPE_SH7720
65   - depends on GENERIC_GPIO
  65 + depends on GPIOLIB
66 66 select PINCTRL_SH_PFC
67 67  
68 68 config PINCTRL_PFC_SH7722
69 69 def_bool y
70 70 depends on CPU_SUBTYPE_SH7722
71   - depends on GENERIC_GPIO
  71 + depends on GPIOLIB
72 72 select PINCTRL_SH_PFC
73 73  
74 74 config PINCTRL_PFC_SH7723
75 75 def_bool y
76 76 depends on CPU_SUBTYPE_SH7723
77   - depends on GENERIC_GPIO
  77 + depends on GPIOLIB
78 78 select PINCTRL_SH_PFC
79 79  
80 80 config PINCTRL_PFC_SH7724
81 81 def_bool y
82 82 depends on CPU_SUBTYPE_SH7724
83   - depends on GENERIC_GPIO
  83 + depends on GPIOLIB
84 84 select PINCTRL_SH_PFC
85 85  
86 86 config PINCTRL_PFC_SH7734
87 87 def_bool y
88 88 depends on CPU_SUBTYPE_SH7734
89   - depends on GENERIC_GPIO
  89 + depends on GPIOLIB
90 90 select PINCTRL_SH_PFC
91 91  
92 92 config PINCTRL_PFC_SH7757
93 93 def_bool y
94 94 depends on CPU_SUBTYPE_SH7757
95   - depends on GENERIC_GPIO
  95 + depends on GPIOLIB
96 96 select PINCTRL_SH_PFC
97 97  
98 98 config PINCTRL_PFC_SH7785
99 99 def_bool y
100 100 depends on CPU_SUBTYPE_SH7785
101   - depends on GENERIC_GPIO
  101 + depends on GPIOLIB
102 102 select PINCTRL_SH_PFC
103 103  
104 104 config PINCTRL_PFC_SH7786
105 105 def_bool y
106 106 depends on CPU_SUBTYPE_SH7786
107   - depends on GENERIC_GPIO
  107 + depends on GPIOLIB
108 108 select PINCTRL_SH_PFC
109 109  
110 110 config PINCTRL_PFC_SHX3
111 111 def_bool y
112 112 depends on CPU_SUBTYPE_SHX3
113   - depends on GENERIC_GPIO
  113 + depends on GPIOLIB
114 114 select PINCTRL_SH_PFC
115 115  
116 116 endif
drivers/regulator/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -66,7 +66,7 @@
66 66  
67 67 config REGULATOR_GPIO
68 68 tristate "GPIO regulator support"
69   - depends on GENERIC_GPIO
  69 + depends on GPIOLIB
70 70 help
71 71 This driver provides support for regulators that can be
72 72 controlled via gpios.
... ... @@ -61,7 +61,7 @@
61 61  
62 62 config SPI_ATH79
63 63 tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"
64   - depends on ATH79 && GENERIC_GPIO
  64 + depends on ATH79 && GPIOLIB
65 65 select SPI_BITBANG
66 66 help
67 67 This enables support for the SPI controller present on the
... ... @@ -163,7 +163,7 @@
163 163  
164 164 config SPI_GPIO
165 165 tristate "GPIO-based bitbanging SPI Master"
166   - depends on GENERIC_GPIO
  166 + depends on GPIOLIB
167 167 select SPI_BITBANG
168 168 help
169 169 This simple GPIO bitbanging SPI master uses the arch-neutral GPIO
... ... @@ -240,7 +240,7 @@
240 240  
241 241 config SPI_OC_TINY
242 242 tristate "OpenCores tiny SPI"
243   - depends on GENERIC_GPIO
  243 + depends on GPIOLIB
244 244 select SPI_BITBANG
245 245 help
246 246 This is the driver for OpenCores tiny SPI master controller.
... ... @@ -430,7 +430,7 @@
430 430  
431 431 config SPI_TXX9
432 432 tristate "Toshiba TXx9 SPI controller"
433   - depends on GENERIC_GPIO && CPU_TX49XX
  433 + depends on GPIOLIB && CPU_TX49XX
434 434 help
435 435 SPI driver for Toshiba TXx9 MIPS SoCs
436 436  
drivers/staging/android/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -54,7 +54,7 @@
54 54  
55 55 config ANDROID_TIMED_GPIO
56 56 tristate "Android timed gpio driver"
57   - depends on GENERIC_GPIO && ANDROID_TIMED_OUTPUT
  57 + depends on GPIOLIB && ANDROID_TIMED_OUTPUT
58 58 default n
59 59  
60 60 config ANDROID_LOW_MEMORY_KILLER
drivers/staging/iio/accel/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -61,7 +61,7 @@
61 61 depends on SPI
62 62 select IIO_TRIGGER if IIO_BUFFER
63 63 depends on !IIO_BUFFER || IIO_KFIFO_BUF
64   - depends on GENERIC_GPIO
  64 + depends on GPIOLIB
65 65 help
66 66 Say yes here to build SPI support for the ST microelectronics
67 67 accelerometer. The driver supplies direct access via sysfs files
drivers/staging/iio/adc/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -73,7 +73,7 @@
73 73 config AD7816
74 74 tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
75 75 depends on SPI
76   - depends on GENERIC_GPIO
  76 + depends on GPIOLIB
77 77 help
78 78 Say yes here to build support for Analog Devices AD7816/7/8
79 79 temperature sensors and ADC.
drivers/staging/iio/addac/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -5,7 +5,7 @@
5 5  
6 6 config ADT7316
7 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 9 help
10 10 Say yes here to build support for Analog Devices ADT7316, ADT7317, ADT7318
11 11 and ADT7516, ADT7517, ADT7519 temperature sensors, ADC and DAC.
drivers/staging/iio/resolver/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -13,7 +13,7 @@
13 13 config AD2S1200
14 14 tristate "Analog Devices ad2s1200/ad2s1205 driver"
15 15 depends on SPI
16   - depends on GENERIC_GPIO
  16 + depends on GPIOLIB
17 17 help
18 18 Say yes here to build support for Analog Devices spi resolver
19 19 to digital converters, ad2s1200 and ad2s1205, provides direct access
... ... @@ -22,7 +22,7 @@
22 22 config AD2S1210
23 23 tristate "Analog Devices ad2s1210 driver"
24 24 depends on SPI
25   - depends on GENERIC_GPIO
  25 + depends on GPIOLIB
26 26 help
27 27 Say yes here to build support for Analog Devices spi resolver
28 28 to digital converters, ad2s1210, provides direct access via sysfs.
drivers/staging/iio/trigger/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -14,7 +14,7 @@
14 14  
15 15 config IIO_GPIO_TRIGGER
16 16 tristate "GPIO trigger"
17   - depends on GENERIC_GPIO
  17 + depends on GPIOLIB
18 18 help
19 19 Provides support for using GPIO pins as IIO triggers.
20 20  
drivers/usb/otg/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -19,7 +19,7 @@
19 19 #
20 20 config USB_GPIO_VBUS
21 21 tristate "GPIO based peripheral-only VBUS sensing 'transceiver'"
22   - depends on GENERIC_GPIO
  22 + depends on GPIOLIB
23 23 select USB_OTG_UTILS
24 24 help
25 25 Provides simple GPIO VBUS sensing for controllers with an
drivers/video/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -2481,7 +2481,7 @@
2481 2481 tristate "Solomon SSD1307 framebuffer support"
2482 2482 depends on FB && I2C
2483 2483 depends on OF
2484   - depends on GENERIC_GPIO
  2484 + depends on GPIOLIB
2485 2485 select FB_SYS_FOPS
2486 2486 select FB_SYS_FILLRECT
2487 2487 select FB_SYS_COPYAREA
drivers/video/backlight/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -36,14 +36,14 @@
36 36  
37 37 config LCD_L4F00242T03
38 38 tristate "Epson L4F00242T03 LCD"
39   - depends on SPI_MASTER && GENERIC_GPIO
  39 + depends on SPI_MASTER && GPIOLIB
40 40 help
41 41 SPI driver for Epson L4F00242T03. This provides basic support
42 42 for init and powering the LCD up/down through a sysfs interface.
43 43  
44 44 config LCD_LMS283GF05
45 45 tristate "Samsung LMS283GF05 LCD"
46   - depends on SPI_MASTER && GENERIC_GPIO
  46 + depends on SPI_MASTER && GPIOLIB
47 47 help
48 48 SPI driver for Samsung LMS283GF05. This provides basic support
49 49 for powering the LCD up/down through a sysfs interface.
drivers/w1/masters/Kconfig
Diff comments   View file @ 76ec9d1
... ... @@ -50,7 +50,7 @@
50 50  
51 51 config W1_MASTER_GPIO
52 52 tristate "GPIO 1-wire busmaster"
53   - depends on GENERIC_GPIO
  53 + depends on GPIOLIB
54 54 help
55 55 Say Y here if you want to communicate with your 1-wire devices using
56 56 GPIO pins. This driver uses the GPIO API to control the wire.
include/linux/gpio.h
Diff comments   View file @ 76ec9d1
... ... @@ -39,7 +39,7 @@
39 39 const char *label;
40 40 };
41 41  
42   -#ifdef CONFIG_GENERIC_GPIO
  42 +#ifdef CONFIG_GPIOLIB
43 43  
44 44 #ifdef CONFIG_ARCH_HAVE_CUSTOM_GPIO_H
45 45 #include <asm/gpio.h>
... ... @@ -74,7 +74,7 @@
74 74  
75 75 #endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
76 76  
77   -#else /* ! CONFIG_GENERIC_GPIO */
  77 +#else /* ! CONFIG_GPIOLIB */
78 78  
79 79 #include <linux/kernel.h>
80 80 #include <linux/types.h>
... ... @@ -226,7 +226,7 @@
226 226 WARN_ON(1);
227 227 }
228 228  
229   -#endif /* ! CONFIG_GENERIC_GPIO */
  229 +#endif /* ! CONFIG_GPIOLIB */
230 230  
231 231 struct device;
232 232