dab19600ddae4ba87b557ae45263cf9dd325342193a687ffd260abc5.patch

From 10624c57dab70e799c516aa37166e37596051189 Mon Sep 17 00:00:00 2001
From: yangcong <yangcong5@huaqin.corp-partner.google.com>
Date: Mon, 17 Oct 2022 11:28:46 +0800
Subject: [PATCH] CHROMIUM: arm64: dts: mt8186: Optimize corsola-steelix/rusty
 dts

Optimize dts, rev0 and rev1 match same dts,
rusty-sku196608 dts and steelix-sku131072/steelix-sku131072
dts match the DVT and later phase.

BUG=b:249436110
TEST=emerge-corsola sys-kernel/chromeos-kernel-5_15

Change-Id: I1cb19e447a86ad123a162a76e0d68ce796c9d653
Signed-off-by: yangcong <yangcong5@huaqin.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3956816
Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: Xuxin Xiong <xuxinxiong@huaqin.corp-partner.google.com>
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
---
 arch/arm64/boot/dts/mediatek/Makefile         |  4 +++-
 .../mt8186-corsola-rusty-rev0-sku196608.dts   | 24 +++++++++++++++++++
 .../mt8186-corsola-rusty-sku196608.dts        |  5 ++--
 .../mt8186-corsola-steelix-rev0-sku131072.dts | 19 +++++++++++++++
 .../mt8186-corsola-steelix-rev0-sku131073.dts | 19 +++++++++++++++
 .../mt8186-corsola-steelix-sku131072.dts      |  6 ++---
 .../mt8186-corsola-steelix-sku131073.dts      |  6 ++---
 7 files changed, 74 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-rev0-sku196608.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131072.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131073.dts

diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index cbd590b0840cebf8173a32a8397739d14d1d4358..3a620b91e1f4bb5256bddc582b6ea7bf1f7919d4 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -64,8 +64,10 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-rev2-sku393218.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393216.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393217.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-magneton-sku393218.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-rusty-rev0-sku196608.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-rusty-sku196608.dtb
-dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-rusty-rev2-sku196608.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-rev0-sku131072.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-rev0-sku131073.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131072.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131073.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327681.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-rev0-sku196608.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-rev0-sku196608.dts
new file mode 100644
index 0000000000000000000000000000000000000000..99ccb9e75f6fc10b187b7e6106efd1e9eab1435f
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-rev0-sku196608.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2022 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8186-corsola-steelix.dtsi"
+#include "mt8186-corsola-ps8640.dtsi"
+
+/ {
+	model = "Google Rusty rev0/rev1 sku196608/196609 board";
+	compatible = "google,steelix-rev0-sku196608", "google,steelix-rev0-sku196609",
+		     "google,steelix-rev1-sku196608", "google,steelix-rev1-sku196609",
+		     "google,steelix-rev0", "google,steelix-rev1",
+		     "google,steelix", "mediatek,mt8186";
+};
+
+&gpio_keys {
+	status = "disabled";
+};
+
+&touchscreen {
+	status = "disabled";
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts
index 731b0d60228dddfa329091f350040921d839ea5f..5e0f14d0478a29da2b1bdc265e585c2248bbcf6d 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-rusty-sku196608.dts
@@ -7,8 +7,9 @@
 #include "mt8186-corsola-steelix.dtsi"
 
 / {
-	model = "Google Rusty board";
-	compatible = "google,steelix-sku196609", "google,steelix-sku196608",
+	model = "Google Rusty sku196608/196609/196610/196611 board";
+	compatible = "google,steelix-sku196608", "google,steelix-sku196609",
+		     "google,steelix-sku196610", "google,steelix-sku196611",
 		     "google,steelix", "mediatek,mt8186";
 	chassis-type = "laptop";
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131072.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131072.dts
new file mode 100644
index 0000000000000000000000000000000000000000..7099c283fc44994409a407f816719260d0a25020
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131072.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2022 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8186-corsola-steelix.dtsi"
+#include "mt8186-corsola-ps8640.dtsi"
+
+/ {
+	model = "Google Steelix rev0/rev1 sku131072 board";
+	compatible = "google,steelix-rev0-sku131072", "google,steelix-rev0",
+		     "google,steelix-rev1-sku131072", "google,steelix-rev1",
+		     "google,steelix", "mediatek,mt8186";
+};
+
+&mt6366codec {
+	mediatek,dmic-mode = <0>; /* two-wire */
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131073.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131073.dts
new file mode 100644
index 0000000000000000000000000000000000000000..9825ba3272e68035ec3a92dcee493485f1d8060c
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-rev0-sku131073.dts
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2022 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8186-corsola-steelix.dtsi"
+#include "mt8186-corsola-ps8640.dtsi"
+
+/ {
+	model = "Google Steelix rev0/rev1 sku131073 board";
+	compatible = "google,steelix-rev0-sku131073", "google,steelix-rev0",
+		     "google,steelix-rev1-sku131073", "google,steelix-rev1",
+		     "google,steelix", "mediatek,mt8186";
+};
+
+&mt6366codec {
+	mediatek,dmic-mode = <1>; /* one-wire */
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts
index a6d8b5ab0fbe0c240cbe5ee8314bbbdac8d68b05..b3662216dee7b3b35d4967913f2866f35cd899f4 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131072.dts
@@ -7,9 +7,9 @@
 #include "mt8186-corsola-steelix.dtsi"
 
 / {
-	model = "Google Steelix sku131072 board";
-	compatible = "google,steelix-rev2-sku131072", "google,steelix-rev2-sku131074",
-		     "google,steelix-rev2", "google,steelix", "mediatek,mt8186";
+	model = "Google Steelix sku131072/131074 board";
+	compatible = "google,steelix-sku131072", "google,steelix-sku131074",
+		     "google,steelix", "mediatek,mt8186";
 	chassis-type = "convertible";
 };
 
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts
index c4ae7509774736a53a4b300aae7b2a8a81ba432a..722398789a60537c8b7fbcc14f6bc212e801b68d 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-steelix-sku131073.dts
@@ -7,9 +7,9 @@
 #include "mt8186-corsola-steelix.dtsi"
 
 / {
-	model = "Google Steelix sku131073 board";
-	compatible = "google,steelix-rev2-sku131073", "google,steelix-rev2-sku131075",
-		     "google,steelix-rev2", "google,steelix", "mediatek,mt8186";
+	model = "Google Steelix sku131073/131075 board";
+	compatible = "google,steelix-sku131073", "google,steelix-sku131075",
+		     "google,steelix", "mediatek,mt8186";
 	chassis-type = "convertible";
 };
 
-- 
2.44.0.683.g7961c838ac-goog