Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de0dffc3 authored by Fei Mao's avatar Fei Mao
Browse files

input: touchscreen: Enable FTS Touch driver 



Enable the FTS touch driver for Lahaina device.

Change-Id: Ia576ba69ebb45c5ae6cb087607026cc812cdc1ed
Signed-off-by: default avatarFei Mao <feim1@codeaurora.org>
parent 1533b6cd

drivers/input/touchscreen/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ config TOUCHSCREEN_CYTTSP4_SPI 
config TOUCHSCREEN_DA9034

	tristate "Touchscreen support for Dialog Semiconductor DA9034"

	depends on PMIC_DA903X

	default y

	help

	  Say Y here to enable the support for the touchscreen found

	  on Dialog Semiconductor DA9034 PMIC.
@@ -824,7 +823,6 @@ config TOUCHSCREEN_WM97XX 
config TOUCHSCREEN_WM9705

	bool "WM9705 Touchscreen interface support"

	depends on TOUCHSCREEN_WM97XX

	default y

	help

	  Say Y here to enable support for the Wolfson Microelectronics

	  WM9705 touchscreen controller.
@@ -832,7 +830,6 @@ config TOUCHSCREEN_WM9705 
config TOUCHSCREEN_WM9712

	bool "WM9712 Touchscreen interface support"

	depends on TOUCHSCREEN_WM97XX

	default y

	help

	  Say Y here to enable support for the Wolfson Microelectronics

	  WM9712 touchscreen controller.
@@ -840,7 +837,6 @@ config TOUCHSCREEN_WM9712 
config TOUCHSCREEN_WM9713

	bool "WM9713 Touchscreen interface support"

	depends on TOUCHSCREEN_WM97XX

	default y

	help

	  Say Y here to enable support for the Wolfson Microelectronics

	  WM9713 touchscreen controller.
@@ -1314,4 +1310,6 @@ config TOUCHSCREEN_IQS5XX 
	  To compile this driver as a module, choose M here: the

	  module will be called iqs5xx.



source "drivers/input/touchscreen/st/Kconfig"



endif

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -110,3 +110,4 @@ obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50) += colibri-vf50-ts.o 
obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o

obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW)	+= raspberrypi-ts.o

obj-$(CONFIG_TOUCHSCREEN_IQS5XX)	+= iqs5xx.o

obj-$(CONFIG_TOUCHSCREEN_ST)	+= st/

drivers/input/touchscreen/st/Kconfig

+1 −8
Original line number Diff line number Diff line
@@ -4,8 +4,7 @@ 
#



config TOUCHSCREEN_ST

	bool "STMicroelectronics Touchscreen Driver"

	default n

	tristate "STMicroelectronics Touchscreen Driver"

	depends on I2C

	help

	  Say Y here if you have a STMicroelectronics Touchscreen.
@@ -14,9 +13,6 @@ config TOUCHSCREEN_ST 
	  To compile this driver as a module, choose M here: the

	  module will be called st.





#if TOUCHSCREEN_ST



config TOUCHSCREEN_ST_I2C

	#tristate "STMicroelectronics i2c touchscreen"

	string "STMicroelectronics ts directory name"
@@ -24,6 +20,3 @@ config TOUCHSCREEN_ST_I2C 
	depends on TOUCHSCREEN_ST

	help

	 This enables support for ST touch panel over I2C based touchscreens.
 


#endif

drivers/input/touchscreen/st/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -3,4 +3,9 @@ 
## Makefile for the STMicroelectronics touchscreen driver.

#



obj-$(CONFIG_TOUCHSCREEN_ST) += fts.o fts_gui.o fts_driver_test.o fts_aoi_event.o fts_lib/
 
obj-$(CONFIG_TOUCHSCREEN_ST) += st_fts.o



st_fts-y := fts.o fts_gui.o fts_driver_test.o fts_aoi_event.o \

	fts_lib/ftsCompensation.o fts_lib/ftsCrossCompile.o fts_lib/ftsError.o \

	fts_lib/ftsFrame.o fts_lib/ftsIO.o fts_lib/ftsTest.o fts_lib/ftsTime.o \

	fts_lib/ftsTool.o fts_lib/ftsFlash.o fts_lib/ftsGesture.o

drivers/input/touchscreen/st/fts.c

+1 −1
Original line number Diff line number Diff line
@@ -5052,7 +5052,7 @@ static void __exit fts_driver_exit(void) 
	i2c_del_driver(&fts_i2c_driver);

}



late_initcall(fts_driver_init);

module_init(fts_driver_init);

module_exit(fts_driver_exit);



MODULE_DESCRIPTION("STMicroelectronics MultiTouch IC Driver");