| Message ID | 20190808212234.2213262-14-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hi Arnd, On Thu, Aug 08, 2019 at 11:22:22PM +0200, Arnd Bergmann wrote: > By using the new linux/soc/ti/omap1-io.h header instead, > compile-testing can be enabled, and a CONFIG_ARCH_MULTIPLATFORM > conversion of omap1 may eventually be possible. > > The warning in the header file gets removed in order to > allow CONFIG_COMPILE_TEST. Given that we want to migrate people off this driver everywhere but OMAP1 I wonder why we would want to improve compile coverage of it. Thanks. -- Dmitry
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 5f1a3b3ee0fb..b454d262906b 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -658,7 +658,7 @@ config KEYBOARD_IPAQ_MICRO config KEYBOARD_OMAP tristate "TI OMAP keypad support" - depends on ARCH_OMAP1 + depends on ARCH_OMAP1 || COMPILE_TEST select INPUT_MATRIXKMAP help Say Y here if you want to use the OMAP keypad. diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 5fe7a5633e33..31da8e878535 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -24,6 +24,7 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/keypad-omap.h> +#include <linux/soc/ti/omap1-io.h> #undef NEW_BOARD_LEARNING_MODE diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h index 3e7c64c854f4..6f058eb188c4 100644 --- a/include/linux/platform_data/keypad-omap.h +++ b/include/linux/platform_data/keypad-omap.h @@ -5,11 +5,6 @@ #ifndef __KEYPAD_OMAP_H #define __KEYPAD_OMAP_H -#ifndef CONFIG_ARCH_OMAP1 -#warning Please update the board to use matrix-keypad driver -#define omap_readw(reg) 0 -#define omap_writew(val, reg) do {} while (0) -#endif #include <linux/input/matrix_keypad.h> struct omap_kp_platform_data {
By using the new linux/soc/ti/omap1-io.h header instead, compile-testing can be enabled, and a CONFIG_ARCH_MULTIPLATFORM conversion of omap1 may eventually be possible. The warning in the header file gets removed in order to allow CONFIG_COMPILE_TEST. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/input/keyboard/Kconfig | 2 +- drivers/input/keyboard/omap-keypad.c | 1 + include/linux/platform_data/keypad-omap.h | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) -- 2.20.0