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

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

Merge "ARM: dts: msm: add Himax Touch panel support for SM6150"

parents d1d740db f3573625
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -26,3 +26,21 @@ Optional properties:
 - himax,3v3-gpio       : gpio acting as 3.3 v supply.
 - himax,report_type    : Multi-touch protocol type. Default 0.
                                  0 for protocol A, 1 for protocol B.

Example:
	i2c@884000 {
		status = "okay";
		himax_ts@48 {
			compatible = "himax,hxcommon";
			reg = <0x48>;
			interrupt-parent = <&tlmm>;
			interrupts = <89 0x2008>;
			vdd-supply = <&pm6150_l10>;
			avdd-supply = <&pm6150l_l7>;
			himax,panel-coords = <0 1080 0 2160>;
			himax,display-coords = <0 1080 0 2160>;
			himax,irq-gpio = <&tlmm 89 0x00>;
			himax,rst-gpio = <&tlmm 88 0x00>;
			report_type = <1>;
		};
	};
+22 −0
Original line number Diff line number Diff line
@@ -63,6 +63,28 @@
	status = "ok";
};

&qupv3_se1_i2c {
	status = "okay";
	himax_ts@48 {
		compatible = "himax,hxcommon";
		reg = <0x48>;
		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>;
		himax,panel-coords = <0 1080 0 2160>;
		himax,display-coords = <0 1080 0 2160>;
		himax,irq-gpio = <&tlmm 89 0x00>;
		himax,rst-gpio = <&tlmm 88 0x00>;
		report_type = <1>;
	};
};

&sdhc_1 {
	vdd-supply = <&pm6150l_l11>;
	qcom,vdd-voltage-level = <2950000 2950000>;
+75 −0
Original line number Diff line number Diff line
@@ -852,6 +852,81 @@
			};
		};

		pmx_ts_int_active {
			ts_int_active: ts_int_active {
				mux {
					pins = "gpio89";
					function = "gpio";
				};

				config {
					pins = "gpio89";
					drive-strength = <8>;
					bias-pull-up;
				};
			};
		};

		pmx_ts_int_suspend {
			ts_int_suspend: ts_int_suspend {
				mux {
					pins = "gpio89";
					function = "gpio";
				};

				config {
					pins = "gpio89";
					drive-strength = <2>;
					bias-pull-down;
				};
			};
		};

		pmx_ts_reset_active {
			ts_reset_active: ts_reset_active {
				mux {
					pins = "gpio88";
					function = "gpio";
				};

				config {
					pins = "gpio88";
					drive-strength = <8>;
					bias-pull-up;
				};
			};
		};

		pmx_ts_reset_suspend {
			ts_reset_suspend: ts_reset_suspend {
				mux {
					pins = "gpio88";
					function = "gpio";
				};

				config {
					pins = "gpio88";
					drive-strength = <2>;
					bias-pull-down;
				};
			};
		};

		pmx_ts_release {
			ts_release: ts_release {
				mux {
					pins = "gpio89", "gpio88";
					function = "gpio";
				};

				config {
					pins = "gpio89", "gpio88";
					drive-strength = <2>;
					bias-pull-down;
				};
			};
		};

	};
};