From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 13/22] input: omap: void using mach/*.h headers Date: Thu, 8 Aug 2019 23:22:22 +0200 Message-ID: <20190808212234.2213262-14-arnd@arndb.de> References: <20190808212234.2213262-1-arnd@arndb.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20190808212234.2213262-1-arnd@arndb.de> Sender: linux-kernel-owner@vger.kernel.org To: Tony Lindgren , Aaro Koskinen , Dmitry Torokhov Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Greg Kroah-Hartman , Linus Walleij , Bartlomiej Zolnierkiewicz , Tomi Valkeinen , Arnd Bergmann , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-input@vger.kernel.org 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 --- 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(-) 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 #include #include +#include #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 struct omap_kp_platform_data { -- 2.20.0