From: Douglas Anderson <dianders@chromium.org>
Date: Mon, 30 Aug 2021 15:06:37 +0000 (-0700)
Subject: arm64: dts: qcom: sc7280: Move the SD CD GPIO pin out of the dtsi file
X-Git-Tag: v5.16-rc1~125^2~34^2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65751ebea0a726670935990592f4ce9bfd20f13b;p=thirdparty%2Fkernel%2Flinux.git

arm64: dts: qcom: sc7280: Move the SD CD GPIO pin out of the dtsi file

There's nothing magical about GPIO91 and boards could use different
GPIOs for card detect. Move the pin out of the dtsi file and to the
only existing board file.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20210830080621.1.Ia15d97bc4a81f2916290e23a8fde9cbc66186159@changeid
---

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
index 99f9ee5d13f5b..3268f24a667b7 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi
@@ -340,6 +340,7 @@
 	};
 
 	sd-cd {
+		pins = "gpio91";
 		bias-pull-up;
 	};
 };
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index a4b4277bca028..7a2d68aa987d0 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -1605,10 +1605,6 @@
 				data {
 					pins = "sdc2_data";
 				};
-
-				sd-cd {
-					pins = "gpio91";
-				};
 			};
 
 			sdc2_off: sdc2-off {