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

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

Merge "input: touchscreen: Add himax touchscreen support"

parents 9fee3526 9573547e
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
Himax touch controller

The Himax touch controller is connected to host processor
via i2c. The controller generates interrupts when the
user touches the panel. The host controller is expected
to read the touch coordinates over i2c and pass the coordinates
to the rest of the system.

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.
 - himax,report_type    : Multi-touch protocol type. Default 0.
                                  0 for protocol A, 1 for protocol B.
+12 −0
Original line number Diff line number Diff line
@@ -1256,4 +1256,16 @@ config TOUCHSCREEN_ST

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

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
@@ -105,3 +105,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_ST)		+= st/
obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET)»       += hxchipset/
 No newline at end of file
+86 −0
Original line number Diff line number Diff line
#
# Himax Touchscreen driver configuration
#

config TOUCHSCREEN_HIMAX_I2C
	tristate "HIMAX chipset i2c touchscreen"
	depends on TOUCHSCREEN_HIMAX_CHIPSET
	help
	  This enables support for HIMAX CHIPSET over I2C based touchscreens.


# ***************** On-cell Start *****************
config TOUCHSCREEN_HIMAX_ONCELL
	tristate "HIMAX chipset on-cell function"
	depends on TOUCHSCREEN_HIMAX_I2C
	help
	  This enables support for HIMAX CHIPSET of on-cell function.

config TOUCHSCREEN_HIMAX_IC_HX852xH
	tristate "HIMAX chipset HX852xH function"
	depends on TOUCHSCREEN_HIMAX_ONCELL
	help
	  This enables support for HIMAX CHIPSET of HX852xH.

config TOUCHSCREEN_HIMAX_IC_HX852xG
	tristate "HIMAX chipset HX852xG function"
	depends on TOUCHSCREEN_HIMAX_ONCELL
	help
	  This enables support for HIMAX CHIPSET of HX852xG.
# ***************** On-cell End *******************

# ***************** In-cell Start *****************
config TOUCHSCREEN_HIMAX_INCELL
	tristate "HIMAX chipset in-cell function"
	depends on TOUCHSCREEN_HIMAX_I2C
	help
	  This enables support for HIMAX CHIPSET of in-cell function.

config TOUCHSCREEN_HIMAX_IC_HX83191
	tristate "HIMAX chipset HX83191 function"
	depends on TOUCHSCREEN_HIMAX_INCELL
	help
	  This enables support for HIMAX CHIPSET of HX83191.

config TOUCHSCREEN_HIMAX_IC_HX83112
	tristate "HIMAX chipset HX83112 function"
	depends on TOUCHSCREEN_HIMAX_INCELL
	help
	  This enables support for HIMAX CHIPSET of HX83112.

config TOUCHSCREEN_HIMAX_IC_HX83111
	tristate "HIMAX chipset HX83111 function"
	depends on TOUCHSCREEN_HIMAX_INCELL
	help
	  This enables support for HIMAX CHIPSET of HX83111.

config TOUCHSCREEN_HIMAX_IC_HX83103
	tristate "HIMAX chipset HX83103 function"
	depends on TOUCHSCREEN_HIMAX_INCELL
	help
	  This enables support for HIMAX CHIPSET of HX83103.

config TOUCHSCREEN_HIMAX_IC_HX83102
	tristate "HIMAX chipset HX83102 function"
	depends on TOUCHSCREEN_HIMAX_INCELL
	help
	  This enables support for HIMAX CHIPSET of HX83102.
# ***************** In-cell End *******************

config TOUCHSCREEN_HIMAX_DEBUG
	tristate "HIMAX debug function"
	depends on TOUCHSCREEN_HIMAX_I2C
	help
	  This enables support for HIMAX debug function.

config TOUCHSCREEN_HIMAX_INSPECT
	tristate "HIMAX inspect function"
	depends on TOUCHSCREEN_HIMAX_I2C
	help
	  This enables support for HIMAX debug function.

config HMX_DB
	tristate "HIMAX driver test over Dragon Board"
	depends on TOUCHSCREEN_HIMAX_I2C
	help
	  This enables support for HIMAX driver test over Dragon Board.
+13 −0
Original line number Diff line number Diff line
# Makefile for the Himax touchscreen drivers.
obj-$(CONFIG_TOUCHSCREEN_HIMAX_ONCELL)     += himax_ic_oncell_core.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX852xH) += himax_ic_HX852xH.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX852xG) += himax_ic_HX852xG.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_INCELL)     += himax_ic_incell_core.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX83191) += himax_ic_HX83191.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX83112) += himax_ic_HX83112.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX83111) += himax_ic_HX83111.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX83103) += himax_ic_HX83103.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_IC_HX83102) += himax_ic_HX83102.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_I2C)        += himax_common.o himax_platform.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_DEBUG)      += himax_debug.o
obj-$(CONFIG_TOUCHSCREEN_HIMAX_INSPECT)    += himax_inspection.o
 No newline at end of file
Loading