Merge "defconfig: msm8953: Add himax touch support" (29d0f517) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/input/touchscreen/himax.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,20 @@ Himax touch controller
		Required properties:

		- compatible : Should be "himax,hxcommon"
		- reg : i2c slave address of the device.
		- interrupt-parent : parent of interrupt.
		- himax,irq-gpio : irq gpio.
		- himax,reset-gpio : reset gpio.
		- vdd-supply : Power supply needed to power up the device.
		- avdd-supply : Power source required to power up i2c bus.
		- himax,panel-coords : panel coordinates for the chip in pixels.
		It is a four tuple consisting of min x,
		min y, max x and max y values.
		- himax,display-coords : display coordinates in pixels. It is a four
		tuple consisting of min x, min y, max x and
		max y values

		Optional properties:
		- himax,3v3-gpio : gpio acting as 3.3 v supply.
		- report_type : Multi-touch protocol type. Default 0.
		0 for protocol A, 1 for protocol B.

+4 −0

Original line number	Diff line number	Diff line
		@@ -307,6 +307,10 @@ CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_FT5X06=y
		CONFIG_TOUCHSCREEN_GEN_VKEYS=y
		CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
		CONFIG_TOUCHSCREEN_HIMAX_I2C=y
		CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
		CONFIG_HMX_DB=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y

+4 −0

Original line number	Diff line number	Diff line
		@@ -312,6 +312,10 @@ CONFIG_INPUT_JOYSTICK=y
		CONFIG_INPUT_TOUCHSCREEN=y
		CONFIG_TOUCHSCREEN_FT5X06=y
		CONFIG_TOUCHSCREEN_GEN_VKEYS=y
		CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
		CONFIG_TOUCHSCREEN_HIMAX_I2C=y
		CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
		CONFIG_HMX_DB=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y

+12 −0

Original line number	Diff line number	Diff line
		@@ -1279,4 +1279,16 @@ config FT_SECURE_TOUCH

		If unsure, say N.

		config TOUCHSCREEN_HIMAX_CHIPSET
		bool "Himax touchpanel CHIPSET"
		depends on I2C
		help
		Say Y here if you have a Himax CHIPSET touchscreen.
		HIMAX controllers are multi touch controllers which can
		report 10 touches at a time.

		If unsure, say N.

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

		endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -104,3 +104,4 @@ 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_FTS) += focaltech_touch/
		obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET) += hxchipset/