From nobody Sun May 5 18:33:01 2024 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 23540C433FE for ; Fri, 30 Sep 2022 15:37:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231495AbiI3PhA (ORCPT ); Fri, 30 Sep 2022 11:37:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231465AbiI3Pg5 (ORCPT ); Fri, 30 Sep 2022 11:36:57 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAC0F1A0D20 for ; Fri, 30 Sep 2022 08:36:56 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id 129so4488295pgc.5 for ; Fri, 30 Sep 2022 08:36:56 -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=ZxqNeg9qYIg+s4/UlajiiC5HVdIkGrA2Kg81oKMQ+/o=; b=ksNJeksNLwIY/rpd0fWUf+Te+/bxcrN2bGCTzVlMyb9TRGW7RUmlnW1iEfp/ckw4+8 QvHwtMC8jkc3hPnu2xaan5dRgwCXJ+tk4Ea75d+59X7D1J1SSPh0WeZCP3OJkcPoFmSW gX/Srdo/WYMBb7jFFe0ZJI+sTRQU390yexSqw= 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=ZxqNeg9qYIg+s4/UlajiiC5HVdIkGrA2Kg81oKMQ+/o=; b=qxVH9e/11pkv+qmO9c7opXVbg9/Ro7LOEnabef+xQ5ZITsRiZjDqY1N+uCzuCW7Uy0 lad3CQ3SejYftFDqmOtA0ygK9ao/0E2sMw8HIJXk5G0aUbzSWfVcA5IXOrzJXslUmR5y ekXuTDoBqqwXgNXW0/jP1l7rhmTnBM2A1Vo8PJKvz33xkxI/12B9fyqtSijpAtSX2Ibv BonC+L0nNdlm+UbTRaXMg4PB8g8smvgLZ05ptGm9qQMWxSUCUyjwzezCDKbzWR7aHhOy DhGN6bnvnmVUOXRL+StAajsJInfW+WxY7L0gi3i3Jb7fmDlfCTHWWgQbmNtrtyyeG0Y8 FIzA== X-Gm-Message-State: ACrzQf3tPTKv2p+df5Ztb8BcdAR41XvhAeygXR6HCo6BVqYlQCMCGI49 34co2toUuI/37Jk5VGnlTF9Bbw== X-Google-Smtp-Source: AMsMyM5eTepICctmAmSn5g9cc4mggiq9B3ai+b4KcYpc4PM9p2a6gM05xb08V4IprjyxdJqwyiyhJw== X-Received: by 2002:a63:24d:0:b0:439:3804:d0ff with SMTP id 74-20020a63024d000000b004393804d0ffmr8091351pgc.414.1664552216064; Fri, 30 Sep 2022 08:36:56 -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.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:36:55 -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 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Date: Fri, 30 Sep 2022 15:36:41 +0000 Message-Id: <20220930153643.2018907-2-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 1. Add drive strength property for mi2s1 on sc7280 based platforms. 2. Disable the pull-up for mi2s1 lines. Signed-off-by: Judy Hsiao Reviewed-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- .../arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/bo= ot/dts/qcom/sc7280-herobrine.dtsi index c11e37160f34..83a42a77121c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -639,6 +639,36 @@ &dp_hot_plug_det { bias-disable; }; =20 +&mi2s1_data0 { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s1_data0 { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength =3D <6>; + bias-disable; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength =3D <2>; --=20 2.37.3.998.g577e59143f-goog From nobody Sun May 5 18:33:01 2024 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 971D2C433FE for ; Fri, 30 Sep 2022 15:37:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231649AbiI3PhP (ORCPT ); Fri, 30 Sep 2022 11:37:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231626AbiI3PhJ (ORCPT ); Fri, 30 Sep 2022 11:37:09 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 245F41A0D39 for ; Fri, 30 Sep 2022 08:37:06 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id v186so4559371pfv.11 for ; Fri, 30 Sep 2022 08:37:06 -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=AqEWNyRRJ8zAZyVB4WTwuL54Ue4AJ6qC7q3VmMAchIzDuHLFWsLbGkSZHdWg3rDd93 l6as77BhPDwxCUV4z7DCjpos+l9s3SCKsh6Jve6sxkPFeCUMI10xExTk7+osJ6JowVot 6p1LeHdvXv86KbXHkTgMmA4OHbi0hE5jlF1F8= 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=wmcVx/kfqjYTx2epLNKOudFfhVHA4w8pzJO42bHokHZtR7q4uHuC+KEOoxwycSbeQo WEdK9C0wv7i6EmpEtgFks1afO40TFhSrBfOqjfCI4G09189li7oWey2zdZNvlceRH6iJ KMitBxy7BbEDTA/muEUamnAW7AVlBH0tEaffC19u5ocAFeVyC1MjZbBSR4HYwh6MiqUQ y6n4ap079z/vDZcRiXAtqQZYUnAs4Pje+CJ5Sh3HqLdwVWnzgoolhcb0P7PbX7b+lV2u L2VfSwhC0YbpHL1bN61yEt5gIOgFNLVhRKXHe4Yx94mILH+krGz1xNlAn2AG9SDuFY1v TzVQ== X-Gm-Message-State: ACrzQf3EWOM5M04XufqnSQBXq6WQNDhpt4Ru1CXsI3qQxGz6YUkhRHAn DN/s8tVOkFQ2NwlBfsomI/5tzQ== X-Google-Smtp-Source: AMsMyM7yty99NK9WhS4hbzjggq6Oxx/bwl4htrPKe8na+7T785E7yRYHOofm3EoBOZkSg+ZQ4IEuMA== X-Received: by 2002:a63:ed07:0:b0:442:87:3a38 with SMTP id d7-20020a63ed07000000b0044200873a38mr2980570pgi.216.1664552225256; Fri, 30 Sep 2022 08:37:05 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:37:04 -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 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Date: Fri, 30 Sep 2022 15:36:42 +0000 Message-Id: <20220930153643.2018907-3-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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 =3D "google,sc7280-herobrine"; + model =3D "sc7280-rt5682-max98360a-1mic"; + + status =3D "okay"; + audio-routing =3D + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + dai-link@0 { + link-name =3D "MAX98360"; + reg =3D <0>; + + cpu { + sound-dai =3D <&lpass_cpu MI2S_SECONDARY>; + }; + + codec { + sound-dai =3D <&max98360a>; + }; + }; + + dai-link@1 { + link-name =3D "ALC5682"; + reg =3D <1>; + + cpu { + sound-dai =3D <&lpass_cpu MI2S_PRIMARY>; + }; + + codec { + sound-dai =3D <&alc5682 0 /* aif1 */>; + }; + }; + }; +}; + +hp_i2c: &i2c2 { + status =3D "okay"; + clock-frequency =3D <400000>; + + alc5682: codec@1a { + compatible =3D "realtek,rt5682s"; + reg =3D <0x1a>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&hp_irq>; + + #sound-dai-cells =3D <1>; + + interrupt-parent =3D <&tlmm>; + interrupts =3D <101 IRQ_TYPE_EDGE_BOTH>; + + AVDD-supply =3D <&pp1800_alc5682>; + MICVDD-supply =3D <&pp3300_codec>; + + realtek,dmic1-data-pin =3D <1>; + realtek,dmic1-clk-pin =3D <2>; + realtek,jd-src =3D <1>; + realtek,dmic-clk-rate-hz =3D <2048000>; + }; +}; + +&lpass_cpu { + status =3D "okay"; + + pinctrl-names =3D "default"; + pinctrl-0 =3D <&mi2s0_data0>, <&mi2s0_data1>, <&mi2s0_mclk>, <&mi2s0_sclk= >, <&mi2s0_ws>, + <&mi2s1_data0>, <&mi2s1_sclk>, <&mi2s1_ws>; + + #address-cells =3D <1>; + #size-cells =3D <0>; + + dai-link@0 { + reg =3D ; + qcom,playback-sd-lines =3D <1>; + qcom,capture-sd-lines =3D <0>; + }; + + dai-link@1 { + reg =3D ; + qcom,playback-sd-lines =3D <0>; + }; +}; + +&mi2s0_data0 { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s0_data1 { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s0_mclk { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s0_sclk { + drive-strength =3D <6>; + bias-disable; +}; + +&mi2s0_ws { + drive-strength =3D <6>; + bias-disable; +}; --=20 2.37.3.998.g577e59143f-goog From nobody Sun May 5 18:33:01 2024 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 8F2B3C4332F for ; Fri, 30 Sep 2022 15:37:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231300AbiI3PhX (ORCPT ); Fri, 30 Sep 2022 11:37:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231622AbiI3PhP (ORCPT ); Fri, 30 Sep 2022 11:37:15 -0400 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E9931A1082 for ; Fri, 30 Sep 2022 08:37:12 -0700 (PDT) Received: by mail-pf1-x434.google.com with SMTP id b75so4558116pfb.7 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=nb/LeGRhKDrq6ZhIiuM8n1LNzCsqFJbxeML6pGCVKYIEnZiSd8jKJ0/DUzEOL0Vdea BMNEBL/w8IayOS6/EbX6wb+RSvqsXPkWVofDP4mnw0QQJniUvtx3PYxX5OJMGZ6ROzsV +Pm9DXjmLc/8BjVywT2iJ8z6pRBndgCgpE0da3v4xodAo7x9yOtivGIEqIYCrUpt0RKx 2qOIuxxEP43JiEEYMF4TRMrMiLw3EojFvxvh0Ml7b6FHlWxFom+A+LhaW4bDI00fEvOK K0boAUg0hZkOvYKd4cqEOjTzqFVW31WAO+EXNgfZJHvyMW6J8o/hpRluCK9+1UWOYrwV Nnkg== X-Gm-Message-State: ACrzQf2rWmoXEqKOaNVapy005FdIOd3uZh0Vw+OnRKbFNbW/PD08DRFU PM5TEnwTE3QI6yjxKRmCU8W1kA== 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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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/a= rch/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 @@ =20 #include "sc7280-herobrine.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" =20 / { model =3D "Google Herobrine (rev1+)"; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts b/ar= ch/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 @@ =20 #include "sc7280-herobrine-villager.dtsi" #include "sc7280-herobrine-lte-sku.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" =20 / { model =3D "Google Villager (rev0)"; --=20 2.37.3.998.g577e59143f-goog