c06a5d3973d7bb95d24a454c4eb4e0a789a6e9dcd8a28e5640d0ed5a.patch

From 31435c3e10aad3e5c1470710ede99b5ef8772c46 Mon Sep 17 00:00:00 2001
From: Douglas Anderson <dianders@chromium.org>
Date: Mon, 15 Mar 2021 13:02:38 -0700
Subject: [PATCH] CHROMIUM: arm64: dts: qcom: Remove "dmic_clk_en" from coachz
 revs

It's the same in every revision and upstream has moved to the
coachz.dtsi file.

NOTE: it turns out that -r1 and -r2 of coachz are identical because
<https://crrev.com/c/2733863> ("CHROMIUM: arm64: dts: qcom: sc7180:
add dmic_clk_en back") wasn't the proper inverse of
<https://crrev.com/c/2596726> ("CHROMIUM: arm64: dts: qcom: sc7180:
remove dmic_clk_en"). We'll have to address this upstream since I
didn't notice and we've got both -r1 and -r2 there.

BUG=b:179637245, b:147399356
TEST=Use audio

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Change-Id: Ia624a1902749ca95f7673b112bcf944bbdbd5e4a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2846729
Commit-Queue: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
---
 .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts |  5 -----
 .../boot/dts/qcom/sc7180-trogdor-coachz-r3.dts | 18 ------------------
 2 files changed, 23 deletions(-)

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 612f9a751803..31f09fe41ad2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r1.dts
@@ -32,11 +32,6 @@ &skin_temp_thermal {
 	status = "disabled";
 };
 
-&sound {
-	pinctrl-names = "default";
-	pinctrl-0 = <&dmic_clk_en>;
-};
-
 &tlmm {
 	gpio-line-names = "HUB_RST_L",
 			  "AP_RAM_ID0",
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts
index 073f8fd46708..639dabb5e5f5 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz-r3.dts
@@ -14,11 +14,6 @@ / {
 	compatible = "google,coachz", "qcom,sc7180";
 };
 
-&sound {
-	pinctrl-names = "default";
-	pinctrl-0 = <&dmic_clk_en>;
-};
-
 &tlmm {
 	gpio-line-names = "HUB_RST_L",
 			  "AP_RAM_ID0",
@@ -143,17 +138,4 @@ &tlmm {
 			  "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;
-		};
-	};
 };
-- 
2.32.0.554.ge1b32706d8-goog