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

Commit cb5153ff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: change touchscreen support to Synaptics V2 driver"

parents 307b5a04 4a99df9f

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ snps Synopsys, Inc. 
st	STMicroelectronics

ste	ST-Ericsson

stericsson	ST-Ericsson

synaptics	Synaptics Inc.

ti	Texas Instruments

toshiba	Toshiba Corporation

via	VIA Technologies, Inc.

arch/arm/boot/dts/qcom/msm8909-cdp.dtsi

+10 −17
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,rmi4";

			compatible = "synaptics,dsx";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			vdd-supply = <&pm8909_l17>;

			vcc_i2c-supply = <&pm8909_l6>;

			avdd-supply = <&pm8909_l17>;

			vdd-supply = <&pm8909_l6>;

			/* pins used by touchscreen */

			pinctrl-names = "pmx_ts_active","pmx_ts_suspend","pmx_ts_release";

			pinctrl-0 = <&ts_int_active &ts_reset_active>;
@@ -30,22 +30,15 @@ 
			pinctrl-2 = <&ts_release>;

			synaptics,irq-gpio = <&msm_gpio 13 0x2008>;

			synaptics,reset-gpio = <&msm_gpio 12 0x0>;

			synaptics,i2c-pull-up;

			synaptics,power-down;

			synaptics,disable-gpios;

			synaptics,detect-device;

			synaptics,device1 {

				synaptics,package-id = <3408>;

				synaptics,display-coords = <0 0 719 1279>;

				synaptics,panel-coords = <0 0 719 1405>;

				synaptics,key-codes = <158 139 172 217>;

			};

		};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_rmi4_i2c";

		qcom,disp-maxx = <719>;

		qcom,disp-maxy = <1279>;

		qcom,panel-maxx = <719>;

		qcom,panel-maxy = <1405>;

		qcom,key-codes = <158 139 172 217>;

	};



	i2c@78b6000 { /* BLSP1 QUP2 */