arm64: dts: qcom: sm8450: move SDHCI pin configuration to DTSI

The SDHCI pin configuration/mux nodes are actually common to all
upstreamed boards, so define them in SoC DTSI to reduce code
duplication.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221026200357.391635-2-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
index 82918c2d956ffabafd4e437c8827fea2867fdd75..718c690af8ad6b46a0753651c18a7447afd58195 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts
@@ -572,26 +572,6 @@
 &tlmm {
        gpio-reserved-ranges = <28 4>;
 
-       sdc2_default_state: sdc2-default-state {
-               clk-pins {
-                       pins = "sdc2_clk";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-
-               cmd-pins {
-                       pins = "sdc2_cmd";
-                       drive-strength = <16>;
-                       bias-pull-up;
-               };
-
-               data-pins {
-                       pins = "sdc2_data";
-                       drive-strength = <16>;
-                       bias-pull-up;
-               };
-       };
-
        ts_int_default: ts-int-default-state {
                pins = "gpio23";
                function = "gpio";

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 935112cd8797c0f0fe54fd5f48c38482209412ae..e6997fc80fe9d0f0e52be16f8b7bfbe30eb7a7ee 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2490,6 +2490,26 @@
                        gpio-ranges = <&tlmm 0 0 211>;
                        wakeup-parent = <&pdc>;
 
+                       sdc2_default_state: sdc2-default-state {
+                               clk-pins {
+                                       pins = "sdc2_clk";
+                                       drive-strength = <16>;
+                                       bias-disable;
+                               };
+
+                               cmd-pins {
+                                       pins = "sdc2_cmd";
+                                       drive-strength = <16>;
+                                       bias-pull-up;
+                               };
+
+                               data-pins {
+                                       pins = "sdc2_data";
+                                       drive-strength = <16>;
+                                       bias-pull-up;
+                               };
+                       };
+
                        sdc2_sleep_state: sdc2-sleep-state {
                                clk-pins {
                                        pins = "sdc2_clk";