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

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

Merge "defconfig: msm8953: Add Elan_Sparrow touch support"

parents 151813df 62ed1711

arch/arm/configs/msm8953-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y 
CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

CONFIG_HMX_DB=y

CONFIG_TOUCHSCREEN_EKTF3XXX_CHIPSET=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

arch/arm/configs/msm8953_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y 
CONFIG_TOUCHSCREEN_HIMAX_I2C=y

CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y

CONFIG_HMX_DB=y

CONFIG_TOUCHSCREEN_EKTF3XXX_CHIPSET=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_HBTP_INPUT=y

CONFIG_INPUT_QPNP_POWER_ON=y

drivers/input/touchscreen/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1302,4 +1302,15 @@ config TOUCHSCREEN_HIMAX_CHIPSET 
          If unsure, say N.



source "drivers/input/touchscreen/hxchipset/Kconfig"



config TOUCHSCREEN_EKTF3XXX_CHIPSET

	bool "Elan EKTF3XXX touchpanel CHIPSET"

	depends on I2C

	help

	  Say Y here if you have a Elan CHIPSET touchscreen.

	  ELAN controllers are multi touch controllers which can

	  report 10 touches at a time.



		  If unusre, say N.



endif

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -106,3 +106,4 @@ obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o 
obj-$(CONFIG_TOUCHSCREEN_FTS)		+= focaltech_touch/

obj-$(CONFIG_TOUCHSCREEN_GT9XX_v28)		+= gt9xx_v2.8/

obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET)	+= hxchipset/

obj-$(CONFIG_TOUCHSCREEN_EKTF3XXX_CHIPSET) += ektf3xxx/