From patchwork Fri Sep 30 15:26:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 611575 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 60C4FC433FE for ; Fri, 30 Sep 2022 15:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229646AbiI3P1e (ORCPT ); Fri, 30 Sep 2022 11:27:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231639AbiI3P1Z (ORCPT ); Fri, 30 Sep 2022 11:27:25 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 982E6178A21 for ; Fri, 30 Sep 2022 08:27:24 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id x1-20020a17090ab00100b001fda21bbc90so9404041pjq.3 for ; Fri, 30 Sep 2022 08:27:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=JHh+MG4OU/+wjbCiWOKQq0gX7ZmA4UN476SmJdYV9kg=; b=YMAk24HUwNDxL3bDEN2dhyiKOJkUb+QU/ozy8e8WuG8m7jPZmIDYzmZoXIpD3/Uo4W pU2fqD7yefm417C9jv6Hk4Jr5v02ZEfL0kQ2FGgsF9RUJO83N1YYTW+EvLbYPF39Eg1s Enkg+F4vL4NQDfD3blZle+Pp4azJL79HTDgvA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=JHh+MG4OU/+wjbCiWOKQq0gX7ZmA4UN476SmJdYV9kg=; b=lJhvfQsAr4PZOeC5Am3BPqXvJqqqcv6hBkxEKsw5fTB2h8PGQDSwE6RQKtmoZhUrF3 VYMcdKzR6G+hMXFmzfM+IaB41JzO648KRp1BXnOCqI+Edy8Nupd9NrA/RMkiPA2bdg4P mEnL34RLg1WxziYGiEUV2HksKRJYeiJJO1DJav1TQ2GT3s7lAyM8sCVMHoegaqUNU/i6 vLjConoA0gfGQF+FyC+rj92xscDGNQyT9gBE3M5PWjjIObbDM/kGyF7Z7d/z9mue587N 6zN7UKsTpCzsBAqGneXeJ6SdgLeZe9zhDr20eTY2b2okJDGFBn8e+5GYI4uA387xGuby Cm6Q== X-Gm-Message-State: ACrzQf1rP0pI6VjuKgRQC2VoG6o0+W3RAoUFnJe8rbAnW7URn3jJfKlX AvdhrZDlyaZwfGIKN2+Yv3nyhQ== X-Google-Smtp-Source: AMsMyM7OIId8/h7z8OZQSkUBPgMd27urLwUNGJTOim1jBxhYL6adp0bUtqhq+TeRjDMUSxukM41YSA== X-Received: by 2002:a17:902:d3c6:b0:178:37e0:2e72 with SMTP id w6-20020a170902d3c600b0017837e02e72mr9452877plb.28.1664551644141; Fri, 30 Sep 2022 08:27:24 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id o9-20020a170902d4c900b0016dbdf7b97bsm2006133plg.266.2022.09.30.08.27.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:27:23 -0700 (PDT) From: Judy Hsiao To: bjorn.andersson@linaro.org Cc: Andy Gross , Rob Herring , Srini Kandagatla , dianders@chromium.org, mka@chromium.org, cychiang@google.com, judyhsiao@google.com, swboyd@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v5 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Date: Fri, 30 Sep 2022 15:26:12 +0000 Message-Id: <20220930152613.2018360-3-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20220930152613.2018360-1-judyhsiao@chromium.org> References: <20220930152613.2018360-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- .../qcom/sc7280-herobrine-audio-rt5682.dtsi | 122 ++++++++++++++++++ 1 file changed, 122 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..2dbdeeb29ece --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi @@ -0,0 +1,122 @@ +// 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>; + bias-disable; +}; From patchwork Fri Sep 30 15:36:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 611573 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 754FFC433F5 for ; Fri, 30 Sep 2022 15:37:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231635AbiI3PhW (ORCPT ); Fri, 30 Sep 2022 11:37:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231648AbiI3PhP (ORCPT ); Fri, 30 Sep 2022 11:37:15 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E8631A10A9 for ; Fri, 30 Sep 2022 08:37:12 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id c7so4471999pgt.11 for ; Fri, 30 Sep 2022 08:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=LPYKbguZc/KYKDAy5XVdCd4nJdkVt/SEkrsrImBpX8M=; b=Zd63G6ZoUfHEDbwl6sw1tUXxxGRU0nsMethkFkh2p6u11xvZK5YcA30HkTDpWSdI1j AzlRC8NZcnJzHUtN99ukkaiwGXLlbc8TJRM+cHxlAa6pqU+sPGwNWI4jO58hmUXdLrVI 1C2vzo6IJReqnM8mMd+EBoGgesWJ9toi5HNhM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=LPYKbguZc/KYKDAy5XVdCd4nJdkVt/SEkrsrImBpX8M=; b=gKPnEhDsfMP5d0bCIwHf/rFS5ve9hKlGTii2g+oIY32wN7U1zAhRVEXiJ7WA3BdF+p eyYG5/iwBP/IDwn01npj/AZW0dldreLI7xiGyUczIAlPEAVfUNWt2rzk8Ggk47l9I/Z3 otbn8tLSBQU9Ckm30sgIzh3fl9CmrjKjG78SWwF/UI0R0/dX/BTfhuG3S6ggZqVwzBGK KM093lgtrAooK4oapTP3amJgQtzO2hwz610jYfMnwsDNRTdUeS5UudBzma+hTxBEWVda Td+mT7+sxpUS90NYdo5AAaaKPT45qOseg+qOURZIn+o9BYDIikTDBxWkRiYYBynCyN6G qdPw== X-Gm-Message-State: ACrzQf0A048eNqws+m0e59mv735O+giiAR9TebpXcrUXOwnws2BPHe9X sZkbHuXktB196Tl27oUepEnTrA== X-Google-Smtp-Source: AMsMyM6xqal4/XOJLMBHQ9YrEG3UfneC0sz6YuMsdGK7ZXSUAgOfMfhQ9Ij8VoFNM1z75MU8PkTV+Q== X-Received: by 2002:a63:5a63:0:b0:42f:e143:80d4 with SMTP id k35-20020a635a63000000b0042fe14380d4mr8215769pgm.456.1664552231662; Fri, 30 Sep 2022 08:37:11 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (21.160.199.104.bc.googleusercontent.com. [104.199.160.21]) by smtp.gmail.com with ESMTPSA id s13-20020a170902ea0d00b0016d72804664sm2025155plg.205.2022.09.30.08.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:37:11 -0700 (PDT) From: Judy Hsiao To: andersson@kernel.org Cc: Andy Gross , Rob Herring , Srini Kandagatla , dianders@chromium.org, mka@chromium.org, cychiang@google.com, judyhsiao@google.com, swboyd@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Judy Hsiao Subject: [PATCH v5 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 and villager-r0 Date: Fri, 30 Sep 2022 15:36:43 +0000 Message-Id: <20220930153643.2018907-4-judyhsiao@chromium.org> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog In-Reply-To: <20220930153643.2018907-1-judyhsiao@chromium.org> References: <20220930153643.2018907-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 and villager-r0 as they use rt5682 codec. Signed-off-by: Judy Hsiao Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 1 + arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts index c1a671968725..c569d7a5edb7 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -9,6 +9,7 @@ #include "sc7280-herobrine.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" / { model = "Google Herobrine (rev1+)"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts index 73e24cc55a09..31a57ae5af57 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts @@ -9,6 +9,7 @@ #include "sc7280-herobrine-villager.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" / { model = "Google Villager (rev0)";