Merge "ARM: dts: msm: enable fingerprint for atoll"

#include "atoll-camera-sensor-qrd.dtsi"

#include "atoll-sde-display.dtsi"

&tlmm {

	fpc_reset_int: fpc_reset_int {

		fpc_reset_low: reset_low {

			mux {

				pins = "gpio91";

				function = "gpio";

			};

			config {

				pins = "gpio91";

				drive-strength = <2>;

				bias-disable;

				output-low;

			};

		};

		fpc_reset_high: reset_high {

			mux {

				pins = "gpio91";

				function = "gpio";

			};

			config {

				pins = "gpio91";

				drive-strength = <2>;

				bias-disable;

				output-high;

			};

		};

		fpc_int_low: int_low {

			mux {

				pins = "gpio90";

				function = "gpio";

			};

			config {

				pins = "gpio90";

				drive-strength = <2>;

				bias-pull-down;

				input-enable;

			};

		};

	};

};

&soc {

	qrd_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-atl466271_3300mAh.dtsi"

	};

	fingerprint: fpc1020 {

		compatible = "fpc,fpc1020";

		interrupt-parent = <&tlmm>;

		interrupts = <90 0>;

		fpc,gpio_rst = <&tlmm 91 0>;

		fpc,gpio_irq = <&tlmm 90 0>;

		vcc_spi-supply = <&pm6150_l10>;

		vdd_io-supply  = <&pm6150_l10>;

		vdd_ana-supply = <&pm6150_l10>;

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

	};

};

&pm6150a_amoled {