SPI: Separate TSC2301 keypad and touchscreen modules under input subsystem

Patch moves TSC2301 keypad and touchscreen modules and Kconfig options
into keyboard and touchscreen directories under drivers/input.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 0088e1c..6fefc4d 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -239,4 +239,10 @@ config KEYBOARD_GPIO
          To compile this driver as a module, choose M here: the
          module will be called gpio-keys.
 
+config KEYBOARD_TSC2301
+       tristate "TSC2301 keypad support"
+       depends on SPI_TSC2301
+       help
+         Say Y here for if you are using the keypad features of TSC2301.
+
 endif

diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index 17e5ce0..f80aebe 100644 (file)
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -20,4 +20,5 @@ obj-$(CONFIG_KEYBOARD_OMAP)             += omap-keypad.o
 obj-$(CONFIG_OMAP_PS2)                 += innovator_ps2.o
 obj-$(CONFIG_KEYBOARD_AAED2000)         += aaed2000_kbd.o
 obj-$(CONFIG_KEYBOARD_GPIO)            += gpio_keys.o
+obj-$(CONFIG_KEYBOARD_TSC2301)         += tsc2301_kp.o
 

diff --cc drivers/input/keyboard/tsc2301_kp.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/input/touchscreen/tsc2301_ts.c
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
Simple merge

diff --cc include/linux/spi/tsc2301.h
Simple merge