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

Commit c9e70a7f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add trusted touch entries on yupik qrd"

parents 04fce069 2c37971e

qcom/yupik-qrd.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -605,6 +605,11 @@ 
		pinctrl-0 = <&ts_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		focaltech,trusted-touch-mode = "vm_mode";

		focaltech,touch-environment = "pvm";

		focaltech,trusted-touch-spi-irq = <601>;

		focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;

		focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;

		panel = <&dsi_r66451_amoled_144hz_cmd_cphy &dsi_r66451_amoled_120hz_cmd_cphy

			&dsi_r66451_amoled_90hz_cmd_cphy &dsi_r66451_amoled_60hz_cmd_cphy>;

	};

qcom/yupik-vm-idp.dtsi

+17 −0
Original line number Diff line number Diff line 
&soc {

};



&qupv3_se13_i2c {

	status = "ok";

	novatek@62 {

		compatible = "novatek,NVT-ts";

		reg = <0x62>;

		novatek,trusted-touch-mode = "vm_mode";

		novatek,touch-environment = "tvm";

		novatek,trusted-touch-spi-irq = <601>;

		novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;

		novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;

	};

};



&qupv3_se13_spi {

	status = "disabled";

};

qcom/yupik-vm-qrd.dtsi

+21 −0
Original line number Diff line number Diff line 
&soc {

};



&qupv3_se13_i2c {

	status = "disabled";

};



&qupv3_se13_spi {

	status = "ok";

	focaltech@0 {

		compatible = "focaltech,fts_ts";

		reg = <0x0>;

		spi-max-frequency = <6000000>;

		focaltech,max-touch-number = <5>;

		focaltech,display-coords = <0 0 1080 2340>;

		focaltech,ic-type = <0x3658D488>;

		focaltech,trusted-touch-mode = "vm_mode";

		focaltech,touch-environment = "tvm";

		focaltech,trusted-touch-spi-irq = <601>;

		focaltech,trusted-touch-io-bases = <0xf134000 0xf135000 0xf136000 0xf137000 0xf169000 0xf151000 0xa94000 0x00a10000>;

		focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;

	};

};

qcom/yupik-vm.dtsi

+1 −10
Original line number Diff line number Diff line
@@ -281,16 +281,7 @@ 
		dma-names = "tx", "rx";

		qcom,wrapper-core = <&qupv3_1>;

		qcom,le-vm;

		status = "ok";

		novatek@62 {

			compatible = "novatek,NVT-ts";

			reg = <0x62>;

			novatek,trusted-touch-mode = "vm_mode";

			novatek,touch-environment = "tvm";

			novatek,trusted-touch-spi-irq = <601>;

			novatek,trusted-touch-io-bases = <0xf134000 0xf135000 0xf169000 0xf151000 0xa94000 0x00a10000>;

			novatek,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;

		};

		status = "disabled";

	};



	qupv3_se13_spi: spi@a94000 {