From nobody Fri Sep 20 09:36:04 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C86ACC25B48 for ; Thu, 26 Oct 2023 19:14:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231881AbjJZTOE (ORCPT ); Thu, 26 Oct 2023 15:14:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230507AbjJZTNy (ORCPT ); Thu, 26 Oct 2023 15:13:54 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5A741A7 for ; Thu, 26 Oct 2023 12:13:51 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-2800259527dso563720a91.2 for ; Thu, 26 Oct 2023 12:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698347631; x=1698952431; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CAO4Vq2lAtqVduwbRFXBpJqHTTi1hnz8FUzyO8B5YMU=; b=U5ncsxIIQ7I63EVCJ++TKou2vMoNeROB92U+KC/FJWxC4MhukOVXpPfBW68WBEsUpz PlPoUyW1TV484mp8YBzKpxMEnpRnuISK/SU/0/mtf8tBskl7eY7xyJpkwmsavObo84Jw hrR2rB1+i5Hh1Ev0n6nmJ01+cfSmWxDiipZDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698347631; x=1698952431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CAO4Vq2lAtqVduwbRFXBpJqHTTi1hnz8FUzyO8B5YMU=; b=pTUH6T8QeHyCufIP5Qr9ARrFJyFEH6m4RPxgAo+8+4glvIXAkkjk4y8H1VsKfxASEG IH5KuzLulAe9LXBV4eCwy+BbtZdEb7+kr4KhY+i1fduIKwHywkoMPC7GQw2PSMvKgQxo qQNuLbaS+PAK0QzKQ5R49JXO+gmrcdeVG5DPZY/+TgbwAuLE8DKFjLft009m3KgudtvG cK4ROfABT8MrCQRoaREv/jq7GOljcUKIYUuYaDXlxopiSNCmockvxgq7OgduUKbPSfx+ vxNe3+UhZ32WMTClzrdVa3iAyzU3Dx0XGMuAC+Qwq3rE9gBPGLyxJ1/twYpl6OsR1ZKD IqEg== X-Gm-Message-State: AOJu0Yxv0vXq50FFWgb16Ipb9S7i6OuBKJTc5Vtao04VEdNcUvD57lBu 5tujbumSOdierVyBHDG1g30qL+KaYrIjHGscvSM= X-Google-Smtp-Source: AGHT+IE6uCrGdUzHI14GAQsOlabr/a7U4b+OoiEvBWYCgy4ZHcU/W16zsfazUOqGXXykfy7jnZB7rA== X-Received: by 2002:a17:90a:db92:b0:280:e0:9071 with SMTP id h18-20020a17090adb9200b0028000e09071mr520259pjv.28.1698347631047; Thu, 26 Oct 2023 12:13:51 -0700 (PDT) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:f0fe:5c3b:1d70:d0bb]) by smtp.gmail.com with ESMTPSA id 22-20020a17090a031600b0027476c68cc3sm2183639pje.22.2023.10.26.12.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 12:13:50 -0700 (PDT) From: Hsin-Yi Wang To: Matthias Brugger , AngeloGioacchino Del Regno , Krzysztof Kozlowski Cc: Rob Herring , Conor Dooley , =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= , Macpaul Lin , Sean Wang , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v4 3/7] arm64: dts: mt8183: Add kukui katsu board Date: Thu, 26 Oct 2023 12:09:12 -0700 Message-ID: <20231026191343.3345279-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.820.g83a721a137-goog In-Reply-To: <20231026191343.3345279-1-hsinyi@chromium.org> References: <20231026191343.3345279-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: AngeloGioacchino Del Regno --- arch/arm64/boot/dts/mediatek/Makefile | 2 + .../mediatek/mt8183-kukui-kakadu-sku22.dts | 18 +++++++++ .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 18 +++++++++ .../dts/mediatek/mt8183-kukui-kakadu.dtsi | 14 +------ .../dts/mediatek/mt8183-kukui-katsu-sku32.dts | 36 +++++++++++++++++ .../dts/mediatek/mt8183-kukui-katsu-sku38.dts | 40 +++++++++++++++++++ 6 files changed, 115 insertions(+), 13 deletions(-) create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.d= ts create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.d= ts diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/me= diatek/Makefile index e6e7592a3645..a13419e67e8e 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -36,6 +36,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-jacuzzi-wil= low-sku0.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-jacuzzi-willow-sku1.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-kakadu.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-kakadu-sku22.dtb +dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-katsu-sku32.dtb +dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-katsu-sku38.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-kodama-sku16.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-kodama-sku272.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8183-kukui-kodama-sku288.dtb diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts b/a= rch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu-sku22.dts index fcce8ea1232e..1ecf39458d93 100644 --- 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"; }; =20 +&i2c0 { + touchscreen: touchscreen@10 { + compatible =3D "hid-over-i2c"; + reg =3D <0x10>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&open_touch>; + + interrupts-extended =3D <&pio 155 IRQ_TYPE_EDGE_FALLING>; + + post-power-on-delay-ms =3D <10>; + hid-descr-addr =3D <0x0001>; + }; +}; + +&panel { + compatible =3D "boe,tv105wum-nw0"; +}; + &sound { compatible =3D "mediatek,mt8183_mt6358_ts3a227_rt1015p"; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts b/arch/ar= m64/boot/dts/mediatek/mt8183-kukui-kakadu.dts index ebfabba72507..ba74109a4909 100644 --- 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 =3D "google,kakadu-rev3", "google,kakadu-rev2", "google,kakadu", "mediatek,mt8183"; }; + +&i2c0 { + touchscreen: touchscreen@10 { + compatible =3D "hid-over-i2c"; + reg =3D <0x10>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&open_touch>; + + interrupts-extended =3D <&pio 155 IRQ_TYPE_EDGE_FALLING>; + + post-power-on-delay-ms =3D <10>; + hid-descr-addr =3D <0x0001>; + }; +}; + +&panel { + compatible =3D "boe,tv105wum-nw0"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi b/arch/a= rm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi index a23543d7a11e..b6a9830af269 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dtsi @@ -63,18 +63,6 @@ &bluetooth { =20 &i2c0 { status =3D "okay"; - - touchscreen: touchscreen@10 { - compatible =3D "hid-over-i2c"; - reg =3D <0x10>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&open_touch>; - - interrupts-extended =3D <&pio 155 IRQ_TYPE_EDGE_FALLING>; - - post-power-on-delay-ms =3D <10>; - hid-descr-addr =3D <0x0001>; - }; }; =20 &mt6358_vcama2_reg { @@ -383,5 +371,5 @@ &qca_wifi { =20 &panel { status =3D "okay"; - compatible =3D "boe,tv105wum-nw0"; + /* compatible will be set in board dts */ }; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts b/ar= ch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts new file mode 100644 index 000000000000..05361008e8ac --- /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 =3D "Google katsu board"; + chassis-type =3D "tablet"; + compatible =3D "google,katsu-sku32", "google,katsu", "mediatek,mt8183"; +}; + +&i2c0 { + touchscreen1: touchscreen@5d { + compatible =3D "goodix,gt7375p"; + reg =3D <0x5d>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&open_touch>; + + interrupts-extended =3D <&pio 155 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios =3D <&pio 156 GPIO_ACTIVE_LOW>; + vdd-supply =3D <&lcd_pp3300>; + }; +}; + +&panel { + compatible =3D "starry,2081101qfh032011-53g"; +}; + +&qca_wifi { + qcom,ath10k-calibration-variant =3D "GO_KATSU"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/ar= ch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts new file mode 100644 index 000000000000..cf008ed82878 --- /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 =3D "Google katsu sku38 board"; + chassis-type =3D "tablet"; + compatible =3D "google,katsu-sku38", "google,katsu", "mediatek,mt8183"; +}; + +&i2c0 { + touchscreen1: touchscreen@5d { + compatible =3D "goodix,gt7375p"; + reg =3D <0x5d>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&open_touch>; + + interrupts-extended =3D <&pio 155 IRQ_TYPE_LEVEL_LOW>; + + reset-gpios =3D <&pio 156 GPIO_ACTIVE_LOW>; + vdd-supply =3D <&lcd_pp3300>; + }; +}; + +&panel { + compatible =3D "starry,2081101qfh032011-53g"; +}; + +&qca_wifi { + qcom,ath10k-calibration-variant =3D "GO_KATSU"; +}; + +&sound { + compatible =3D "mediatek,mt8183_mt6358_ts3a227_rt1015p"; +}; --=20 2.42.0.820.g83a721a137-goog