From patchwork Fri Sep 30 15:26:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 611130 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 26070C43217 for ; Fri, 30 Sep 2022 15:27:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231342AbiI3P1C (ORCPT ); Fri, 30 Sep 2022 11:27:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231601AbiI3P0i (ORCPT ); Fri, 30 Sep 2022 11:26:38 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325E417BB13 for ; Fri, 30 Sep 2022 08:26:37 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id io19so1194164plb.10 for ; Fri, 30 Sep 2022 08:26:37 -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=lixgqKiaVh8FgIvf+wBRcxXTpxgOT34Fs//W1EgmcnS07zDGAOwB7oU6gpSpABj1nr ktxYNGLj8xK9TlF/S6G0q1RiU0Xk3d7tVUNs+9HDcOcl+LXE0P9aHlQTXyJengHl5coj umBNRt1+k6zU481Spm5y3Sd28+hHPFtWzg1GE= 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=UFyyu55vZjwNLpMsemnKFRjmjFXvXUsn9qDTM+P3Nh6rZPWU23pw3DC1ZjrVDYDy8Q oe4X3/QfC8B0NA4g9wcJcOpL2lJCZcbl3Es+yxF1Yf8CzZsSwqig5lxo5/qlHkpxcYhS cKzu05wdI1O/KIqYZlNtg8dRuixS3KJZkywnlWofG0qzsysuhZ+gyCT+0/QtKGVoC4w3 YIDU6/vArkQB/LlKoyhqQ4e3HwPGxcRPg1QQbWi2HTU9+VlqrQ/m7GQkzdIRb0cvjLGe vAOriNLfd5Gcv+kcVCOyFrUDIWAwjccNRw6vFPx1oXR+esNGdrvs/V2yW3Jq1BVBP24v gJew== X-Gm-Message-State: ACrzQf0dIl0NY4lsi2RajB6Ssi8wsAmsSrRgYenPShAGP9jfl0DQ8mxn cVcAz5PAZVlJ9ghiAQmmiGFWJA== X-Google-Smtp-Source: AMsMyM6cqtLD4mHnlGb/6labWolHwlzyKQJy45yY1kVU2WbrVm26A92l3jcoySwYvWCxxvbH0zIRiA== X-Received: by 2002:a17:90b:4acf:b0:202:65e3:da5a with SMTP id mh15-20020a17090b4acf00b0020265e3da5amr22515279pjb.174.1664551596651; Fri, 30 Sep 2022 08:26:36 -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.26.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:26:36 -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 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Date: Fri, 30 Sep 2022 15:26:11 +0000 Message-Id: <20220930152613.2018360-2-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 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/boot/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; }; +&mi2s1_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_data0 { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_sclk { + drive-strength = <6>; + bias-disable; +}; + +&mi2s1_ws { + drive-strength = <6>; + bias-disable; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength = <2>; From patchwork Fri Sep 30 15:36:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 611127 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 61189C433FE for ; Fri, 30 Sep 2022 15:37:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231586AbiI3PhN (ORCPT ); Fri, 30 Sep 2022 11:37:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231616AbiI3PhJ (ORCPT ); Fri, 30 Sep 2022 11:37:09 -0400 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B28A1A0D24 for ; Fri, 30 Sep 2022 08:37:06 -0700 (PDT) Received: by mail-pf1-x432.google.com with SMTP id a29so4557036pfk.5 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=hp6xzbdxpe9fODGMEOD7EM/mxHMBmtWCBTpJQKQiv+2h+b/11igwmSOrnVxvUvg5tU KkJJ47YQRulO4OmPSsp0jzTYx+KPw0D/KSF53teN7LUHQtwTvuGRnS1Zo1UjMqLFo5Xo xRO3BLrnILvugfLxroxri24y4lzcZcacELI999qn4Hbl8T3ydmJhqrcUNZ2UznMEXrUg 5aNZtCjhnKVPB51voY8w0LjOlHoU3IxBpmA1QSXU42s8uyI5Fft2gRN1TV8eUboFqpsa UPH+qWevhkaiDZEtZmlzVZEAantepn+XipUP+0wDy82687t3WVdBC46m2iHFd083VpaP Mshw== X-Gm-Message-State: ACrzQf0Fqkhb8Utt55kuFya8akLRrzddzE1R5jtZ0DXCvixt0UnHfdoc xzTi6iY5krjHUprijKA0ihwQaA== 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 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:26:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 611129 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 97346C43219 for ; Fri, 30 Sep 2022 15:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231514AbiI3P2H (ORCPT ); Fri, 30 Sep 2022 11:28:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231690AbiI3P1t (ORCPT ); Fri, 30 Sep 2022 11:27:49 -0400 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACA59184EC6 for ; Fri, 30 Sep 2022 08:27:42 -0700 (PDT) Received: by mail-pf1-x429.google.com with SMTP id b23so4529845pfp.9 for ; Fri, 30 Sep 2022 08:27:42 -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=QO/TF1TNKtb4QyPMMPtineoZsKRrwcEslkNxYHDy7pmXsMR2gufPagDwtI84c9fL+4 UYMyG5FENa6TS5E6+dij/qpwLBIp4H9XmD7+VQ+thOf3qblqwTZ4VKe5NmpthWyfAkVa ddCUujWy4ojYU3Zu8diFNEBv6P9ZP1pDzw7gE= 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=6+pZ2zPLhC8/sK77FeA00ArzJDpYLG8fpOYtU1PhXg4SGfgZ/WIqNh5/wNbDYxtZvz jQ0P66kDoAXyqH5mAwY3zyLeipF3mniLocsGtzeYPuXuqaK8TgXi7MJ5xmdlJHj8Iosq JboeeP7q+UM2JZbnZOsua4idfLbYfCs8VQ4aRz6bIHf/1kKz6nqJ2wclXUw/bMu8Bqve Doo3q7v7yoU+v0h6iAXWZw+ctSDUC2xMnr211O4xWL8WsGBnIZ+HHtixrRKh/yryZelN i3+DHF8ZZUuvFyqcGNIlfpD1OvHgbJ88vo3vx9pcRzqHr2Jt18GFXqZJ+Q9SN710FlRl kuJQ== X-Gm-Message-State: ACrzQf0cIjEYBz/rIbzqMReRDBSjcknNOivFs2z4jJOv9sWxdPRIN+5m ws719fNwUKrIRQG4/MZo/Ha/Jw== X-Google-Smtp-Source: AMsMyM68rZnXqbxGTRkqoJ+2ZphomMhvwQl/2z1iRnCzfodcoDCed/fQt4XFChNiRPcA1UFo7Aj4kg== X-Received: by 2002:a65:58c8:0:b0:438:aecf:5cc8 with SMTP id e8-20020a6558c8000000b00438aecf5cc8mr8012063pgu.18.1664551661335; Fri, 30 Sep 2022 08:27:41 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 08:27:40 -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 3/3] arm64: dts: qcom: sc7280: Include sc7280-herobrine-audio-rt5682.dtsi in herobrine-r1 and villager-r0 Date: Fri, 30 Sep 2022 15:26:13 +0000 Message-Id: <20220930152613.2018360-4-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 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)";