66606ded448486d6a64ddfc36084a4fa41b1b5d86538f51c9ea5b422.patch

From 1718fcc790944534bc889a62ab35bdcf29a143ae Mon Sep 17 00:00:00 2001
From: tongjian <tongjian@huaqin.corp-partner.google.com>
Date: Mon, 7 Nov 2022 14:01:41 +0800
Subject: [PATCH] CHROMIUM: arm64: dts: mt8186: Add voltorb board

Add corsola voltorb board dts

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

Signed-off-by: tongjian <tongjian@huaqin.corp-partner.google.com>
Change-Id: I7df2385ba30ba6378bc0863d1ba5529abeca0829
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4005822
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Commit-Queue: Hsin-Yi Wang <hsinyi@chromium.org>

[rebase66(tzungbi):
 Squashed:
   FIXUP: CHROMIUM: arm64: dts: mt8186: Add the new skus and the mt6315 for spmi.
]
Signed-off-by: Tzung-Bi Shih <tzungbi@chromium.org>
---
 arch/arm64/boot/dts/mediatek/Makefile         |  2 ++
 .../mt8186-corsola-voltorb-sku589825.dts      | 21 ++++++++++++++++---
 .../dts/mediatek/mt8186-corsola-voltorb.dtsi  |  7 +++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 151b01a8f648bac3984e0352d0c44fbd78571a00..896cf0f07e41f6473a3f0ec2e660b76630067f8b 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -75,6 +75,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131072.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131073.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131076.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-steelix-sku131077.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589824.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589825.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327681.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327683.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacruel-sku262144.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts
index 45e57f7706cc121eecebd92537b7ffad8d4b8d7c..48c0a32d69eb97e7f5b424f3ab6463aac4a42573 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts
@@ -7,9 +7,9 @@
 #include "mt8186-corsola-voltorb.dtsi"
 
 / {
-	model = "Google Voltorb sku589825 board";
-	compatible = "google,voltorb-sku589825", "google,voltorb",
-		     "mediatek,mt8186";
+	model = "Google Voltorb unprovisioned/sku589825 board";
+	compatible = "google,voltorb-sku2147483647", "google,voltorb-sku589825",
+		     "google,voltorb", "mediatek,mt8186";
 };
 
 &i2c1 {
@@ -22,4 +22,19 @@ touchscreen@10 {
 		reset-gpios = <&pio 60 GPIO_ACTIVE_LOW>;
 		vcc33-supply = <&pp3300_s3>;
 	};
+	touchscreen_auo: touchscreen@10 {
+		status = "okay";
+
+		compatible = "hid-over-i2c";
+		reg = <0x10>;
+		interrupt-parent = <&pio>;
+		interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&touchscreen_pins>;
+		reset-gpios = <&pio 60 GPIO_ACTIVE_LOW>;
+		vdd-supply = <&pp3300_s3>;
+
+		post-power-on-delay-ms = <450>;
+		hid-descr-addr = <0x0001>;
+	};
 };
diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
index 52ec58128d56159b9d0b5c8e72a9ee3ebeb486bd..2965611c08e735d08499615bb4ab3d010cc5f5e7 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
@@ -7,6 +7,7 @@
 #include <dt-bindings/spmi/spmi.h>
 
 #include "mt8186-corsola-steelix.dtsi"
+#include "mt6315.dtsi"
 
 / {
 	chassis-type = "laptop";
@@ -19,11 +20,13 @@ max98360a: max98360a {
 };
 
 &cpu6 {
-	proc-supply = <&mt6319_buck1>;
+	proc-supply = <&mt6315_6_vbuck1>;
+	sram-supply = <&mt6366_vsram_proc11_reg>;
 };
 
 &cpu7 {
-	proc-supply = <&mt6319_buck1>;
+	proc-supply = <&mt6315_6_vbuck1>;
+	sram-supply = <&mt6366_vsram_proc11_reg>;
 };
 
 &gpio_keys {
-- 
2.46.0.rc2.264.g509ed76dc8-goog