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

Commit a5582031 authored by Fei Mao's avatar Fei Mao Committed by Gerrit - the friendly Code Review server
Browse files

msm: input: touchscreen: Rebase the STM FTS driver 



This commit is a squash of below fixes from the branch msm-4.14.
And fix warnings for code style check.

b32c2b2 input: touchscreen: st: Disable PRESSURE event report
ebff065 input: touchscreen: st: update firmware without userhelper
66b2a79 input: touchscreen: st: turn off regulator during suspend
12ccf96 input: touchscreen: st: add pinctrl config during suspend/resume
7f345b8 Merge "input: touchscreen: Assign the TP from UEFI or DTSI"
138c7b3 input: touchscreen: st: add fix in driver to support VMAP_STACK
22c3dd53 input: touchscreen: st: release Int/Reset resource
52a3b68 input: touchscreen: st: add XY axis flip property support
1a13eaf input: touchscreen: st: fix code sytle error
3da45a3 Merge "input: touchscreen: st: enable touch firmware upgrade"
b5d1634 input: touchscreen: st: enable touch firmware upgrade
3dbed1b input: touchscreen: st: remove useless firmware file
b8f5440 Merge "input: touchscreen: multi-touch for ST touch"
b625338 input: touchscreen: multi-touch for ST touch
26348a7 input: touchscreen: clean kernel log for ST touch
b133ccf input: touchscreen: Disable fts_fw_update_auto
f5872e1 input: touchscreen: Update ST touch driver
41ab128 input: touchpanel: fix wastes of time when resume and probe...
4426865 input: touchscreen: fix issues related to variable initialization
e8a48fd input: touchpanel: Add ST Touchscreen version 4.1.0 driver

The above gerrits are in the complete list for this driver IC.

Change-Id: I1e50d2d5bcad94c5bf38de4921314166c73ebb8c
Signed-off-by: default avatarFei Mao <feim1@codeaurora.org>
parent 58c7ebcb

drivers/input/touchscreen/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -1299,4 +1299,17 @@ config TOUCHSCREEN_ROHM_BU21023 
	  To compile this driver as a module, choose M here: the

	  module will be called bu21023_ts.



config TOUCHSCREEN_ST

	tristate "STMicroelectronics Touchscreen Driver"

	depends on I2C

	default y

	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.



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



endif

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -109,3 +109,4 @@ obj-$(CONFIG_TOUCHSCREEN_ZET6223) += zet6223.o 
obj-$(CONFIG_TOUCHSCREEN_ZFORCE)	+= zforce_ts.o

obj-$(CONFIG_TOUCHSCREEN_COLIBRI_VF50)	+= colibri-vf50-ts.o

obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023)	+= rohm_bu21023.o

obj-$(CONFIG_TOUCHSCREEN_ST)		+= st/

drivers/input/touchscreen/st/Kconfig

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

#

# STMicroelectronics touchscreen driver configuration

#



#config TOUCHSCREEN_ST

#	bool "STMicroelectronics Touchscreen Driver"

#	default n

#	depends on I2C

#	help

#	  Say Y here if you have a STMicroelectronics Touchscreen.

#	  If unsure, say N.

#



#if TOUCHSCREEN_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.



#endif

drivers/input/touchscreen/st/Makefile

0 → 100644
+6 −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) += fts.o fts_gui.o fts_driver_test.o fts_lib/

drivers/input/touchscreen/st/fts.c

0 → 100644
+4936 −0

File added.

Preview size limit exceeded, changes collapsed.