9497fe0452b3ac32d389e030ee36511d9f354b6ce9ad1c1adb32d880.patch

From 0170ee53dbbc0267d09cab5d7812a40ee4ad71ce Mon Sep 17 00:00:00 2001
From: Hsin-Yi Wang <hsinyi@chromium.org>
Date: Fri, 13 Aug 2021 17:05:28 +0800
Subject: [PATCH] CHROMIUM: arm64: dts: mt8183: Add kakadu rev1

Kakadu rev1 and rev2/3 are using different audio codecs. Though we
don't need to upstream rev1, add this dts so that we can test audio on
rev1 boards.

BUG=b:196011821
TEST=build & check probe

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Change-Id: I8c0324d0b002caab5344a82f40043b3b3b27c995
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3093015
Commit-Queue: Nicolas Boichat <drinkcat@chromium.org>
Commit-Queue: Kansho Nishida <kansho@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
Reviewed-by: Kansho Nishida <kansho@chromium.org>
---
 arch/arm64/boot/dts/mediatek/Makefile         |  1 +
 .../mediatek/mt8183-kukui-audio-rt1015.dtsi   | 18 +++++++++++++++++
 .../dts/mediatek/mt8183-kukui-kakadu-rev1.dts | 20 +++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015.dtsi
 create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-rev1.dts

diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 188ce77ca8607ce6397b802ffcaf9b5d60d970b4..11907f7d1bb436bfcdb272e0a757491d7d55c43c 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -33,6 +33,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-stern-rev3.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku0.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-willow-sku1.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu-rev1.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kakadu-sku22.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu-sku38.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015.dtsi
new file mode 100644
index 0000000000000000000000000000000000000000..6d56c43100d1354eab657e0a81461074c8adb1eb
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015.dtsi
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Google Kukui (and derivatives) audio fragment for rt1015p.
+ *
+ * Copyright 2020 Google LLC.
+ */
+
+&i2c6 {
+	rt1015@28 {
+		compatible = "realtek,rt1015";
+		reg = <0x28>;
+	};
+
+	rt1015@29 {
+		compatible = "realtek,rt1015";
+		reg = <0x29>;
+	};
+};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-rev1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-rev1.dts
new file mode 100644
index 0000000000000000000000000000000000000000..9a59198479d29233fc89c93d09b7ff633cfa4be1
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-rev1.dts
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2020 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-kakadu.dtsi"
+#include "mt8183-kukui-audio-da7219.dtsi"
+#include "mt8183-kukui-audio-rt1015.dtsi"
+
+/ {
+	model = "MediaTek kakadu rev0/rev1 board";
+	compatible = "google,kakadu-rev1", "google,kakadu-rev0",
+			"google,kakadu", "mediatek,mt8183";
+};
+
+&sound {
+	compatible = "mediatek,mt8183_da7219_rt1015";
+};
+
-- 
2.38.1.584.g0f3c55d4c2-goog