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

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

Merge "ARM: dts: msm: move Synaptics touch DT entry to overlay DTS"

parents 5d0b8ef9 f9442f95

arch/arm64/boot/dts/qcom/sm6150-cmd-mode-display-idp-overlay.dts

+31 −0
Original line number Diff line number Diff line
@@ -26,6 +26,37 @@ 
	qcom,board-id = <34 3>;

};



&qupv3_se1_i2c {

	synaptics_dsx@20 {

		compatible = "synaptics,dsx-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <89 0x2008>;

		vdd-supply = <&pm6150_l10>;

		avdd-supply = <&pm6150l_l7>;

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

					"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,ub-i2c-addr = <0x20>;

		synaptics,max-y-for-2d = <2159>;

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

		synaptics,reset-gpio = <&tlmm 88 0x0>;

		synaptics,irq-on-state = <0>;

		synaptics,power-delay-ms = <200>;

		synaptics,reset-delay-ms = <200>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

	};



	himax_ts@48 {

		status = "disabled";

	};

};



&dsi_td4328_truly_cmd_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sm6150-cmd-mode-display-idp.dts

+0 −30
Original line number Diff line number Diff line
@@ -15,36 +15,6 @@ 
#include "sm6150.dtsi"

#include "sm6150-idp.dtsi"



&qupv3_se1_i2c {

	status = "okay";

	synaptics_dsx@20 {

		compatible = "synaptics,dsx-i2c";

		reg = <0x20>;

		interrupt-parent = <&tlmm>;

		interrupts = <89 0x2008>;

		vdd-supply = <&pm6150_l10>;

		avdd-supply = <&pm6150l_l7>;

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

			"pmx_ts_release";

		pinctrl-0 = <&ts_int_active &ts_reset_active>;

		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;

		pinctrl-2 = <&ts_release>;

		synaptics,pwr-reg-name = "avdd";

		synaptics,bus-reg-name = "vdd";

		synaptics,ub-i2c-addr = <0x20>;

		synaptics,max-y-for-2d = <2159>;

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

		synaptics,reset-gpio = <&tlmm 88 0x0>;

		synaptics,irq-on-state = <0>;

		synaptics,power-delay-ms = <200>;

		synaptics,reset-delay-ms = <200>;

		synaptics,reset-on-state = <0>;

		synaptics,reset-active-ms = <20>;

	};



	/delete-node/ himax_ts@48;

};



/ {

	model = "Qualcomm Technologies, Inc. SM6150 Command mode display IDP";

	compatible = "qcom,sm6150-idp", "qcom,sm6150", "qcom,idp";