arm64: dts: qcom: sc7180: coachz: Add "dmic_clk_en"

This was present downstream. Add upstream too. NOTE: upstream I
managed to get some sort of halfway state and got one pinctrl entry in
the coachz-r1 device tree. Remove that as part of this since it's now
in the dtsi.

Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Cc: Ajit Pandey <ajitp@codeaurora.org>
Cc: Judy Hsiao <judyhsiao@chromium.org>
Cc: Cheng-Yi Chiang <cychiang@chromium.org>
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Matthias Kaehlcke <mka@chromium.org>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20210315133924.v2.1.I601a051cad7cfd0923e55b69ef7e5748910a6096@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
index 86619f6..1b1dbdb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
@@ -138,17 +138,4 @@
                          "AP_TS_PEN_I2C_SCL",
                          "DP_HOT_PLUG_DET",
                          "EC_IN_RW_ODL";
-
-       dmic_clk_en: dmic_clk_en {
-               pinmux {
-                       pins = "gpio83";
-                       function = "gpio";
-               };
-
-               pinconf {
-                       pins = "gpio83";
-                       drive-strength = <8>;
-                       bias-pull-up;
-               };
-       };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index e2ffe71..4c6e433 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -93,6 +93,9 @@ ap_ts_pen_1v8: &i2c4 {
        compatible = "google,sc7180-coachz";
        model = "sc7180-adau7002-max98357a";
        audio-routing = "PDM_DAT", "DMIC";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&dmic_clk_en>;
 };
 
 &sound_multimedia0_codec {
@@ -247,4 +250,17 @@ ap_ts_pen_1v8: &i2c4 {
                          "AP_TS_PEN_I2C_SCL",
                          "DP_HOT_PLUG_DET",
                          "EC_IN_RW_ODL";
+
+       dmic_clk_en: dmic_clk_en {
+               pinmux {
+                       pins = "gpio83";
+                       function = "gpio";
+               };
+
+               pinconf {
+                       pins = "gpio83";
+                       drive-strength = <8>;
+                       bias-pull-up;
+               };
+       };
 };