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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29843C4332F for ; Mon, 7 Nov 2022 10:02:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231898AbiKGKCQ (ORCPT ); Mon, 7 Nov 2022 05:02:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231947AbiKGKCN (ORCPT ); Mon, 7 Nov 2022 05:02:13 -0500 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46813186EB for ; Mon, 7 Nov 2022 02:02:12 -0800 (PST) Received: by mail-ed1-x52e.google.com with SMTP id i21so16647113edj.10 for ; Mon, 07 Nov 2022 02:02:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=UiQSO7tk3ZBgaLRJVuX75TA/mL2Uw97YBIuCXfGO8DA=; b=VcUwTcK66r2spxjNhyn5wwm92gTtVclULlo55dRstmiurMuMFmhbzPJBZIPT3Wdyhx 23Xo8WfeM+5gP8s1swjJTiVahKh75D5Ts8y9gGRMEnBt4Xp7skeV5hOdXgfjD7va6LHR qGBG/5ifV+hd6ykGw7XBcGmzU7v/6vIM5kpxVZNkXXhkXCwcyUU54TEO1vzohPSZH39d nxLN0kBkBl09NCcm7I6VpWtp1MpCDn5R4qr3oe6RFdMeANIhwv98BVpJBkUe8g89w9N9 yluieuEJuPJMvYJLn2eHwFcMx0P7/bbr6M/hJ7U69rD1qqQZAeGWMInPiuiDDNRoLXRi dQRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=UiQSO7tk3ZBgaLRJVuX75TA/mL2Uw97YBIuCXfGO8DA=; b=jQwKUS983WEF6G1cW7IJysu7C9VhJKrk1KULM1Yaykk8Whpe4HRWjPp41zl60An3rp WckWwbQG94Efd2s8HMX9/m3An5bAD9i5h996cCfcmduzA4sxpAVwrtvQPXx9IkgqFZcF FrATt8InPq8JLV/xndtbG/AGorPC+ulmfTHL0QM7oggP02c70QsZbf4D4rKk3JiWOufG 936Jm8tey+m7gAEJxkQYY8r+8y+g89ucsQbolfTyPFhl7ROVW2ORDBUAgbVY6GhdwriV kZrzLjrMSh1P60ZErn9X0mzPFSVpnVyZHeThX3W0uVijmKUPw2SDAg+LvrYkXktvOYsZ pVhg== X-Gm-Message-State: ACrzQf1YIG203PKn+JxbEC9LgolAHRbMxRfe2z0VWyHWKCW+dkSYEJZB rUmBdT0ii8/TMUeM+DhqDynunw== X-Google-Smtp-Source: AMsMyM6wpWtV22G+DhkYuxU31+baAQbOEhO3uzD1W7kgDJk71hdXjdIi4EXU1tMLj2mAsuZtlHHjBQ== X-Received: by 2002:a05:6402:1348:b0:461:c056:bf65 with SMTP id y8-20020a056402134800b00461c056bf65mr49991852edw.414.1667815330822; Mon, 07 Nov 2022 02:02:10 -0800 (PST) Received: from [192.168.31.208] ([194.29.137.22]) by smtp.gmail.com with ESMTPSA id g22-20020a50ee16000000b004616b006871sm3921111eds.82.2022.11.07.02.02.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Nov 2022 02:02:10 -0800 (PST) Message-ID: <95df3efb-fb96-e11e-5cd6-10f674385367@linaro.org> Date: Mon, 7 Nov 2022 11:02:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [PATCH v11 4/5] arm64: dts: qcom: sc7280: add sc7280-herobrine-audio-rt5682-3mic3.dtsi for evoker To: Sheng-Liang Pan , LKML Cc: dianders@chromium.org, Andy Gross , Bjorn Andersson , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org References: <20221107094345.2838931-1-sheng-liang.pan@quanta.corp-partner.google.com> <20221107173954.v11.4.I9718ac3622fa550e432209ae5c95c87b873a0f87@changeid> From: Konrad Dybcio In-Reply-To: <20221107173954.v11.4.I9718ac3622fa550e432209ae5c95c87b873a0f87@changeid> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 07/11/2022 10:43, Sheng-Liang Pan wrote: > add specific 3mic setting as sc7280-herobrine-audio-rt5682-3mic.dtsi, > so we can include sc7280-herobrine-audio-rt5682-3mic.dtsi for evoker > as it uses rt5682 with 3 mics. > > Signed-off-by: Sheng-Liang Pan > --- Reviewed-by: Konrad Dybcio Konrad > > Changes in v11: > - sort out the "Status" property with sc7280-herobrine-audio-rt5682-3mic.dtsi > > Changes in v10: > - add evoker include specific sc7280-herobrine-audio-rt5682-3mic.dtsi setting > > .../sc7280-herobrine-audio-rt5682-3mic.dtsi | 195 ++++++++++++++++++ > .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 1 + > 2 files changed, 196 insertions(+) > create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi > new file mode 100644 > index 0000000000000..cf34334451d6b > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi > @@ -0,0 +1,195 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * > + * This file defines the common audio settings for the child boards > + * using rt5682 codec and having 3 dmics connected to sc7280. > + * > + * Copyright 2022 Google LLC. > + */ > + > +/ { > + /* BOARD-SPECIFIC TOP LEVEL NODES */ > + sound: sound { > + compatible = "google,sc7280-herobrine"; > + model = "sc7280-rt5682-max98360a-3mic"; > + > + audio-routing = "VA DMIC0", "vdd-micb", > + "VA DMIC1", "vdd-micb", > + "VA DMIC2", "vdd-micb", > + "VA DMIC3", "vdd-micb", > + > + "Headphone Jack", "HPOL", > + "Headphone Jack", "HPOR"; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + dai-link@0 { > + link-name = "MAX98360"; > + reg = <0>; > + > + cpu { > + sound-dai = <&lpass_cpu MI2S_SECONDARY>; > + }; > + > + codec { > + sound-dai = <&max98360a>; > + }; > + }; > + > + dai-link@1 { > + link-name = "DisplayPort"; > + reg = <1>; > + > + cpu { > + sound-dai = <&lpass_cpu LPASS_DP_RX>; > + }; > + > + codec { > + sound-dai = <&mdss_dp>; > + }; > + }; > + > + dai-link@2 { > + link-name = "ALC5682"; > + reg = <2>; > + > + cpu { > + sound-dai = <&lpass_cpu MI2S_PRIMARY>; > + }; > + > + codec { > + sound-dai = <&alc5682 0 /* aif1 */>; > + }; > + }; > + > + dai-link@4 { > + link-name = "DMIC"; > + reg = <4>; > + > + cpu { > + sound-dai = <&lpass_cpu LPASS_CDC_DMA_VA_TX0>; > + }; > + > + codec { > + sound-dai = <&lpass_va_macro 0>; > + }; > + }; > + }; > +}; > + > +hp_i2c: &i2c2 { > + clock-frequency = <400000>; > + status = "okay"; > + > + alc5682: codec@1a { > + compatible = "realtek,rt5682s"; > + reg = <0x1a>; > + pinctrl-names = "default"; > + pinctrl-0 = <&hp_irq>; > + > + #sound-dai-cells = <1>; > + > + interrupt-parent = <&tlmm>; > + interrupts = <101 IRQ_TYPE_EDGE_BOTH>; > + > + AVDD-supply = <&pp1800_alc5682>; > + MICVDD-supply = <&pp3300_codec>; > + > + realtek,dmic1-data-pin = <1>; > + realtek,dmic1-clk-pin = <2>; > + realtek,jd-src = <1>; > + realtek,dmic-clk-rate-hz = <2048000>; > + }; > +}; > + > +&lpass_cpu { > + pinctrl-names = "default"; > + pinctrl-0 = <&mi2s0_data0>, <&mi2s0_data1>, <&mi2s0_mclk>, <&mi2s0_sclk>, <&mi2s0_ws>, > + <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + > + status = "okay"; > + > + dai-link@0 { > + reg = ; > + qcom,playback-sd-lines = <1>; > + qcom,capture-sd-lines = <0>; > + }; > + > + dai-link@1 { > + reg = ; > + qcom,playback-sd-lines = <0>; > + }; > + > + dai-link@5 { > + reg = ; > + }; > + > + dai-link@25 { > + reg = ; > + }; > +}; > + > +&lpass_va_macro { > + vdd-micb-supply = <&pp1800_l2c>; > + pinctrl-0 = <&lpass_dmic01_clk>, <&lpass_dmic01_data>, <&lpass_dmic23_clk>, > + <&lpass_dmic23_data>; > + > + status = "okay"; > +}; > + > +/* PINCTRL - ADDITIONS TO NODES IN PARENT DEVICE TREE FILES */ > + > +&lpass_dmic01_clk { > + drive-strength = <8>; > + bias-disable; > +}; > + > +&lpass_dmic01_clk_sleep { > + drive-strength = <2>; > +}; > + > +&lpass_dmic01_data { > + bias-pull-down; > +}; > + > +&lpass_dmic23_clk { > + drive-strength = <8>; > + bias-disable; > +}; > + > +&lpass_dmic23_clk_sleep { > + drive-strength = <2>; > +}; > + > +&lpass_dmic23_data { > + bias-pull-down; > +}; > + > +&mi2s0_data0 { > + drive-strength = <6>; > + bias-disable; > +}; > + > +&mi2s0_data1 { > + drive-strength = <6>; > + bias-disable; > +}; > + > +&mi2s0_mclk { > + drive-strength = <6>; > + bias-disable; > +}; > + > +&mi2s0_sclk { > + drive-strength = <6>; > + bias-disable; > +}; > + > +&mi2s0_ws { > + drive-strength = <6>; > + bias-disable; > +}; > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > index dcdd4eecfe670..51f0401b11ed7 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts > @@ -8,6 +8,7 @@ > /dts-v1/; > > #include "sc7280-herobrine-evoker.dtsi" > +#include "sc7280-herobrine-audio-rt5682-3mic.dtsi" > > / { > model = "Google Evoker";