[NFC]Reassign ESE Enable gpio in case of collision
Root cause:
ESE Enable reserved gpio141 is used for RF variant.
How to fix:
Reassign ESE Enable gpio to gpio134 in case of collision
RiskArea: NFC
Change-Id: Ic8d29c92c4fc85ea3d340be7d7cde3d7129c5ae6
(cherry picked from commit 251ef03387a16a754835ce9a48f9e604865f9117)
diff --git a/arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi
index 69cf52e..a9f87e1b 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi
@@ -44,7 +44,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>;
diff --git a/arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi b/arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi
index 9da42f9..5b27d03 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953-pinctrl.dtsi
@@ -939,17 +939,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;
};
@@ -959,18 +960,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 */