From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3999FC4338F for ; Tue, 10 Aug 2021 14:51:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B7D660F38 for ; Tue, 10 Aug 2021 14:51:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241904AbhHJOvZ (ORCPT ); Tue, 10 Aug 2021 10:51:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242003AbhHJOuX (ORCPT ); Tue, 10 Aug 2021 10:50:23 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0FB2C0613C1; Tue, 10 Aug 2021 07:49:57 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id o7-20020a05600c5107b0290257f956e02dso2169070wms.1; Tue, 10 Aug 2021 07:49:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=0L5sbs+fZ65PQbp4wLhlM4+FoRP5ZhN7SRw5znteNAg=; b=gOfSmldmcRvnhiZC9VMawG4LXLVEJqCutsE0tBnmBH+jC9zfeJvzPsQm0FZM+DCTWb 4ZRELivSLijSpQhYar2VB7HZQa6zYjcPYRTtTbBmS6EKD2+QIpONEvPp+IFB6LSxcbwv vaSueeAXryBnaVdOyYKMM7EPO5Lra2NyKH6gYioB6T9VxdrKF6zg92VQmfTBF5ofLsWG wJ9yfjRu/0j07cEVCSUpH5f6mAhWqEr7DWKKxPUj9E/5sSKhb9H2vnBbvXwGkGd8uALz fCJS0nj6ctRmOrdJZT1jLwqfti+3LHZtbyPghE2BR6cPpKD1XErbncLYWpj8jgN9XsqA QbVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0L5sbs+fZ65PQbp4wLhlM4+FoRP5ZhN7SRw5znteNAg=; b=BHX0MjDOHvtebQwwZ7DI+Nf29xyz//f2JPrM1wPd7Q21yeYoLU2Dqo16d6Dl5GRjK9 UmS+zS1Eo10c8mX0mvv4vVzNrRENrqJ3bF6SnhxlLSpMuMwaKi66T3sxlZoegyUNvLHN JVXkg3LvLZm3HBvbB3LOedmZcuvqstOdP55xXTQE9cnBneHVtNr5n8qc2hOLJtB6SW3o bcoPUan8yKvlxlxSr3T+0jqTsirXlw4Y0+34n7Z7aKXMUobeKDar/KKRyrAJ385L3Kis D9hI6Auhq96MbQ/G8MmKU9voq9ZD7L5KIvQY+plfeoFNlrVX2uYwpKj6MgztaYUzJA9D 7Ung== X-Gm-Message-State: AOAM531pzJAELa2/l15B3/fT1o4Un64ScwcwDr1O6ZAUMHrTU1ez9rHe CynhB4XSnoxnv5RzjGpMpJw= X-Google-Smtp-Source: ABdhPJzZN+y+OpBt53TisWFgI9WeZnCRs5ilfSY9OTHLZmHBftfRYFxGXq7Utx/vZK5DsFjSJuIgJA== X-Received: by 2002:a05:600c:252:: with SMTP id 18mr12568315wmj.61.1628606996385; Tue, 10 Aug 2021 07:49:56 -0700 (PDT) Received: from ziggy.stardust ([207.188.163.204]) by smtp.gmail.com with ESMTPSA id t1sm3145944wma.25.2021.08.10.07.49.55 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Aug 2021 07:49:55 -0700 (PDT) Subject: Re: [PATCH v3 2/2] arm64: dts: mt8183: add kukui platform audio node To: Kansho Nishida Cc: Shunli Wang , linux-arm-kernel@lists.infradead.org, LKML , Rob Herring , Eddie Huang , linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Jiaxin Yu References: <20210706100136.1205047-1-kansho@chromium.org> <20210706190111.v3.2.I6e9ce0f2a489f9a52299656cd966b38ae75e7552@changeid> From: Matthias Brugger Message-ID: <8923429b-bf81-e185-86e1-6a5bc78f0f60@gmail.com> Date: Tue, 10 Aug 2021 16:49:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210706190111.v3.2.I6e9ce0f2a489f9a52299656cd966b38ae75e7552@changeid> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 06/07/2021 12:01, Kansho Nishida wrote: > Set pin control for the SoC sound node. > The compatibles are set by each model dts. > > The codecs that each models use are: > burnet ts3a227_max98357 > damu da7219_max98357 > fennel da7219_rt1015p > fennel14 da7219_rt1015p > juniper ts3a227_max98357 > kakadu da7219_rt1015p > kappa ts3a227_max98357 > kenzo ts3a227_max98357 > kodama ts3a227_max98357 > krane ts3a227_max98357 > willow-sku0 da7219_max98357 > willow-sku1 ts3a227_max98357 > > Signed-off-by: Kansho Nishida Queued in v5.15-tmp/dts64 Thanks! > --- > > (no changes since v2) > > Changes in v2: > - Changed to the dual license GPL + MIT. > > arch/arm64/boot/dts/mediatek/mt6358.dtsi | 1 + > .../mt8183-kukui-audio-da7219-max98357a.dtsi | 13 ++++ > .../mt8183-kukui-audio-da7219-rt1015p.dtsi | 13 ++++ > .../mediatek/mt8183-kukui-audio-da7219.dtsi | 54 +++++++++++++++ > .../mt8183-kukui-audio-max98357a.dtsi | 13 ++++ > .../mediatek/mt8183-kukui-audio-rt1015p.dtsi | 13 ++++ > ...mt8183-kukui-audio-ts3a227e-max98357a.dtsi | 13 ++++ > .../mt8183-kukui-audio-ts3a227e-rt1015p.dtsi | 13 ++++ > .../mediatek/mt8183-kukui-audio-ts3a227e.dtsi | 32 +++++++++ > .../mediatek/mt8183-kukui-jacuzzi-burnet.dts | 1 + > .../mediatek/mt8183-kukui-jacuzzi-damu.dts | 1 + > .../mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 1 + > .../mt8183-kukui-jacuzzi-juniper-sku16.dts | 1 + > .../mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + > .../mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + > .../mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + > .../mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + > .../boot/dts/mediatek/mt8183-kukui-kakadu.dts | 1 + > .../dts/mediatek/mt8183-kukui-kodama.dtsi | 1 + > .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 5 ++ > .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 67 +++++++++++++++++-- > 21 files changed, 243 insertions(+), 4 deletions(-) > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi > create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi > > diff --git a/arch/arm64/boot/dts/mediatek/mt6358.dtsi b/arch/arm64/boot/dts/mediatek/mt6358.dtsi > index fa159b20379e..95145076b7e6 100644 > --- a/arch/arm64/boot/dts/mediatek/mt6358.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt6358.dtsi > @@ -13,6 +13,7 @@ pmic: mt6358 { > > mt6358codec: mt6358codec { > compatible = "mediatek,mt6358-sound"; > + mediatek,dmic-mode = <0>; /* two-wires */ > }; > > mt6358regulator: mt6358regulator { > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi > new file mode 100644 > index 000000000000..e4aeea4599f5 > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-max98357a.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) da7219-max98357a sound card. > + * > + * Copyright 2019 Google LLC. > + */ > + > +#include "mt8183-kukui-audio-da7219.dtsi" > +#include "mt8183-kukui-audio-max98357a.dtsi" > + > +&sound { > + compatible = "mediatek,mt8183_da7219_max98357"; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi > new file mode 100644 > index 000000000000..16ce5a3612ee > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219-rt1015p.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) da7219-rt1015p sound card. > + * > + * Copyright 2020 Google LLC. > + */ > + > +#include "mt8183-kukui-audio-da7219.dtsi" > +#include "mt8183-kukui-audio-rt1015p.dtsi" > + > +&sound { > + compatible = "mediatek,mt8183_da7219_rt1015p"; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi > new file mode 100644 > index 000000000000..2c69e7658dba > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-da7219.dtsi > @@ -0,0 +1,54 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) audio fragment for da7219. > + * > + * Copyright 2020 Google LLC. > + */ > + > +&i2c5 { > + da7219: da7219@1a { > + pinctrl-names = "default"; > + pinctrl-0 = <&da7219_pins>; > + compatible = "dlg,da7219"; > + reg = <0x1a>; > + interrupt-parent = <&pio>; > + interrupts = <165 IRQ_TYPE_LEVEL_LOW 165 0>; > + > + dlg,micbias-lvl = <2600>; > + dlg,mic-amp-in-sel = "diff"; > + VDD-supply = <&pp1800_alw>; > + VDDMIC-supply = <&pp3300_alw>; > + VDDIO-supply = <&pp1800_alw>; > + > + status = "okay"; > + > + da7219_aad { > + dlg,adc-1bit-rpt = <1>; > + dlg,btn-avg = <4>; > + dlg,btn-cfg = <50>; > + dlg,mic-det-thr = <500>; > + dlg,jack-ins-deb = <20>; > + dlg,jack-det-rate = "32ms_64ms"; > + dlg,jack-rem-deb = <1>; > + > + dlg,a-d-btn-thr = <0xa>; > + dlg,d-b-btn-thr = <0x16>; > + dlg,b-c-btn-thr = <0x21>; > + dlg,c-mic-btn-thr = <0x3E>; > + }; > + }; > +}; > + > +&pio { > + da7219_pins: da7219_pins { > + pins1 { > + pinmux = ; > + input-enable; > + bias-pull-up; > + }; > + }; > +}; > + > +&sound { > + mediatek,headset-codec = <&da7219>; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi > new file mode 100644 > index 000000000000..2b60967c0c1c > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-max98357a.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) audio fragment for max98357a. > + * > + * Copyright 2020 Google LLC. > + */ > + > +/ { > + max98357a: max98357a { > + compatible = "maxim,max98357a"; > + sdmode-gpios = <&pio 175 0>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi > new file mode 100644 > index 000000000000..658a764fe9ee > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-rt1015p.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) audio fragment for rt1015p. > + * > + * Copyright 2020 Google LLC. > + */ > + > +/ { > + rt1015p: rt1015p { > + compatible = "realtek,rt1015p"; > + sdb-gpios = <&pio 175 0>; > + }; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi > new file mode 100644 > index 000000000000..260a5f561495 > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-max98357a.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) ts3a227e-max98357a sound card. > + * > + * Copyright 2020 Google LLC. > + */ > + > +#include "mt8183-kukui-audio-max98357a.dtsi" > +#include "mt8183-kukui-audio-ts3a227e.dtsi" > + > +&sound { > + compatible = "mediatek,mt8183_mt6358_ts3a227_max98357"; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi > new file mode 100644 > index 000000000000..2f7d1fa1c90f > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e-rt1015p.dtsi > @@ -0,0 +1,13 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) mt6358-ts3a227-rt1015p sound card. > + * > + * Copyright 2021 Google LLC. > + */ > + > +#include "mt8183-kukui-audio-ts3a227e.dtsi" > +#include "mt8183-kukui-audio-rt1015p.dtsi" > + > +&sound { > + compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p"; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi > new file mode 100644 > index 000000000000..0799c48ade19 > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-audio-ts3a227e.dtsi > @@ -0,0 +1,32 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Google Kukui (and derivatives) audio fragment for ts3a227e. > + * > + * Copyright 2019 Google LLC. > + */ > + > +&i2c5 { > + ts3a227e: ts3a227e@3b { > + pinctrl-names = "default"; > + pinctrl-0 = <&ts3a227e_pins>; > + compatible = "ti,ts3a227e"; > + reg = <0x3b>; > + interrupt-parent = <&pio>; > + interrupts = <157 IRQ_TYPE_LEVEL_LOW>; > + status = "okay"; > + }; > +}; > + > +&pio { > + ts3a227e_pins: ts3a227e_pins { > + pins1 { > + pinmux = ; > + input-enable; > + bias-pull-up; > + }; > + }; > +}; > + > +&sound { > + mediatek,headset-codec = <&ts3a227e>; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts > index a8d6f32ade8d..1a2ec0787d3c 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > model = "Google burnet board"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts > index 42ba9c00866c..0eca3ff8672a 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi.dtsi" > +#include "mt8183-kukui-audio-da7219-max98357a.dtsi" > > / { > model = "Google damu board"; > 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 bbe6c338f465..577519a775c0 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi > @@ -5,6 +5,7 @@ > > /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-juniper-sku16.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dts > index 36d2c3b3cadf..bc2c57f0a827 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi-juniper.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > model = "Google juniper sku16 board"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts > index b3f46c16e5d7..e5bd9191e426 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > model = "Google kappa board"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts > index 6f1aa692753a..8fa89db03e63 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi-juniper.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > model = "Google kenzo sku17 board"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts > index 281265f082db..89208b843b27 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi-willow.dtsi" > +#include "mt8183-kukui-audio-da7219-max98357a.dtsi" > > / { > model = "Google willow board sku0"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts > index 22e56bdc1ee3..c7b20441d053 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-jacuzzi-willow.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > model = "Google willow board sku1"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts > index 20eb0dc68f09..89a139a0ee44 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kakadu.dts > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui-kakadu.dtsi" > +#include "mt8183-kukui-audio-da7219-rt1015p.dtsi" > > / { > model = "MediaTek kakadu board"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi > index 3aa79403c0c2..06f8c80bf553 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-kodama.dtsi > @@ -5,6 +5,7 @@ > > /dts-v1/; > #include "mt8183-kukui.dtsi" > +#include "mt8183-kukui-audio-ts3a227e-max98357a.dtsi" > > / { > ppvarn_lcd: ppvarn-lcd { > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi > index 30c183c96a54..a7b0cb3ff7b0 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-krane.dtsi > @@ -4,6 +4,7 @@ > */ > > #include "mt8183-kukui.dtsi" > +#include "mt8183-kukui-audio-max98357a.dtsi" > > / { > ppvarn_lcd: ppvarn-lcd { > @@ -345,3 +346,7 @@ rst_pin { > &qca_wifi { > qcom,ath10k-calibration-variant = "LE_Krane"; > }; > + > +&sound { > + compatible = "mediatek,mt8183_mt6358_ts3a227_max98357"; > +}; > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > index ae549d55a94f..b709859b0a03 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi > @@ -113,12 +113,18 @@ scp_mem_reserved: scp_mem_region { > }; > }; > > - max98357a: codec0 { > - compatible = "maxim,max98357a"; > - sdmode-gpios = <&pio 175 0>; > + sound: mt8183-sound { > + mediatek,platform = <&afe>; > + pinctrl-names = "default", > + "aud_tdm_out_on", > + "aud_tdm_out_off"; > + pinctrl-0 = <&aud_pins_default>; > + pinctrl-1 = <&aud_pins_tdm_out_on>; > + pinctrl-2 = <&aud_pins_tdm_out_off>; > + status = "okay"; > }; > > - btsco: codec1 { > + btsco: bt-sco { > compatible = "linux,bt-sco"; > }; > > @@ -213,6 +219,11 @@ tboard_thermistor2: thermal-sensor2 { > }; > }; > > +&afe { > + i2s3-share = "I2S2"; > + i2s0-share = "I2S5"; > +}; > + > &auxadc { > status = "okay"; > }; > @@ -400,6 +411,54 @@ &mt6358_vsim2_reg { > }; > > &pio { > + aud_pins_default: audiopins { > + pins_bus { > + pinmux = , > + , > + , > + , > + , /*i2s to da7219/max98357*/ > + , > + , > + , > + , /*i2s to wifi/bt*/ > + , > + , > + , > + , > + , > + , > + , > + ; /*mtkaif3.0*/ > + }; > + }; > + > + aud_pins_tdm_out_on: audiotdmouton { > + pins_bus { > + pinmux = , > + , > + , > + , > + , > + ; /*8ch-i2s to it6505*/ > + drive-strength = ; > + }; > + }; > + > + aud_pins_tdm_out_off: audiotdmoutoff { > + pins_bus { > + pinmux = , > + , > + , > + , > + , > + ; > + input-enable; > + bias-pull-down; > + drive-strength = ; > + }; > + }; > + > bt_pins: bt-pins { > pins_bt_en { > pinmux = ; >