Input: add missing dependencies on CONFIG_HAS_IOMEM
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 19 Feb 2021 18:39:16 +0000 (10:39 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 19 Feb 2021 19:02:18 +0000 (11:02 -0800)
devm_ioremap_resource() is only guaranteed to be present if
CONFIG_HAS_IOMEM is set.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/YCyauGyqxut69JNz@google.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/Kconfig
drivers/input/serio/Kconfig
drivers/input/touchscreen/Kconfig

index 94eab82086b2782a7f45f15aa20082d8aefc6bae..32d15809ae586bc95d9d127b94fb40723c2bc6b7 100644 (file)
@@ -685,7 +685,7 @@ config KEYBOARD_OMAP
 
 config KEYBOARD_OMAP4
        tristate "TI OMAP4+ keypad support"
-       depends on OF || ARCH_OMAP2PLUS
+       depends on (OF && HAS_IOMEM) || ARCH_OMAP2PLUS
        select INPUT_MATRIXKMAP
        help
          Say Y here if you want to use the OMAP4+ keypad.
@@ -773,7 +773,7 @@ config KEYBOARD_CAP11XX
 
 config KEYBOARD_BCM
        tristate "Broadcom keypad driver"
-       depends on OF && HAVE_CLK
+       depends on OF && HAVE_CLK && HAS_IOMEM
        select INPUT_MATRIXKMAP
        default ARCH_BCM_CYGNUS
        help
index 0754744b9ce5e0aa1bbaecce41cbf08d6a74c9d5..f39b7b3f7942153882faae30a4998ed9525cfbe8 100644 (file)
@@ -255,7 +255,7 @@ config SERIO_ARC_PS2
 
 config SERIO_APBPS2
        tristate "GRLIB APBPS2 PS/2 keyboard/mouse controller"
-       depends on OF
+       depends on OF && HAS_IOMEM
        help
          Say Y here if you want support for GRLIB APBPS2 peripherals used
          to connect to PS/2 keyboard and/or mouse.
index f012fe746df01ebd3cdb430437638c882b64c5c0..d1b6ef9fd8d4feac348d9d710e77caf5eee791f0 100644 (file)
@@ -607,7 +607,7 @@ config TOUCHSCREEN_MTOUCH
 
 config TOUCHSCREEN_IMX6UL_TSC
        tristate "Freescale i.MX6UL touchscreen controller"
-       depends on (OF && GPIOLIB) || COMPILE_TEST
+       depends on ((OF && GPIOLIB) || COMPILE_TEST) && HAS_IOMEM
        help
          Say Y here if you have a Freescale i.MX6UL, and want to
          use the internal touchscreen controller.