aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2015-08-04 14:43:40 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-08-04 14:45:45 -0400
commit7d6548abcf4ea4845db8a62a5875d93e2c1bf882 (patch)
tree11d130f2f3ae7dfc5481959b9f7d4f3f0d9a3154 /drivers/input
parent62f46669688bf13643b91bbc30f19da1095a5ed6 (diff)
Input: Allow compile test of GPIO consumers if !GPIOLIB
The GPIO subsystem provides dummy GPIO consumer functions if GPIOLIB is not enabled. Hence drivers that depend on GPIOLIB, but use GPIO consumer functionality only, can still be compiled if GPIOLIB is not enabled. Relax the dependency on GPIOLIB if COMPILE_TEST is enabled, where appropriate. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/Kconfig4
-rw-r--r--drivers/input/misc/Kconfig11
-rw-r--r--drivers/input/mouse/Kconfig2
-rw-r--r--drivers/input/touchscreen/Kconfig8
4 files changed, 13 insertions, 12 deletions
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 4cd94fd6cbad..10dfa23b11a8 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -187,7 +187,7 @@ config KEYBOARD_EP93XX
187 187
188config KEYBOARD_GPIO 188config KEYBOARD_GPIO
189 tristate "GPIO Buttons" 189 tristate "GPIO Buttons"
190 depends on GPIOLIB 190 depends on GPIOLIB || COMPILE_TEST
191 help 191 help
192 This driver implements support for buttons connected 192 This driver implements support for buttons connected
193 to GPIO pins of various CPUs (and some other chips). 193 to GPIO pins of various CPUs (and some other chips).
@@ -253,7 +253,7 @@ config KEYBOARD_TCA8418
253 253
254config KEYBOARD_MATRIX 254config KEYBOARD_MATRIX
255 tristate "GPIO driven matrix keypad support" 255 tristate "GPIO driven matrix keypad support"
256 depends on GPIOLIB 256 depends on GPIOLIB || COMPILE_TEST
257 select INPUT_MATRIXKMAP 257 select INPUT_MATRIXKMAP
258 help 258 help
259 Enable support for GPIO driven matrix keypad. 259 Enable support for GPIO driven matrix keypad.
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index d4f0a817e858..dade381c7da8 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -259,7 +259,7 @@ config INPUT_APANEL
259config INPUT_GP2A 259config INPUT_GP2A
260 tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver" 260 tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"
261 depends on I2C 261 depends on I2C
262 depends on GPIOLIB 262 depends on GPIOLIB || COMPILE_TEST
263 help 263 help
264 Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip 264 Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip
265 hooked to an I2C bus. 265 hooked to an I2C bus.
@@ -269,7 +269,7 @@ config INPUT_GP2A
269 269
270config INPUT_GPIO_BEEPER 270config INPUT_GPIO_BEEPER
271 tristate "Generic GPIO Beeper support" 271 tristate "Generic GPIO Beeper support"
272 depends on GPIOLIB 272 depends on GPIOLIB || COMPILE_TEST
273 help 273 help
274 Say Y here if you have a beeper connected to a GPIO pin. 274 Say Y here if you have a beeper connected to a GPIO pin.
275 275
@@ -278,7 +278,7 @@ config INPUT_GPIO_BEEPER
278 278
279config INPUT_GPIO_TILT_POLLED 279config INPUT_GPIO_TILT_POLLED
280 tristate "Polled GPIO tilt switch" 280 tristate "Polled GPIO tilt switch"
281 depends on GPIOLIB 281 depends on GPIOLIB || COMPILE_TEST
282 select INPUT_POLLDEV 282 select INPUT_POLLDEV
283 help 283 help
284 This driver implements support for tilt switches connected 284 This driver implements support for tilt switches connected
@@ -569,7 +569,7 @@ config INPUT_PWM_BEEPER
569 569
570config INPUT_GPIO_ROTARY_ENCODER 570config INPUT_GPIO_ROTARY_ENCODER
571 tristate "Rotary encoders connected to GPIO pins" 571 tristate "Rotary encoders connected to GPIO pins"
572 depends on GPIOLIB 572 depends on GPIOLIB || COMPILE_TEST
573 help 573 help
574 Say Y here to add support for rotary encoders connected to GPIO lines. 574 Say Y here to add support for rotary encoders connected to GPIO lines.
575 Check file:Documentation/input/rotary-encoder.txt for more 575 Check file:Documentation/input/rotary-encoder.txt for more
@@ -776,7 +776,8 @@ config INPUT_SOC_BUTTON_ARRAY
776 776
777config INPUT_DRV260X_HAPTICS 777config INPUT_DRV260X_HAPTICS
778 tristate "TI DRV260X haptics support" 778 tristate "TI DRV260X haptics support"
779 depends on INPUT && I2C && GPIOLIB 779 depends on INPUT && I2C
780 depends on GPIOLIB || COMPILE_TEST
780 select INPUT_FF_MEMLESS 781 select INPUT_FF_MEMLESS
781 select REGMAP_I2C 782 select REGMAP_I2C
782 help 783 help
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index d7820d1152d2..17f97e5e11e7 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -341,7 +341,7 @@ config MOUSE_VSXXXAA
341 341
342config MOUSE_GPIO 342config MOUSE_GPIO
343 tristate "GPIO mouse" 343 tristate "GPIO mouse"
344 depends on GPIOLIB 344 depends on GPIOLIB || COMPILE_TEST
345 select INPUT_POLLDEV 345 select INPUT_POLLDEV
346 help 346 help
347 This driver simulates a mouse on GPIO lines of various CPUs (and some 347 This driver simulates a mouse on GPIO lines of various CPUs (and some
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 860d426c480e..059edeb7f04a 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -118,7 +118,7 @@ config TOUCHSCREEN_ATMEL_MXT
118config TOUCHSCREEN_AUO_PIXCIR 118config TOUCHSCREEN_AUO_PIXCIR
119 tristate "AUO in-cell touchscreen using Pixcir ICs" 119 tristate "AUO in-cell touchscreen using Pixcir ICs"
120 depends on I2C 120 depends on I2C
121 depends on GPIOLIB 121 depends on GPIOLIB || COMPILE_TEST
122 help 122 help
123 Say Y here if you have a AUO display with in-cell touchscreen 123 Say Y here if you have a AUO display with in-cell touchscreen
124 using Pixcir ICs. 124 using Pixcir ICs.
@@ -142,7 +142,7 @@ config TOUCHSCREEN_BU21013
142 142
143config TOUCHSCREEN_CHIPONE_ICN8318 143config TOUCHSCREEN_CHIPONE_ICN8318
144 tristate "chipone icn8318 touchscreen controller" 144 tristate "chipone icn8318 touchscreen controller"
145 depends on GPIOLIB 145 depends on GPIOLIB || COMPILE_TEST
146 depends on I2C 146 depends on I2C
147 depends on OF 147 depends on OF
148 help 148 help
@@ -156,7 +156,7 @@ config TOUCHSCREEN_CHIPONE_ICN8318
156config TOUCHSCREEN_CY8CTMG110 156config TOUCHSCREEN_CY8CTMG110
157 tristate "cy8ctmg110 touchscreen" 157 tristate "cy8ctmg110 touchscreen"
158 depends on I2C 158 depends on I2C
159 depends on GPIOLIB 159 depends on GPIOLIB || COMPILE_TEST
160 help 160 help
161 Say Y here if you have a cy8ctmg110 capacitive touchscreen on 161 Say Y here if you have a cy8ctmg110 capacitive touchscreen on
162 an AAVA device. 162 an AAVA device.
@@ -1030,7 +1030,7 @@ config TOUCHSCREEN_TPS6507X
1030config TOUCHSCREEN_ZFORCE 1030config TOUCHSCREEN_ZFORCE
1031 tristate "Neonode zForce infrared touchscreens" 1031 tristate "Neonode zForce infrared touchscreens"
1032 depends on I2C 1032 depends on I2C
1033 depends on GPIOLIB 1033 depends on GPIOLIB || COMPILE_TEST
1034 help 1034 help
1035 Say Y here if you have a touchscreen using the zforce 1035 Say Y here if you have a touchscreen using the zforce
1036 infraread technology from Neonode. 1036 infraread technology from Neonode.