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

Commit 9cf1fba3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: Enable FTS Touch driver"

parents 58b8b1c8 de0dffc3
Loading
Loading
Loading
Loading
+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
+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/
+22 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only
#
# STMicroelectronics touchscreen driver configuration
#

config TOUCHSCREEN_ST
	tristate "STMicroelectronics Touchscreen Driver"
	depends on I2C
	help
	  Say Y here if you have a STMicroelectronics Touchscreen.

	  If unsure, say N.
	  To compile this driver as a module, choose M here: the
	  module will be called st.

config TOUCHSCREEN_ST_I2C
	#tristate "STMicroelectronics i2c touchscreen"
	string "STMicroelectronics ts directory name"
	default "st"
	depends on TOUCHSCREEN_ST
	help
	 This enables support for ST touch panel over I2C based touchscreens.
+11 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only
#
## Makefile for the STMicroelectronics touchscreen driver.
#

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
+5059 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading