Commit d4f5f937 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: mrst-touchscreen - move out of staging

The driver is in reasonable shape now so let's move it out of staging.
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a9cfa253
...@@ -237,6 +237,18 @@ config TOUCHSCREEN_INEXIO ...@@ -237,6 +237,18 @@ config TOUCHSCREEN_INEXIO
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called inexio. module will be called inexio.
config TOUCHSCREEN_INTEL_MID
tristate "Intel MID platform resistive touchscreen"
depends on INTEL_SCU_IPC
help
Say Y here if you have a Intel MID based touchscreen in
your system.
If unsure, say N.
To compile this driver as a module, choose M here: the
module will be called intel_mid_touch.
config TOUCHSCREEN_MK712 config TOUCHSCREEN_MK712
tristate "ICS MicroClock MK712 touchscreen" tristate "ICS MicroClock MK712 touchscreen"
help help
......
...@@ -19,6 +19,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o ...@@ -19,6 +19,7 @@ obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o
obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o obj-$(CONFIG_TOUCHSCREEN_ELO) += elo.o
obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o obj-$(CONFIG_TOUCHSCREEN_FUJITSU) += fujitsu_ts.o
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += intel-mid-touch.o
obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o obj-$(CONFIG_TOUCHSCREEN_MC13783) += mc13783_ts.o
obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o obj-$(CONFIG_TOUCHSCREEN_MCS5000) += mcs5000_ts.o
obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o obj-$(CONFIG_TOUCHSCREEN_MIGOR) += migor_ts.o
......
...@@ -143,8 +143,6 @@ source "drivers/staging/adis16255/Kconfig" ...@@ -143,8 +143,6 @@ source "drivers/staging/adis16255/Kconfig"
source "drivers/staging/xgifb/Kconfig" source "drivers/staging/xgifb/Kconfig"
source "drivers/staging/mrst-touchscreen/Kconfig"
source "drivers/staging/msm/Kconfig" source "drivers/staging/msm/Kconfig"
endif # !STAGING_EXCLUDE_BUILD endif # !STAGING_EXCLUDE_BUILD
......
...@@ -52,5 +52,4 @@ obj-$(CONFIG_CXT1E1) += cxt1e1/ ...@@ -52,5 +52,4 @@ obj-$(CONFIG_CXT1E1) += cxt1e1/
obj-$(CONFIG_TI_ST) += ti-st/ obj-$(CONFIG_TI_ST) += ti-st/
obj-$(CONFIG_ADIS16255) += adis16255/ obj-$(CONFIG_ADIS16255) += adis16255/
obj-$(CONFIG_FB_XGI) += xgifb/ obj-$(CONFIG_FB_XGI) += xgifb/
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) += mrst-touchscreen/
obj-$(CONFIG_MSM_STAGING) += msm/ obj-$(CONFIG_MSM_STAGING) += msm/
config TOUCHSCREEN_INTEL_MID
tristate "Intel MID platform resistive touchscreen"
depends on INTEL_SCU_IPC && INPUT_TOUCHSCREEN
default y
help
Say Y here if you have a Intel MID based touchscreen
If unsure, say N.
obj-$(CONFIG_TOUCHSCREEN_INTEL_MID) := intel-mid-touch.o
- Move the driver to not think it is SPI (requires fixing some of the SFI
and firmware side)
- Fix mutex in IRQ stuff - threaded IRQ ?
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment