arm64: dts: mt8183: Add kukui katsu board

katsu is also known as ASUS Chromebook Detachable CZ1.

Let katsu and kakadu set its own touchscreen and panel compatible. Remove
these setting from the common dtsi for readability.

Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index e6e7592a3645819c72ebbdecf579b74e42cf2668..a13419e67e8e0417ed7ace963c787abb13f70f9f 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -36,6 +36,8 @@ 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-sku22.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu-sku32.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-katsu-sku38.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku16.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku272.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-kodama-sku288.dtb

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
index fcce8ea1232e64e91bdc9835d18756df9f9d031e..1ecf39458d9308f7775b50803d759d4b042f1068 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts
@@ -14,6 +14,24 @@
                     "google,kakadu", "mediatek,mt8183";
 };
 
+&i2c0 {
+       touchscreen: touchscreen@10 {
+               compatible = "hid-over-i2c";
+               reg = <0x10>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&open_touch>;
+
+               interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
+
+               post-power-on-delay-ms = <10>;
+               hid-descr-addr = <0x0001>;
+       };
+};
+
+&panel {
+       compatible = "boe,tv105wum-nw0";
+};
+
 &sound {
        compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p";
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
index ebfabba72507583c1bb410f334056b0367632fea..ba74109a49094e723eb8d8562876f7e0cc6b8f6f 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts
@@ -13,3 +13,21 @@
        compatible = "google,kakadu-rev3", "google,kakadu-rev2",
                        "google,kakadu", "mediatek,mt8183";
 };
+
+&i2c0 {
+       touchscreen: touchscreen@10 {
+               compatible = "hid-over-i2c";
+               reg = <0x10>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&open_touch>;
+
+               interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
+
+               post-power-on-delay-ms = <10>;
+               hid-descr-addr = <0x0001>;
+       };
+};
+
+&panel {
+       compatible = "boe,tv105wum-nw0";
+};

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
index a23543d7a11e978fcd2e07f7231d819cb84ac53f..b6a9830af2696f55a9e013b462d96f6164d20ef8 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi
@@ -63,18 +63,6 @@
 
 &i2c0 {
        status = "okay";
-
-       touchscreen: touchscreen@10 {
-               compatible = "hid-over-i2c";
-               reg = <0x10>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&open_touch>;
-
-               interrupts-extended = <&pio 155 IRQ_TYPE_EDGE_FALLING>;
-
-               post-power-on-delay-ms = <10>;
-               hid-descr-addr = <0x0001>;
-       };
 };
 
 &mt6358_vcama2_reg {
@@ -383,5 +371,5 @@
 
 &panel {
        status = "okay";
-       compatible = "boe,tv105wum-nw0";
+       /* compatible will be set in board dts */
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
new file mode 100644 (file)
index 0000000..0536100
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-kakadu.dtsi"
+#include "mt8183-kukui-audio-da7219-rt1015p.dtsi"
+
+/ {
+       model = "Google katsu board";
+       chassis-type = "tablet";
+       compatible = "google,katsu-sku32", "google,katsu", "mediatek,mt8183";
+};
+
+&i2c0 {
+       touchscreen1: touchscreen@5d {
+               compatible = "goodix,gt7375p";
+               reg = <0x5d>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&open_touch>;
+
+               interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
+
+               reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
+               vdd-supply = <&lcd_pp3300>;
+       };
+};
+
+&panel {
+       compatible = "starry,2081101qfh032011-53g";
+};
+
+&qca_wifi {
+       qcom,ath10k-calibration-variant = "GO_KATSU";
+};

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
new file mode 100644 (file)
index 0000000..cf008ed
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright 2023 Google LLC
+ */
+
+/dts-v1/;
+#include "mt8183-kukui-kakadu.dtsi"
+#include "mt8183-kukui-audio-rt1015p.dtsi"
+
+/ {
+       model = "Google katsu sku38 board";
+       chassis-type = "tablet";
+       compatible = "google,katsu-sku38", "google,katsu", "mediatek,mt8183";
+};
+
+&i2c0 {
+       touchscreen1: touchscreen@5d {
+               compatible = "goodix,gt7375p";
+               reg = <0x5d>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&open_touch>;
+
+               interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
+
+               reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
+               vdd-supply = <&lcd_pp3300>;
+       };
+};
+
+&panel {
+       compatible = "starry,2081101qfh032011-53g";
+};
+
+&qca_wifi {
+       qcom,ath10k-calibration-variant = "GO_KATSU";
+};
+
+&sound {
+       compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p";
+};