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

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

Merge "ARM: dts: msm: Enable touch for Dual DSI panel on shima"

parents 031a86ed 2432f0dd
Loading
Loading
Loading
Loading
+24 −1
Original line number Diff line number Diff line
@@ -189,7 +189,9 @@
			 &dsi_r66451_amoled_video
			&dsi_r66451_amoled_60hz_video
			&dsi_r66451_amoled_60hz_cmd
			&dsi_r66451_amoled_144hz_cmd>;
			&dsi_r66451_amoled_144hz_cmd
			&dsi_r66451_amoled_video_cphy
			&dsi_r66451_amoled_cmd_cphy>;

		focaltech,trusted-touch-mode = "vm_mode";
		focaltech,touch-environment = "pvm";
@@ -197,6 +199,27 @@
		focaltech,trusted-touch-io-bases = <0xF114000 0xF115000 0xF116000 0xF117000 0x988000 0x00910000>;
		focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000 0x1000 0x4000>;
	};

	atmel_mxt_ts@4a {
		compatible = "atmel,maxtouch";
		reg = <0x4a>;
		interrupt-parent = <&tlmm>;
		interrupts = <23 0x2008>;
		avdd-supply = <&L3C>;
		vdd-supply = <&L8C>;
		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
		pinctrl-0 = <&ts_active>;
		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		atmel,xy_switch;
		atmel,inverty;
		atmel,invertx;
		reset-gpios = <&tlmm 22 0x00>;
		irq-gpios = <&tlmm 23 0x2008>;
		atmel,panel-coords = <0 0 479 799>;
		atmel,display-coords = <0 0 339 729>;
		panel = <&dsi_sharp_qhd_plus_dsc_cmd>;
	};
};

&dai_mi2s2 {