In general pinconf belongs in board files, not SoC files.  Move it to
the only current user (trogdor).  Also adjust the drive strengths and
pulls.

Cc: V Sujith Kumar Reddy <vsuji...@codeaurora.org>
Cc: Srinivasa Rao Mandadapu <sriva...@codeaurora.org>
Cc: Tzung-Bi Shih <tzun...@chromium.org>
Cc: Judy Hsiao <judyhs...@chromium.org>
Signed-off-by: Douglas Anderson <diand...@chromium.org>
---
This should replace the patch ("Asoc: qcom: dts: Change MI2S GPIO
configuration to pulldown") [1].

[1] 
https://lore.kernel.org/r/1605526408-15671-1-git-send-email-sriva...@codeaurora.org

 arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 24 ++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sc7180.dtsi         | 18 ---------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi 
b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 07c8b2c926c0..25ab6572f9cf 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -875,6 +875,22 @@ pinconf {
        };
 };
 
+&pri_mi2s_active {
+       pinconf {
+               pins = "gpio53", "gpio54", "gpio55", "gpio56";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+};
+
+&pri_mi2s_mclk_active {
+       pinconf {
+               pins = "gpio57";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+};
+
 &qspi_cs0 {
        pinconf {
                pins = "gpio68";
@@ -1015,6 +1031,14 @@ pinconf-rx {
        };
 };
 
+&sec_mi2s_active {
+       pinconf {
+               pins = "gpio49", "gpio50", "gpio51";
+               drive-strength = <2>;
+               bias-pull-down;
+       };
+};
+
 /* PINCTRL - board-specific pinctrl */
 
 &pm6150_gpio {
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi 
b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 60248a6757d8..5040923a9f7c 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1856,12 +1856,6 @@ pinmux {
                                        pins = "gpio49", "gpio50", "gpio51";
                                        function = "mi2s_1";
                                };
-
-                               pinconf {
-                                       pins = "gpio49", "gpio50", "gpio51";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
                        };
 
                        pri_mi2s_active: pri-mi2s-active {
@@ -1869,12 +1863,6 @@ pinmux {
                                        pins = "gpio53", "gpio54", "gpio55", 
"gpio56";
                                        function = "mi2s_0";
                                };
-
-                               pinconf {
-                                       pins = "gpio53", "gpio54", "gpio55", 
"gpio56";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
                        };
 
                        pri_mi2s_mclk_active: pri-mi2s-mclk-active {
@@ -1882,12 +1870,6 @@ pinmux {
                                        pins = "gpio57";
                                        function = "lpass_ext";
                                };
-
-                               pinconf {
-                                       pins = "gpio57";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
                        };
 
                        sdc1_on: sdc1-on {
-- 
2.30.1.766.gb4fecdf3b7-goog

Reply via email to