arm64: dts: qcom: sc7180: Move sdc pinconf to board specific DT files

Move sdc1/sdc2 pinconf from SoC specific DT file to board specific DT
files

Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Sujit Kautkar <sujitka@chromium.org>
Link: https://lore.kernel.org/r/20210602121313.v3.1.Ia83c80aec3b9535f01441247b6c3fb6f80b0ec7f@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 52899dd4feb0211b0c9ac026abe97ce9674a20e5..c4521ae7e4b250683fa5ed848429152d82bdf6f3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -663,4 +663,106 @@
                        bias-pull-up;
                };
        };
+
+       sdc1_on: sdc1-on {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc1_off: sdc1-off {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc2_on: sdc2-on {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+       };
+
+       sdc2_off: sdc2-off {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+       };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index a4cbdc36c306ebb51c178d215c7b95847c9533f3..f9f701bc7f066f27a636d9228048f13f6083503d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -1491,4 +1491,106 @@ ap_spi_fp: &spi10 {
                        drive-strength = <2>;
                };
        };
+
+       sdc1_on: sdc1-on {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc1_off: sdc1-off {
+               pinconf-clk {
+                       pins = "sdc1_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc1_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc1_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-rclk {
+                       pins = "sdc1_rclk";
+                       bias-pull-down;
+               };
+       };
+
+       sdc2_on: sdc2-on {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <16>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <10>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+       };
+
+       sdc2_off: sdc2-off {
+               pinconf-clk {
+                       pins = "sdc2_clk";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+
+               pinconf-cmd {
+                       pins = "sdc2_cmd";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-data {
+                       pins = "sdc2_data";
+                       bias-pull-up;
+                       drive-strength = <2>;
+               };
+
+               pinconf-sd-cd {
+                       pins = "gpio69";
+                       bias-disable;
+                       drive-strength = <2>;
+               };
+       };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 295844e90dd5329014d87458f9e26a6e334e4e67..52115e0359bdf89e94d09fe697e16ef3e6ae2981 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1867,108 +1867,6 @@
                                        function = "lpass_ext";
                                };
                        };
-
-                       sdc1_on: sdc1-on {
-                               pinconf-clk {
-                                       pins = "sdc1_clk";
-                                       bias-disable;
-                                       drive-strength = <16>;
-                               };
-
-                               pinconf-cmd {
-                                       pins = "sdc1_cmd";
-                                       bias-pull-up;
-                                       drive-strength = <10>;
-                               };
-
-                               pinconf-data {
-                                       pins = "sdc1_data";
-                                       bias-pull-up;
-                                       drive-strength = <10>;
-                               };
-
-                               pinconf-rclk {
-                                       pins = "sdc1_rclk";
-                                       bias-pull-down;
-                               };
-                       };
-
-                       sdc1_off: sdc1-off {
-                               pinconf-clk {
-                                       pins = "sdc1_clk";
-                                       bias-disable;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-cmd {
-                                       pins = "sdc1_cmd";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-data {
-                                       pins = "sdc1_data";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-rclk {
-                                       pins = "sdc1_rclk";
-                                       bias-pull-down;
-                               };
-                       };
-
-                       sdc2_on: sdc2-on {
-                               pinconf-clk {
-                                       pins = "sdc2_clk";
-                                       bias-disable;
-                                       drive-strength = <16>;
-                               };
-
-                               pinconf-cmd {
-                                       pins = "sdc2_cmd";
-                                       bias-pull-up;
-                                       drive-strength = <10>;
-                               };
-
-                               pinconf-data {
-                                       pins = "sdc2_data";
-                                       bias-pull-up;
-                                       drive-strength = <10>;
-                               };
-
-                               pinconf-sd-cd {
-                                       pins = "gpio69";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-                       };
-
-                       sdc2_off: sdc2-off {
-                               pinconf-clk {
-                                       pins = "sdc2_clk";
-                                       bias-disable;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-cmd {
-                                       pins = "sdc2_cmd";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-data {
-                                       pins = "sdc2_data";
-                                       bias-pull-up;
-                                       drive-strength = <2>;
-                               };
-
-                               pinconf-sd-cd {
-                                       pins = "gpio69";
-                                       bias-disable;
-                                       drive-strength = <2>;
-                               };
-                       };
                };
 
                remoteproc_mpss: remoteproc@4080000 {