Merge "input: touchscreen: Add himax touchscreen support" (e9495f9a) · Commits · e / devices / android_kernel_xiaomi_markw

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

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		Himax touch controller

		Required properties:

		- compatible : should be "himax,hxcommon"
		- reg : i2c slave address of the device
		- interrupt-parent : parent of interrupt
		- interrupts : touch sample interrupt to indicate presense or release
		of fingers on the panel.
		- himax,irq-gpio : irq gpio
		- himax,reset-gpio : reset gpio

		Optional property:
		- vdd-supply : Analog power supply needed to power device
		- vcc_i2c-supply : Power source required to pull up i2c bus
		- himax,i2c-pull-up : specify to indicate pull up is needed
		- himax,disable-gpios : specify to disable gpios in suspend (power saving)
		- himax,button-map : virtual key code mappings to be used
		- himax,x-flip : modify orientation of the x axis
		- himax,y-flip : modify orientation of the y axis
		- himax,panel-coords : touch panel min x, min y, max x and
		max y resolution
		- himax,display-coords : display min x, min y, max x and
		max y resolution
		- himax,reset-delay : reset delay for controller (ms), default 100
		- himax,fw-image-name : name of firmware .img file in /etc/firmware
		- himax,power-down : fully power down regulators in suspend
		- himax,do-lockdown : perform one time lockdown procedure

		Example:
		i2c@f9927000 { /* BLSP1 QUP5 */
		cell-index = <5>;
		compatible = "himax,hxcommon";
		#address-cells = <1>;
		#size-cells = <0>;
		reg-names = "qup_phys_addr";
		reg = <0xf9927000 0x1000>;
		interrupt-names = "qup_err_intr";
		interrupts = <0 99 0>;
		gpios = <&msmgpio 19 0>, /* SCL */
		<&msmgpio 18 0>; /* SDA */
		qcom,i2c-bus-freq = <100000>;
		qcom,i2c-src-freq = <19200000>;

		himax_ts@20 {
		compatible = "himax,hxcommon"
		reg = <0x20>;
		interrupt-parent = <&tlmm>;
		interrupts = <255 0x2008>;
		vdd-supply = <&pm8994_l15>;
		avdd-supply = <&pm8994_l22>;
		himax,panel-coords = <0 720 0 1440>;
		himax,display-coords = <0 720 0 1440>;
		himax,irq-gpio = <&tlmm 255 0x2008>;
		himax,rst-gpio = <&tlmm 8 0x00>;
		};
		};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ haoyu Haoyu Microelectronic Co. Ltd.
		hisilicon Hisilicon Limited.
		honeywell Honeywell
		hp Hewlett Packard
		himax Himax Coroporation
		i2se I2SE GmbH
		ibm International Business Machines (IBM)
		idt Integrated Device Technologies, Inc.

drivers/input/touchscreen/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -90,4 +90,5 @@ obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
		obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV) += synaptics_rmi_dev.o
		obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE) += synaptics_fw_update.o
		obj-$(CONFIG_TOUCHSCREEN_GT9XX) += gt9xx/
		obj-$(CONFIG_TOUCHSCREEN_HIMAX_CHIPSET) += hxchipset/
		obj-$(CONFIG_TOUCHSCREEN_FTS) += focaltech_touch/

drivers/input/touchscreen/hxchipset/Kconfig

0 → 100644

+46 −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
		Say Y here to enable support for HIMAX CHIPSET over I2C based touchscreens.
		If unsure, say N.

		To compile this driver as a module,
		This enables support for HIMAX CHIPSET over I2C based touchscreens.

		config TOUCHSCREEN_HIMAX_DEBUG
		tristate "HIMAX debug function"
		depends on TOUCHSCREEN_HIMAX_I2C
		help
		Say Y here to enable support for HIMAX debug function.

		If unsure, say N.

		To compile this driver as a module,
		This enables support for HIMAX debug function.

		config TOUCHSCREEN_HIMAX_ITO_TEST
		tristate "HIMAX driver test over Dragon Board"
		depends on TOUCHSCREEN_HIMAX_I2C
		help
		Say Y here to enable support for HIMAX driver test over Dragon Board.

		If unsure, say N.

		To compile this driver as a module,
		this enables support for HIMAX driver test over Dragon Board.

		config HMX_DB
		tristate "HIMAX driver test over Dragon Board"
		depends on TOUCHSCREEN_HIMAX_I2C
		help
		Say Y here to enable support for HIMAX driver test over Dragon Board.

		If unsure, say N.

		To compile this driver as a module,
		this enables support for HIMAX driver test over Dragon Board.

drivers/input/touchscreen/hxchipset/Makefile

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		# Makefile for the Himax touchscreen drivers.

		obj-$(CONFIG_TOUCHSCREEN_HIMAX_I2C) += himax_platform.o himax_ic.o himax_common.o himax_debug.o
		obj-$(CONFIG_TOUCHSCREEN_HIMAX_ITO_TEST) += himax_ito_test.o
		No newline at end of file