Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp125315pxh; Tue, 9 Nov 2021 22:33:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4dY7p1KPyQU1WY9MLhu5oSQufnPG2ZWifWaqPB26EOrvv8TSmCxd/mJYmHu/324yTGHgc X-Received: by 2002:a05:6638:d84:: with SMTP id l4mr10558591jaj.30.1636526009155; Tue, 09 Nov 2021 22:33:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636526009; cv=none; d=google.com; s=arc-20160816; b=j1xi+MVKtxq6Swq2QOPv3HPdJCI6kney7G8Qj9gZ1hL5Rjm8+/MY9mawNNk95zEZ8f KD/h1zusXY0C0nRmBT2YJHj5y1vsbkwAB4/eJAyy8O3dbNhlp4biR/006J3rh4jGBlqt qaRh7Uh1LObm+T5z2qkDMxSaXOM1v5d/tU6s75xwqto54PSYyseKoR2FXnZq+8pHRllY IO30M3uqAO3eL0vq3aLCEVrC07WAlWFy5NuZQX+xaQuV6lkymdZ0+5sxEaBv1nvfGGfj n7kKurApjrBTZ/aHBnK94Srefx9/2DhdnWiZdZmvLnczkbFTiqurwJiOpz2w5LvZXUEo zxUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bqa39s+vxgVR+dxhrZtkvgAdK1DW/ZPp25VXvulqjaE=; b=S0AHeRNB581hYIVoJXVKwGPadnBNj4V3AwC+H3oKzzKEYe1afRH4IsJ5Zht+o0oa47 jTpRueoIccdJtf7q/mdqPeNmlidj+hdD1Nuc55yl7/qa48h/ANUuzNYX4DLkP2/y8LJE CQg4ujdn8YqgdtqgYuqzNcT6H+iXSjnEnFN5eqsQOd3fhHAaE2IRrhpBlJ5ZEh3/iICT yPO7cRy5zvL2WsbKykUlZwFPPSFMZwScYxScSlqGzu/RK/0ZM0y+08RuC1PwdADfB0UO k9vA8u9NMy9VPFFNQ5K/8TQaQ+Z71wp6QbTbHNN/mE6YbQ5FKnmZJSf4nS5KwQeeTAVx yW7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KL3LG3fA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p16si12703298iov.103.2021.11.09.22.33.16; Tue, 09 Nov 2021 22:33:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=KL3LG3fA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230421AbhKJGeZ (ORCPT + 99 others); Wed, 10 Nov 2021 01:34:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230312AbhKJGeN (ORCPT ); Wed, 10 Nov 2021 01:34:13 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F6E7C061205 for ; Tue, 9 Nov 2021 22:31:26 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id z6so1740177pfe.7 for ; Tue, 09 Nov 2021 22:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bqa39s+vxgVR+dxhrZtkvgAdK1DW/ZPp25VXvulqjaE=; b=KL3LG3fA2XYmAQRIF92Bux8GCdIL09i+tNwrYHREX8NzWEe5Ai3EuSMYMLWPoZriP1 qNe010FGev1lFh/mqsRiOYb3JIkPbWqTX7536MmRG46l3dsMjF5/p4G6e5YrO7/fI66p xafwl4G06uvLffBx74+sIQXmNfWlPchA15mEE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bqa39s+vxgVR+dxhrZtkvgAdK1DW/ZPp25VXvulqjaE=; b=gkS1hhQxjDyHveGzlolEbfADBIP9k4hWntMHpdNIh/WxHU2pkgyIO7v0WHLYvOp2PW ZzZYcQflWFUK4zxeaf5iSFdutIxOErb2tcfv1WwjS18wsWtZ8oeu3WbTT8SKmSQVkFkY 0ojRfkwGZl/kNlmo9hyu9PoVQSHB+iR5UcehcOBQHijzQvIcChDcpz20pS6cq7Xof+VA ZWV21QjstLFvEMpIzHC8Vj7xJDBJgV7m2Q0F1XF1JFCo23E19jM0Lr94syPdP9XU4KR2 5P1qPr0ipHA6Ec7bRy4tl07IWr/atPzVS6PxuCEOK/J0XVPYLQKgCDYtGP4PEseTZ5RQ mCTQ== X-Gm-Message-State: AOAM530FLd3ERIISCXHMNBI0wamFrnHqKieyxRhJmn1ggFNkDPydDgjq 5A0pzn6iaYx/53fBIR7U8AgRYg== X-Received: by 2002:a63:4965:: with SMTP id y37mr10339021pgk.227.1636525885756; Tue, 09 Nov 2021 22:31:25 -0800 (PST) Received: from hsinyi-z840.tpe.corp.google.com ([2401:fa00:1:10:6886:f712:1a79:e3d9]) by smtp.gmail.com with ESMTPSA id w1sm15623959pgb.50.2021.11.09.22.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 22:31:25 -0800 (PST) From: Hsin-Yi Wang To: Matthias Brugger Cc: Rob Herring , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 3/7] arm64: dts: mt8183: Add more fennel SKUs Date: Wed, 10 Nov 2021 14:31:14 +0800 Message-Id: <20211110063118.3412564-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.34.0.rc0.344.g81b53c2807-goog In-Reply-To: <20211110063118.3412564-1-hsinyi@chromium.org> References: <20211110063118.3412564-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add fennel sku7 and fennel14 sku2, which use different audio codec than previous fennel/fennel14 boards. Signed-off-by: Hsin-Yi Wang --- arch/arm64/boot/dts/mediatek/Makefile | 2 ++ .../mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + .../mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + .../mt8183-kukui-jacuzzi-fennel-sku7.dts | 33 +++++++++++++++++++ .../mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 - .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 17 ++++++++++ .../mt8183-kukui-jacuzzi-fennel14.dts | 1 + 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile index 045927402269a9..9834bd659d1530 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -18,7 +18,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-cozmo.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-damu.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel-sku1.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel-sku6.dtb +dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel-sku7.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel14.dtb +dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-fennel14-sku2.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-juniper-sku16.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kappa.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-jacuzzi-kenzo.dtb diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts index ef6257c9a2d2ff..dec11a4eb59e30 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "mt8183-kukui-jacuzzi-fennel.dtsi" +#include "mt8183-kukui-audio-da7219-rt1015p.dtsi" / { model = "Google fennel sku1 board"; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts index 899c2e42385c27..37e6e58f63b7e3 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "mt8183-kukui-jacuzzi-fennel.dtsi" +#include "mt8183-kukui-audio-da7219-rt1015p.dtsi" / { model = "Google fennel sku6 board"; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts new file mode 100644 index 00000000000000..0e09604004d5e7 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2021 Google LLC + */ + +/dts-v1/; +#include "mt8183-kukui-jacuzzi-fennel.dtsi" +#include "mt8183-kukui-audio-ts3a227e-rt1015p.dtsi" + +/ { + model = "Google fennel sku7 board"; + compatible = "google,fennel-sku7", "google,fennel", "mediatek,mt8183"; +}; + +&touchscreen { + status = "okay"; + + compatible = "hid-over-i2c"; + reg = <0x10>; + interrupt-parent = <&pio>; + interrupts = <155 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&touchscreen_pins>; + + post-power-on-delay-ms = <10>; + hid-descr-addr = <0x0001>; +}; + + +&qca_wifi { + qcom,ath10k-calibration-variant = "GO_FENNEL"; +}; + diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi index 577519a775c057..bbe6c338f465ee 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi @@ -5,7 +5,6 @@ /dts-v1/; #include "mt8183-kukui-jacuzzi.dtsi" -#include "mt8183-kukui-audio-da7219-rt1015p.dtsi" &mt6358codec { mediatek,dmic-mode = <1>; /* one-wire */ diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts new file mode 100644 index 00000000000000..3fc5a6181d7e66 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14-sku2.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2021 Google LLC + */ + +/dts-v1/; +#include "mt8183-kukui-jacuzzi-fennel.dtsi" +#include "mt8183-kukui-audio-ts3a227e-rt1015p.dtsi" + +/ { + model = "Google fennel14 sku2 board"; + compatible = "google,fennel-sku2", "google,fennel", "mediatek,mt8183"; +}; + +&qca_wifi { + qcom,ath10k-calibration-variant = "GO_FENNEL14"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts index e8c41f6b4b0d4e..23ad0b91e9776f 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "mt8183-kukui-jacuzzi-fennel.dtsi" +#include "mt8183-kukui-audio-da7219-rt1015p.dtsi" / { model = "Google fennel14 sku0 board"; -- 2.34.0.rc0.344.g81b53c2807-goog