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 3F8BFC433EF for ; Fri, 20 May 2022 20:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236234AbiETUzZ (ORCPT ); Fri, 20 May 2022 16:55:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231705AbiETUzY (ORCPT ); Fri, 20 May 2022 16:55:24 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91595193217 for ; Fri, 20 May 2022 13:55:21 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id f4so16243158lfu.12 for ; Fri, 20 May 2022 13:55:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=waJb9YRlR/dVVHiz9FXpjWhUHca9QxD4Ut989/pMyqc=; b=Z5NWGsXuwDWGDkysB5pxuzCkviPdIlqUWpd8FicJ9ML8hvWY5AI1rXenD1t5ctMa43 OjMhGDwsk/f/EkI0kopeEttr37fwC8cpOCRcIstmjW31St81Ccjy0J5VXYurN17MAm/2 u0movrLLB0W4IIVrM69FBgpT1qPElBKoePMq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=waJb9YRlR/dVVHiz9FXpjWhUHca9QxD4Ut989/pMyqc=; b=IBQX3fndrrdkm5WOY0YLT1s6emDDSC2Ip31pcRveEjHqVtf0FIHcYzTXxOoWZ51k71 s87dQBVFKu9Vv1O/S8LqAaZBp0InGMK6DkiyKkZQDfwX80gRkI8Twlf6ERQYYFeZn810 34deIDXteEChUuI6/l3Aa04lNzBPsZuN02N75wX/UkErkivwukkStUBr1pBlzeGpzjbz HAEiriVzfZGKQqHGH0KsZ4lbN/L9TSWzRZt4urFHdZxMC0bRa9SBHGHH8ZG5Sub1Mr94 IYp8/d8dq0rIV4c3vtX19+LyKUyc9i7NxBspB9goablA817/qaJ/7pCdxA7HCaKDO5S/ zxRg== X-Gm-Message-State: AOAM5325leJGHTpGWW4EL/wPRaqekyW03kvVZI7TzDtFsaFegSNVLgzj 9WA+5kEN0v37s34ZT8J98yYTh1yPF4E1QES5QHE= X-Google-Smtp-Source: ABdhPJygs6UcSFzRi1txreGVI0DGX3711OxQ2c3YxqOBmO4yY7gcGqBKUSWFP/b7aIdURzrNoJQ4lw== X-Received: by 2002:a05:6512:33d5:b0:476:7896:7e7f with SMTP id d21-20020a05651233d500b0047678967e7fmr8333087lfg.145.1653080119672; Fri, 20 May 2022 13:55:19 -0700 (PDT) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com. [209.85.167.44]) by smtp.gmail.com with ESMTPSA id w10-20020a05651204ca00b0047255d210d8sm790774lfq.7.2022.05.20.13.55.18 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 May 2022 13:55:19 -0700 (PDT) Received: by mail-lf1-f44.google.com with SMTP id bu29so16377915lfb.0 for ; Fri, 20 May 2022 13:55:18 -0700 (PDT) X-Received: by 2002:a05:6000:2c1:b0:20c:5e37:3ed1 with SMTP id o1-20020a05600002c100b0020c5e373ed1mr9695141wry.342.1653079801669; Fri, 20 May 2022 13:50:01 -0700 (PDT) MIME-Version: 1.0 References: <20220520161004.1141554-1-judyhsiao@chromium.org> <20220520161004.1141554-3-judyhsiao@chromium.org> In-Reply-To: <20220520161004.1141554-3-judyhsiao@chromium.org> From: Doug Anderson Date: Fri, 20 May 2022 13:49:49 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [v2 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi To: Judy Hsiao Cc: Andy Gross , Bjorn Andersson , Rob Herring , Srini Kandagatla , Matthias Kaehlcke , Jimmy Cheng-Yi Chiang , Judy Hsiao , Tzung-Bi Shih , Stephen Boyd , Linux ARM , linux-arm-msm , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi, On Fri, May 20, 2022 at 9:10 AM Judy Hsiao wrote: > > Audio dtsi for sc7280 boards that using rt5682 headset codec: > 1. Add dt nodes for sound card which use I2S playback and record > through rt5682s and I2S playback through max98357a. > 2. Enable lpass cpu node and add pin control and dai-links. > > Signed-off-by: Judy Hsiao > --- > .../qcom/sc7280-herobrine-audio-rt5682.dtsi | 120 ++++++++++++++++++ > 1 file changed, 120 insertions(+) > create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > new file mode 100644 > index 000000000000..d83e99f1d417 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > @@ -0,0 +1,120 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * > + * This file defines the common audio settings for the child boards using rt5682 codec. > + * > + * Copyright 2022 Google LLC. > + */ > + > +/ { > + /* BOARD-SPECIFIC TOP LEVEL NODES */ > + sound: sound { > + compatible = "google,sc7280-herobrine"; > + model = "sc7280-rt5682-max98360a-1mic"; > + > + status = "okay"; > + audio-routing = > + "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 = "ALC5682"; > + reg = <1>; > + > + cpu { > + sound-dai = <&lpass_cpu MI2S_PRIMARY>; > + }; > + > + codec { > + sound-dai = <&alc5682 0 /* aif1 */>; > + }; > + }; > + }; > +}; > + > +hp_i2c: &i2c2 { > + status = "okay"; > + clock-frequency = <400000>; > + > + 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 { > + status = "okay"; > + > + 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>; > + > + dai-link@0 { > + reg = ; > + qcom,playback-sd-lines = <1>; > + qcom,capture-sd-lines = <0>; > + }; > + > + dai-link@1 { > + reg = ; > + qcom,playback-sd-lines = <0>; > + }; > +}; > + > +&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>; Just like for patch #1, I think you want "bias-disable" here, too. -Doug 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C2D7C433EF for ; Fri, 20 May 2022 20:51:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GZvG/sYAar9ZDLvkEC8le3sfajiCKpCu0h8OEJQQaiU=; b=gccBZgpY5xofcO dtpnBssirRgZA+9VSPBAhR4yPKlgE0tE8tRKfEZK4QRqXwtlgudC1nFB+kaODhmaXSPyoo1HIBy5b LRwntxI6NGv7nVtRvpJJQHuM9cMjR//Su3i55izxb5lhw5oxuzEzrgdZ1NKLPnpclv1CtJL3Z8zGQ iJ5R3C+Frai1q4bXvfAjMDPD0EWmeU6uzwHsBdtnWAtXYmDvvndFtqzsHA/Fg2Mgq11HmLl2qfNgN ATF3bEanwAGVXN5++23ekV/CKQUZR2qo/AVJWFsII/hUtepZNuC39PkDnvWCKDAgh45czUIaPo/oJ w4+rhI6rQ4/cthSJSADw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns9Zb-00EUwk-4h; Fri, 20 May 2022 20:50:11 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ns9ZY-00EUvL-65 for linux-arm-kernel@lists.infradead.org; Fri, 20 May 2022 20:50:09 +0000 Received: by mail-ej1-x636.google.com with SMTP id ck4so13405496ejb.8 for ; Fri, 20 May 2022 13:50:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=waJb9YRlR/dVVHiz9FXpjWhUHca9QxD4Ut989/pMyqc=; b=Z5NWGsXuwDWGDkysB5pxuzCkviPdIlqUWpd8FicJ9ML8hvWY5AI1rXenD1t5ctMa43 OjMhGDwsk/f/EkI0kopeEttr37fwC8cpOCRcIstmjW31St81Ccjy0J5VXYurN17MAm/2 u0movrLLB0W4IIVrM69FBgpT1qPElBKoePMq8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=waJb9YRlR/dVVHiz9FXpjWhUHca9QxD4Ut989/pMyqc=; b=yF+nGFHQC7F9ydfgV2qB1EL0v9cppWQC9QCl/w1ySfLBQ9ELRyvw/e47dMsJE1Yk+a ScS9YUEtVDrHClLi3yZc+0VCClkosHWOFtLFnPIK7PoK1QFxZJ+PTvHOizQfk/Hdbul3 qDdhOdg9IuUdfv+G9fcK4r8iYZAJw2JqR33CQgFqaV6rzHwO9zR8taV3rTxzM6wfJjAq d3esSXZkxt3M9Dchker6YDiPRkfEMzEvzk/AxUFa5cWftc9+3K5RUlPNU3DDirSf0R5b q7Rf11mT+vEUJEaPz1aMuYq9gJ24p+/wTaz3J7ufrqPSJ9CFfCXYjqDCM1GZYxKpEko7 vIIg== X-Gm-Message-State: AOAM533pJS/7+441+2Wvp7N/EwGVt2beyaj5/fpVEUaPpb3ghelgC3G+ g+Wc8SZ6Mp2X0nMn99dNUi96impEUVpC22cdEUA= X-Google-Smtp-Source: ABdhPJxWJH59MCe4EpFbis3fOgU/alCRJ4tJ4NRk1eAvAeH0dx+BH7WKpMIfDFXCe8GqEQ3z/lJCWw== X-Received: by 2002:a17:907:7baa:b0:6fe:b3dc:2378 with SMTP id ne42-20020a1709077baa00b006feb3dc2378mr3359152ejc.266.1653079804852; Fri, 20 May 2022 13:50:04 -0700 (PDT) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com. [209.85.221.52]) by smtp.gmail.com with ESMTPSA id vf3-20020a170907238300b006f3ef214ddasm3427646ejb.64.2022.05.20.13.50.02 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 May 2022 13:50:03 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id u3so12990772wrg.3 for ; Fri, 20 May 2022 13:50:02 -0700 (PDT) X-Received: by 2002:a05:6000:2c1:b0:20c:5e37:3ed1 with SMTP id o1-20020a05600002c100b0020c5e373ed1mr9695141wry.342.1653079801669; Fri, 20 May 2022 13:50:01 -0700 (PDT) MIME-Version: 1.0 References: <20220520161004.1141554-1-judyhsiao@chromium.org> <20220520161004.1141554-3-judyhsiao@chromium.org> In-Reply-To: <20220520161004.1141554-3-judyhsiao@chromium.org> From: Doug Anderson Date: Fri, 20 May 2022 13:49:49 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [v2 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi To: Judy Hsiao Cc: Andy Gross , Bjorn Andersson , Rob Herring , Srini Kandagatla , Matthias Kaehlcke , Jimmy Cheng-Yi Chiang , Judy Hsiao , Tzung-Bi Shih , Stephen Boyd , Linux ARM , linux-arm-msm , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , LKML X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220520_135008_285407_0ED42841 X-CRM114-Status: GOOD ( 18.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Fri, May 20, 2022 at 9:10 AM Judy Hsiao wrote: > > Audio dtsi for sc7280 boards that using rt5682 headset codec: > 1. Add dt nodes for sound card which use I2S playback and record > through rt5682s and I2S playback through max98357a. > 2. Enable lpass cpu node and add pin control and dai-links. > > Signed-off-by: Judy Hsiao > --- > .../qcom/sc7280-herobrine-audio-rt5682.dtsi | 120 ++++++++++++++++++ > 1 file changed, 120 insertions(+) > create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > new file mode 100644 > index 000000000000..d83e99f1d417 > --- /dev/null > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi > @@ -0,0 +1,120 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +/* > + * > + * This file defines the common audio settings for the child boards using rt5682 codec. > + * > + * Copyright 2022 Google LLC. > + */ > + > +/ { > + /* BOARD-SPECIFIC TOP LEVEL NODES */ > + sound: sound { > + compatible = "google,sc7280-herobrine"; > + model = "sc7280-rt5682-max98360a-1mic"; > + > + status = "okay"; > + audio-routing = > + "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 = "ALC5682"; > + reg = <1>; > + > + cpu { > + sound-dai = <&lpass_cpu MI2S_PRIMARY>; > + }; > + > + codec { > + sound-dai = <&alc5682 0 /* aif1 */>; > + }; > + }; > + }; > +}; > + > +hp_i2c: &i2c2 { > + status = "okay"; > + clock-frequency = <400000>; > + > + 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 { > + status = "okay"; > + > + 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>; > + > + dai-link@0 { > + reg = ; > + qcom,playback-sd-lines = <1>; > + qcom,capture-sd-lines = <0>; > + }; > + > + dai-link@1 { > + reg = ; > + qcom,playback-sd-lines = <0>; > + }; > +}; > + > +&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>; Just like for patch #1, I think you want "bias-disable" here, too. -Doug _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel