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

Commit ae9ecea9 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: add touch device node"

parents 50166c21 d17196e5

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

+32 −0
Original line number Diff line number Diff line
@@ -14,6 +14,38 @@ 
#include "msm8939-pinctrl.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			avdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

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

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			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,display-coords = <0 0 1079 1919>;

			synaptics,panel-coords = <0 0 1079 2084>;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_dsx";

		qcom,disp-maxx = <1079>;

		qcom,disp-maxy = <1919>;

		qcom,panel-maxx = <1079>;

		qcom,panel-maxy = <2084>;

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

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";

arch/arm/boot/dts/qcom/msm8939-mtp.dtsi

+32 −0
Original line number Diff line number Diff line
@@ -14,6 +14,38 @@ 
#include "msm8939-pinctrl.dtsi"



&soc {

	i2c@78b9000 { /* BLSP1 QUP5 */

		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x20>;

			interrupt-parent = <&msm_gpio>;

			interrupts = <13 0x2008>;

			avdd-supply = <&pm8916_l17>;

			vdd-supply = <&pm8916_l6>;

			/* pins used by touchscreen */

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

			pinctrl-0 = <&ts_int_active &ts_reset_active>;

			pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

			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,display-coords = <0 0 1079 1919>;

			synaptics,panel-coords = <0 0 1079 2084>;

		};

	};



	gen-vkeys {

		compatible = "qcom,gen-vkeys";

		label = "synaptics_dsx";

		qcom,disp-maxx = <1079>;

		qcom,disp-maxy = <1919>;

		qcom,panel-maxx = <1079>;

		qcom,panel-maxy = <2084>;

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

	};



	gpio_keys {

		compatible = "gpio-keys";

		input-name = "gpio-keys";