Merge "defconfig: msm8953: Add goodix touch support" (1be29a44) · Commits · e / devices / android_kernel_fairphone_FP3

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

deleted100644 → 0

+0 −22

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.
		- 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.

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 −1

Original line number	Diff line number	Diff line
		@@ -123,13 +123,13 @@ halo Halo Microelectronics Co., Ltd.
		hannstar HannStar Display Corporation
		haoyu Haoyu Microelectronic Co. Ltd.
		hardkernel Hardkernel Co., Ltd
		himax Himax Technologies, Inc.
		hisilicon Hisilicon Limited.
		hit Hitachi Ltd.
		hitex Hitex Development Tools
		holt Holt Integrated Circuits, Inc.
		honeywell Honeywell
		hp Hewlett Packard
		himax Himax Coroporation
		i2se I2SE GmbH
		ibm International Business Machines (IBM)
		idt Integrated Device Technologies, Inc.

arch/arm/configs/msm8953-perf_defconfig

+3 −4

Original line number	Diff line number	Diff line
		@@ -310,10 +310,9 @@ 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_TOUCHSCREEN_GT9XX_v28=y
		CONFIG_TOUCHSCREEN_GT9XX_UPDATE=y
		CONFIG_TOUCHSCREEN_GT9XX_TOOL=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y

arch/arm/configs/msm8953_defconfig

+3 −4

Original line number	Diff line number	Diff line
		@@ -315,10 +315,9 @@ 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_TOUCHSCREEN_GT9XX_v28=y
		CONFIG_TOUCHSCREEN_GT9XX_UPDATE=y
		CONFIG_TOUCHSCREEN_GT9XX_TOOL=y
		CONFIG_INPUT_MISC=y
		CONFIG_INPUT_HBTP_INPUT=y
		CONFIG_INPUT_QPNP_POWER_ON=y