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

Commit 7764873e 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: enable touchscreen on MSM8992 CDP and MTP"

parents 4a8b6c64 9592aeb5

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

+19 −0
Original line number Diff line number Diff line
@@ -99,3 +99,22 @@ 
		status = "okay";

	};

};



&i2c_2 {

	synaptics@20 {

		compatible = "synaptics,dsx";

		reg = <0x20>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <61 0x2008>;

		vdd-supply = <&pm8994_l14>;

		avdd-supply = <&pm8994_l22>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_suspend>;

		synaptics,display-coords = <0 0 1599 2559>;

		synaptics,panel-coords = <0 0 1599 2703>;

		synaptics,reset-gpio = <&msm_gpio 60 0x00>;

		synaptics,irq-gpio = <&msm_gpio 61 0x00>;

		synaptics,disable-gpios;

	};

};

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

+19 −0
Original line number Diff line number Diff line
@@ -108,3 +108,22 @@ 
		status = "okay";

	};

};



&i2c_2 {

	synaptics@20 {

		compatible = "synaptics,dsx";

		reg = <0x20>;

		interrupt-parent = <&msm_gpio>;

		interrupts = <61 0x2008>;

		vdd-supply = <&pm8994_l14>;

		avdd-supply = <&pm8994_l22>;

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

		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_suspend>;

		synaptics,display-coords = <0 0 1599 2559>;

		synaptics,panel-coords = <0 0 1599 2703>;

		synaptics,reset-gpio = <&msm_gpio 60 0x00>;

		synaptics,irq-gpio = <&msm_gpio 61 0x00>;

		synaptics,disable-gpios;

	};

};

arch/arm/boot/dts/qcom/msm8992-pinctrl.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -273,6 +273,23 @@ 
			};

		};



		pmx_ts {

			qcom,pins = <&gp 60>, <&gp 61>;

			qcom,pin-func = <0>;

			qcom,num-grp-pins = <2>;

			label = "pmx_ts";



			ts_active: ts_active {

				drive-strength = <16>;

				bias-pull-up;

			};



			ts_suspend: ts_suspend {

				drive-strength = <16>;

				bias-disable;

			};

		};



		eth-irq {

			qcom,pins = <&gp 75>;

			qcom,num-grp-pins = <1>;