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

Commit 296d7a30 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: apq: Fix configuration of touchscreen on SBC8096"

parents abd21a93 eb06e004

arch/arm/boot/dts/qcom/apq8096-sbc.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ 
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};





&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};
@@ -454,7 +455,6 @@ 
	};

};





&pmi8994_gpios {

	gpio@c100 {	/* GPIO 2  SPKR_SD_N */

		qcom,mode = <1>;	/* DIGITAL OUT */
@@ -505,7 +505,7 @@ 
		/delete-property/ vdd-wlan-core-supply;

	};



	i2c@75ba000 {

	i2c@75b6000 {

		synaptics@20 {

			compatible = "synaptics,dsx";

			reg = <0x20>;
@@ -516,16 +516,16 @@ 
			pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";

			pinctrl-0 = <&ts_active_sbc>;

			pinctrl-1 = <&ts_suspend_sbc>;

			synaptics,display-coords = <0 0 480 854>;

			synaptics,panel-coords = <0 0 480 854>;

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

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

			synaptics,reset-gpio = <&tlmm 29 0x00>;

			synaptics,irq-gpio = <&tlmm 125 0x2008>;

			synaptics,button-map = <139 102 158>;

			synaptics,disable-gpios;

			synaptics,fw-name = "PR1702898-s3528t_00350002.img";

			/* Underlying clocks used by secure touch */

			clock-names = "iface_clk", "core_clk";

			clocks = <&clock_gcc clk_gcc_blsp2_ahb_clk>,

				 <&clock_gcc clk_gcc_blsp2_qup6_i2c_apps_clk>;

				 <&clock_gcc clk_gcc_blsp2_qup2_i2c_apps_clk>;

		};

	};