snvs pwrkey is not a traditional keyboard device,
more sense to move it into input/misc as other
pwrkey drivers.
Signed-off-by: Jacky Bai <ping.bai@xxxxxxx>
---
drivers/input/keyboard/Kconfig | 11 -----------
drivers/input/keyboard/Makefile | 1 -
drivers/input/misc/Kconfig | 11 +++++++++++
drivers/input/misc/Makefile | 1 +
drivers/input/{keyboard => misc}/snvs_pwrkey.c | 0
5 files changed, 12 insertions(+), 12 deletions(-)
rename drivers/input/{keyboard => misc}/snvs_pwrkey.c (100%)
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 1d0c5f4c0f99..3d58d0457103 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -445,17 +445,6 @@ config KEYBOARD_MPR121
To compile this driver as a module, choose M here: the
module will be called mpr121_touchkey.
-config KEYBOARD_SNVS_PWRKEY
- tristate "IMX SNVS Power Key Driver"
- depends on ARCH_MXC || (COMPILE_TEST && HAS_IOMEM)
- depends on OF
- help
- This is the snvs powerkey driver for the Freescale i.MX application
- processors.
-
- To compile this driver as a module, choose M here; the
- module will be called snvs_pwrkey.
-
config KEYBOARD_IMX
tristate "IMX keypad support"
depends on ARCH_MXC || COMPILE_TEST
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index aecef00c5d09..80eeb02aaf79 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -59,7 +59,6 @@ obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o
obj-$(CONFIG_KEYBOARD_SAMSUNG) += samsung-keypad.o
obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o
-obj-$(CONFIG_KEYBOARD_SNVS_PWRKEY) += snvs_pwrkey.o
obj-$(CONFIG_KEYBOARD_SPEAR) += spear-keyboard.o
obj-$(CONFIG_KEYBOARD_STMPE) += stmpe-keypad.o
obj-$(CONFIG_KEYBOARD_STOWAWAY) += stowaway.o
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 81a54a59e13c..35cb522b51cb 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -939,4 +939,15 @@ config INPUT_STPMIC1_ONKEY
To compile this driver as a module, choose M here: the
module will be called stpmic1_onkey.
+config INPUT_SNVS_PWRKEY
+ tristate "IMX SNVS Power Key Driver"
+ depends on ARCH_MXC || (COMPILE_TEST && HAS_IOMEM)
+ depends on OF
+ help
+ This is the snvs powerkey driver for the Freescale i.MX application
+ processors.
+
+ To compile this driver as a module, choose M here; the
+ module will be called snvs_pwrkey.
+
endif
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index 04296a4abe8e..33de0a3b5f6a 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -90,3 +90,4 @@ obj-$(CONFIG_INPUT_WM831X_ON) += wm831x-on.o
obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o
+obj-$(CONFIG_INPUT_SNVS_PWRKEY) += snvs_pwrkey.o
diff --git a/drivers/input/keyboard/snvs_pwrkey.c b/drivers/input/misc/snvs_pwrkey.c
similarity index 100%
rename from drivers/input/keyboard/snvs_pwrkey.c
rename to drivers/input/misc/snvs_pwrkey.c
--
2.34.1
