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

Commit 42689e06 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I70206d9e,Ib0910350 into msm-4.14 

* changes:
  defconfig: sm8150: Enable ST touch driver support
  input: touchscreen: Update ST touch driver
parents 52ca05f1 e2df260d

arch/arm64/configs/sm8150-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,7 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

arch/arm64/configs/sm8150_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

drivers/input/touchscreen/st/Kconfig

+18 −2
Original line number Diff line number Diff line
@@ -2,8 +2,24 @@ 
# 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"

	#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

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

#



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

drivers/input/touchscreen/st/fts.c

+3283 −792

File changed.

Preview size limit exceeded, changes collapsed.