Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d6548ab authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Dmitry Torokhov
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 62f46669

drivers/input/keyboard/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ config KEYBOARD_EP93XX 




config KEYBOARD_GPIO

config KEYBOARD_GPIO

	tristate "GPIO Buttons"

	tristate "GPIO Buttons"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  This driver implements support for buttons connected

	  This driver implements support for buttons connected

	  to GPIO pins of various CPUs (and some other chips).

	  to GPIO pins of various CPUs (and some other chips).
@@ -253,7 +253,7 @@ config KEYBOARD_TCA8418 




config KEYBOARD_MATRIX

config KEYBOARD_MATRIX

	tristate "GPIO driven matrix keypad support"

	tristate "GPIO driven matrix keypad support"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	select INPUT_MATRIXKMAP

	select INPUT_MATRIXKMAP

	help

	help

	  Enable support for GPIO driven matrix keypad.

	  Enable support for GPIO driven matrix keypad.

drivers/input/misc/Kconfig

+6 −5
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ config INPUT_APANEL 
config INPUT_GP2A

config INPUT_GP2A

	tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"

	tristate "Sharp GP2AP002A00F I2C Proximity/Opto sensor driver"

	depends on I2C

	depends on I2C

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip

	  Say Y here if you have a Sharp GP2AP002A00F proximity/als combo-chip

	  hooked to an I2C bus.

	  hooked to an I2C bus.
@@ -269,7 +269,7 @@ config INPUT_GP2A 




config INPUT_GPIO_BEEPER

config INPUT_GPIO_BEEPER

	tristate "Generic GPIO Beeper support"

	tristate "Generic GPIO Beeper support"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here if you have a beeper connected to a GPIO pin.

	  Say Y here if you have a beeper connected to a GPIO pin.
@@ -278,7 +278,7 @@ config INPUT_GPIO_BEEPER 




config INPUT_GPIO_TILT_POLLED

config INPUT_GPIO_TILT_POLLED

	tristate "Polled GPIO tilt switch"

	tristate "Polled GPIO tilt switch"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	select INPUT_POLLDEV

	select INPUT_POLLDEV

	help

	help

	  This driver implements support for tilt switches connected

	  This driver implements support for tilt switches connected
@@ -569,7 +569,7 @@ config INPUT_PWM_BEEPER 




config INPUT_GPIO_ROTARY_ENCODER

config INPUT_GPIO_ROTARY_ENCODER

	tristate "Rotary encoders connected to GPIO pins"

	tristate "Rotary encoders connected to GPIO pins"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here to add support for rotary encoders connected to GPIO lines.

	  Say Y here to add support for rotary encoders connected to GPIO lines.

	  Check file:Documentation/input/rotary-encoder.txt for more

	  Check file:Documentation/input/rotary-encoder.txt for more
@@ -776,7 +776,8 @@ config INPUT_SOC_BUTTON_ARRAY 




config INPUT_DRV260X_HAPTICS

config INPUT_DRV260X_HAPTICS

	tristate "TI DRV260X haptics support"

	tristate "TI DRV260X haptics support"

	depends on INPUT && I2C && GPIOLIB

	depends on INPUT && I2C

	depends on GPIOLIB || COMPILE_TEST

	select INPUT_FF_MEMLESS

	select INPUT_FF_MEMLESS

	select REGMAP_I2C

	select REGMAP_I2C

	help

	help

drivers/input/mouse/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -341,7 +341,7 @@ config MOUSE_VSXXXAA 




config MOUSE_GPIO

config MOUSE_GPIO

	tristate "GPIO mouse"

	tristate "GPIO mouse"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	select INPUT_POLLDEV

	select INPUT_POLLDEV

	help

	help

	  This driver simulates a mouse on GPIO lines of various CPUs (and some

	  This driver simulates a mouse on GPIO lines of various CPUs (and some

drivers/input/touchscreen/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ config TOUCHSCREEN_ATMEL_MXT 
config TOUCHSCREEN_AUO_PIXCIR

config TOUCHSCREEN_AUO_PIXCIR

	tristate "AUO in-cell touchscreen using Pixcir ICs"

	tristate "AUO in-cell touchscreen using Pixcir ICs"

	depends on I2C

	depends on I2C

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here if you have a AUO display with in-cell touchscreen

	  Say Y here if you have a AUO display with in-cell touchscreen

	  using Pixcir ICs.

	  using Pixcir ICs.
@@ -142,7 +142,7 @@ config TOUCHSCREEN_BU21013 




config TOUCHSCREEN_CHIPONE_ICN8318

config TOUCHSCREEN_CHIPONE_ICN8318

	tristate "chipone icn8318 touchscreen controller"

	tristate "chipone icn8318 touchscreen controller"

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	depends on I2C

	depends on I2C

	depends on OF

	depends on OF

	help

	help
@@ -156,7 +156,7 @@ config TOUCHSCREEN_CHIPONE_ICN8318 
config TOUCHSCREEN_CY8CTMG110

config TOUCHSCREEN_CY8CTMG110

	tristate "cy8ctmg110 touchscreen"

	tristate "cy8ctmg110 touchscreen"

	depends on I2C

	depends on I2C

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here if you have a cy8ctmg110 capacitive touchscreen on

	  Say Y here if you have a cy8ctmg110 capacitive touchscreen on

	  an AAVA device.

	  an AAVA device.
@@ -1030,7 +1030,7 @@ config TOUCHSCREEN_TPS6507X 
config TOUCHSCREEN_ZFORCE

config TOUCHSCREEN_ZFORCE

	tristate "Neonode zForce infrared touchscreens"

	tristate "Neonode zForce infrared touchscreens"

	depends on I2C

	depends on I2C

	depends on GPIOLIB

	depends on GPIOLIB || COMPILE_TEST

	help

	help

	  Say Y here if you have a touchscreen using the zforce

	  Say Y here if you have a touchscreen using the zforce

	  infraread technology from Neonode.

	  infraread technology from Neonode.