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

Commit 866467cc 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: add fingeprint DT node"

parents 032f3f11 6118d9df

arch/arm64/boot/dts/qcom/msm8917-pinctrl.dtsi

+43 −0
Original line number Diff line number Diff line
@@ -1195,6 +1195,49 @@ 
			};

		};



		fpc_reset_int {

			fpc_reset_low: reset_low {

				mux {

					pins = "gpio124";

					function = "fpc_reset_gpio_low";

				};



				config {

					pins = "gpio124";

					drive-strength = <2>;

					bias-disable;

					output-low;

				};

			};



			fpc_reset_high: reset_high {

				mux {

					pins = "gpio124";

					function = "fpc_reset_gpio_high";

				};



				config {

					pins = "gpio124";

					drive-strength = <2>;

					bias-disable;

					output-high;

				};

			};



			fpc_int_low: int_low {

				mux {

					pins = "gpio48";

				};

				config {

					pins = "gpio48";

					drive-strength = <2>;

					bias-pull-down;

					input-enable;

				};

			};

		};





		i2c_2 {

			i2c_2_active: i2c_2_active {

				/* active state */

arch/arm64/boot/dts/qcom/qm215-qrd.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -50,6 +50,24 @@ 
			gpio-key,wakeup;

		};

	};



	fpc1020 {

		compatible = "fpc,fpc1020";

		interrupt-parent = <&tlmm>;

		interrupts = <48 0>;

		fpc,gpio_rst = <&tlmm 124 0x0>;

		fpc,gpio_irq = <&tlmm 48 0>;

		vcc_spi-supply = <&pm8916_l5>;

		vdd_io-supply  = <&pm8916_l5>;

		vdd_ana-supply = <&pm8916_l5>;

		fpc,enable-on-boot;

		pinctrl-names = "fpc1020_reset_reset",

				"fpc1020_reset_active",

				"fpc1020_irq_active";

		pinctrl-0 = <&fpc_reset_low>;

		pinctrl-1 = <&fpc_reset_high>;

		pinctrl-2 = <&fpc_int_low>;

	};

};



&mdss_dsi_active {