Merge "[NFC]Reassign ESE Enable gpio in case of collision" into 8901-fairphone-p-vanilla (6d413922) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi

+3 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,9 @@
		qcom,nq-ven = <&tlmm 16 0x00>;
		qcom,nq-firm = <&tlmm 62 0x00>;
		qcom,nq-clkreq = <&pm8953_gpios 2 0x00>;
		qcom,nq-esepwr = <&tlmm 141 0x00>;
		/<<2019-01-29-Michael Lin-[FairPhone][NFC]Reassign ESE Enable gpio in case of collision/
		qcom,nq-esepwr = <&tlmm 134 0x00>;
		/>>2019-01-29-Michael Lin-[FairPhone][NFC]Reassign ESE Enable gpio in case of collision/
		interrupt-parent = <&tlmm>;
		qcom,clk-src = "BBCLK2";
		interrupts = <17 0>;

+8 −6

Original line number	Diff line number	Diff line
		@@ -1133,17 +1133,18 @@
		};
		};

		/<<2019-01-29-Michael Lin-[FairPhone][NFC]Reassign ESE Enable gpio in case of collision/
		nfc_disable_active: nfc_disable_active {
		/* active state */
		mux {
		/* 16: NFC ENABLE 62: FW DNLD */
		/* 141: ESE Enable */
		pins = "gpio16", "gpio62", "gpio141";
		/* 134: ESE Enable */
		pins = "gpio16", "gpio62", "gpio134";
		function = "gpio";
		};

		config {
		pins = "gpio16", "gpio62", "gpio141";
		pins = "gpio16", "gpio62", "gpio134";
		drive-strength = <2>; /* 2 MA */
		bias-pull-up;
		};
		@@ -1153,18 +1154,19 @@
		/* sleep state */
		mux {
		/* 16: NFC ENABLE 62: FW DNLD */
		/* 141: ESE Enable */
		pins = "gpio16", "gpio62", "gpio141";
		/* 134: ESE Enable */
		pins = "gpio16", "gpio62", "gpio134";
		function = "gpio";
		};

		config {
		pins = "gpio16", "gpio62", "gpio141";
		pins = "gpio16", "gpio62", "gpio134";
		drive-strength = <2>; /* 2 MA */
		bias-disable;
		};
		};
		};
		/>>2019-01-29-Michael Lin-[FairPhone][NFC]Reassign ESE Enable gpio in case of collision/

		wcnss_pmux_5wire {
		/* Active configuration of bus pins */