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

Commit af8bb426 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: msm: support touch for MSM8937"

parents f97f2ee6 d015f899

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -97,3 +97,25 @@ 
	status = "ok";

	status = "ok";

};

};





&spi_3 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0>;

		spi-max-frequency = <16000000>;

		avdd-supply = <&pm8937_l10>;

		dvdd-supply = <&pm8937_l5>;

		maxim_sti,irq-gpio = <&tlmm 65 0x00>;

		maxim_sti,reset-gpio = <&tlmm 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/etc/firmware/qtc800s.cfg";

		maxim_sti,fw_name = "qtc800s.bin";

		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>;

	};

};

arch/arm/boot/dts/qcom/msm8937-mtp.dtsi

+22 −0
Original line number Original line Diff line number Diff line
@@ -63,3 +63,25 @@ 
	status = "ok";

	status = "ok";

};

};





&spi_3 { /* BLSP1 QUP3 */

	status = "ok";

	maxim_sti@0 {

		compatible = "maxim,maxim_sti";

		reg = <0>;

		interrupt-parent = <&tlmm>;

		interrupts = <65 0>;

		spi-max-frequency = <16000000>;

		avdd-supply = <&pm8937_l10>;

		dvdd-supply = <&pm8937_l5>;

		maxim_sti,irq-gpio = <&tlmm 65 0x00>;

		maxim_sti,reset-gpio = <&tlmm 64 0x00>;

		maxim_sti,touch_fusion = "/vendor/bin/touch_fusion";

		maxim_sti,config_file = "/etc/firmware/qtc800s.cfg";

		maxim_sti,fw_name = "qtc800s.bin";

		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>;

	};

};

arch/arm/boot/dts/qcom/msm8937-pinctrl.dtsi

+76 −0
Original line number Original line Diff line number Diff line
@@ -236,5 +236,81 @@ 
				};

				};

			};

			};

		};

		};



		/* add pingrp for touchscreen */

		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_int_suspend {

			ts_int_suspend: ts_int_suspend {

				mux {

					pins = "gpio65";

					function = "gpio";

				};



				config {

					pins = "gpio65";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_reset_active {

			ts_reset_active: ts_reset_active {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <8>;

					bias-pull-up;

				};

			};

		};



		pmx_ts_reset_suspend {

			ts_reset_suspend: ts_reset_suspend {

				mux {

					pins = "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};



		pmx_ts_release {

			ts_release: ts_release {

				mux {

					pins = "gpio65", "gpio64";

					function = "gpio";

				};



				config {

					pins = "gpio65", "gpio64";

					drive-strength = <2>;

					bias-pull-down;

				};

			};

		};

	};

	};

};
 
};