Input: matrix-keymap - uninline and prepare for device tree support

Change matrix-keymap helper to be out-of-line, like sparse keymap,
allow the helper perform basic keymap validation and return errors,
and prepare for device tree support.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 13 insertions, 4 deletions

diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
index 332597980817..55f7e57d4e42 100644
--- a/drivers/input/Kconfig
+++ b/drivers/input/Kconfig
@@ -25,10 +25,6 @@ config INPUT
 
 if INPUT
 
-config INPUT_OF_MATRIX_KEYMAP
-        depends on USE_OF
-        bool
-
 config INPUT_FF_MEMLESS
         tristate "Support for memoryless force-feedback devices"
         help
@@ -68,6 +64,19 @@ config INPUT_SPARSEKMAP
           To compile this driver as a module, choose M here: the
           module will be called sparse-keymap.
 
+config INPUT_MATRIXKMAP
+        tristate "Matrix keymap support library"
+        help
+          Say Y here if you are using a driver for an input
+          device that uses matrix keymap. This option is only
+          useful for out-of-tree drivers since in-tree drivers
+          select it automatically.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called matrix-keymap.
+
 comment "Userland interfaces"
 
 config INPUT_MOUSEDEV