arm64: dts: qcom: Move sc7180 MI2S config to board files and make pulldown

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 <vsujithk@codeaurora.org>
Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Cc: Tzung-Bi Shih <tzungbi@chromium.org>
Cc: Judy Hsiao <judyhsiao@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/20210301133318.v2.2.Id27e7e6f90c29bf623fa4880e18a14ba1dffd2d2@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 58e127b..47eed13 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -877,6 +877,22 @@ ap_spi_fp: &spi10 {
        };
 };
 
+&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";
@@ -1017,6 +1033,14 @@ ap_spi_fp: &spi10 {
        };
 };
 
+&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 d616a05..8cc0e9a 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1856,12 +1856,6 @@
                                        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 @@
                                        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 @@
                                        pins = "gpio57";
                                        function = "lpass_ext";
                                };
-
-                               pinconf {
-                                       pins = "gpio57";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
                        };
 
                        sdc1_on: sdc1-on {