Merge "input: msg21xx_ts: Mstar touch driver optimization" (d61d4264) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/input/touchscreen/msg21xx-ts.txt

+12 −1

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,9 @@ Required properties:
	config defined in pin groups of interrupt and reset gpio.		config defined in pin groups of interrupt and reset gpio.
	"pmx_ts_release" : Release configuration of pins, this should specify		"pmx_ts_release" : Release configuration of pins, this should specify
	release config defined in pin groups of interrupt and reset gpio.		release config defined in pin groups of interrupt and reset gpio.
			- mstar,num-max-touches: It defines the maximum number of touch supported by the controller.
			- mstar,hard-reset-delay-ms : hard reset delay in ms
			- mstar,post-hard-reset-delay-ms : post hard reset delay in ms

	Optional properties:		Optional properties:

	@@ -39,6 +42,10 @@ Optional properties:
	- mstar,panel-coords : panel coords for the chip in pixels.		- mstar,panel-coords : panel coords for the chip in pixels.
	It is a four tuple consisting of min x,		It is a four tuple consisting of min x,
	min y, max x and max y values		min y, max x and max y values
			- mstar,ic-type : It defines the ic-type of the controller. Values are as folows:
			1 -> msg2133.
			2 -> msg21xxA.
			3 -> msg26xxM.

	Example:		Example:
	i2c@78b9000 { /* BLSP1 QUP5 */		i2c@78b9000 { /* BLSP1 QUP5 */
	@@ -56,5 +63,9 @@ Example:
	pinctrl-0 = <&ts_int_active &ts_reset_active>;		pinctrl-0 = <&ts_int_active &ts_reset_active>;
	pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
	mstar,button-map = <172 139 158>;		mstar,button-map = <172 139 158>;
			mstar,ic-type = <2>;
			mstar,num_max_touches = <2>;
			mstar,hard-reset-delay-ms = <100>;
			mstar,post-hard-reset-delay-ms = <100>;
	};		};
	};		};

arch/arm/boot/dts/qcom/msm8916-qrd-skuic.dtsi

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,10 @@
	pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
	pinctrl-2 = <&ts_release>;		pinctrl-2 = <&ts_release>;
	mstar,button-map = <172 139 158>;		mstar,button-map = <172 139 158>;
			mstar,ic-type = <2>;
			mstar,num-max-touches = <2>;
			mstar,hard-reset-delay-ms = <100>;
			mstar,post-hard-reset-delay-ms = <100>;
	};		};
	};		};
	};		};

drivers/input/touchscreen/msg21xx_ts.c

+798 −742

File changed.

Preview size limit exceeded, changes collapsed.