From patchwork Thu Jul 14 06:11:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12917330 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 A25E3C43334 for ; Thu, 14 Jul 2022 06:12:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234446AbiGNGMU (ORCPT ); Thu, 14 Jul 2022 02:12:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233559AbiGNGMO (ORCPT ); Thu, 14 Jul 2022 02:12:14 -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 524BE255B0 for ; Wed, 13 Jul 2022 23:12:13 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id o5-20020a17090a3d4500b001ef76490983so1757379pjf.2 for ; Wed, 13 Jul 2022 23:12:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jhKCnn2vUZabyEjVQ34XnYYStwx7FF/g1HUD8RjY5qg=; b=L317bCTzKTqaXlJ4EfmgBVMoewNTGGEOrPaCffD0ZZXIwdyuepe5EKRQ6kMfrKVy12 ACo5fbj1mCL+ZnwKzvskmbcuPUhseZnhRmxLziWdVnspTEMZU8Uew+h6isuw4k+6o9DJ vXFbcJ7Mfw1gp439kEFYWq0j6cZA4jN46XgNE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jhKCnn2vUZabyEjVQ34XnYYStwx7FF/g1HUD8RjY5qg=; b=wn3Hq4/V1wepo/Gu+eMYy5R2vfv/i0f/U3WQd4oxhr+Mmw+JXolhKUjstiQ8QoL5jR ldDN/TVsbpwpMdwPLnHpZwAijnmZacYd7fzOpgjDsDu0L7WNnVgyFPDY2gVQrj4oZAZa 5qUlrUcClDRjhqZftYHWFO/9QnX6SLHaXJX3hwS6SWsEE7B9Eek8ojiPyf++EvE+wg64 4Bp7xZe33kVp5wrtKWdNWDeKLnltysCuqMzbLjKUUP5Cr74FsFOdSHHJRnE0+tGI72aN FV5O3nUzi/QQNrTU1ImgvXjUou2drqnNFzxQbLbLFu6ShEizi1PYUBwha5grKHkvlzn5 VRig== X-Gm-Message-State: AJIora/SPbGqVvugMDzC6sTRjh74JVDcw9KvnV+rtQ1lp8OLkvOdGvE0 hkva3Tz55W+LVdepFGMZeaOSIMSOQaDkdw== X-Google-Smtp-Source: AGRyM1tIepRwep6gJA7RqD5bmmkiAwYliMFcEY85zwW1xxcbOSk/eXbsg4HYmU3w3lY7EbYHlLAaSA== X-Received: by 2002:a17:903:18c:b0:16c:51c6:675d with SMTP id z12-20020a170903018c00b0016c51c6675dmr6781526plg.153.1657779132852; Wed, 13 Jul 2022 23:12:12 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (0.223.81.34.bc.googleusercontent.com. [34.81.223.0]) by smtp.gmail.com with ESMTPSA id j10-20020a170902690a00b0016a17da4ad4sm509683plk.39.2022.07.13.23.12.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 23:12:12 -0700 (PDT) From: Judy Hsiao To: Andy Gross Cc: Bjorn Andersson , 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 v1 1/3] arm64: dts: qcom: sc7280: herobrine: Add pinconf settings for mi2s1 Date: Thu, 14 Jul 2022 06:11:49 +0000 Message-Id: <20220714061151.2126288-2-judyhsiao@chromium.org> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog In-Reply-To: <20220714061151.2126288-1-judyhsiao@chromium.org> References: <20220714061151.2126288-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 --- arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi index 0a220e7421d9..74c451bf0d00 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -632,6 +632,21 @@ &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; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength = <2>; From patchwork Thu Jul 14 06:11:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12917331 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 B1E25CCA481 for ; Thu, 14 Jul 2022 06:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233069AbiGNGMX (ORCPT ); Thu, 14 Jul 2022 02:12:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234296AbiGNGMU (ORCPT ); Thu, 14 Jul 2022 02:12:20 -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 EA2A031901 for ; Wed, 13 Jul 2022 23:12:16 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id z12-20020a17090a7b8c00b001ef84000b8bso7416600pjc.1 for ; Wed, 13 Jul 2022 23:12:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zLOmIzqk+HGBt1D+cGUfV9piUY0n5kXmvXhCjDJwhFA=; b=Nn8vsShLjzWBkXRdXuO/W8yt26Kxjfc8AM569i9B6KkJgYJ10d7/dbXpVdo21lUClK By+y26gVhL9Jbdnytfh1hCRYWPUfWMwFxSlihY+AV4AY5wIEmLcMukpwzPxQXt0fjxER uoAib4YO47uDyjxuRNOYvl3FEwrjUWLPUt0tI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zLOmIzqk+HGBt1D+cGUfV9piUY0n5kXmvXhCjDJwhFA=; b=z0Gpg52mh531SiZaK42kfM+Pjds3V/dPDzjHue7ET0fGA4m7aIjqOGbigx3Iv+iyNM /OfDJgJGnApz4V/YPuMqfxuoXbnSZkQ7ZFL4EoNGvZYIXeG4j32RBD/TiuUySPS3tQnN xsu2gIFhKsHdtrHD560a1SzzxXh1pexkmOWiYCEvYvYJjXduIMghZY7QGIfxdtm5Yknl jenVnMXsst2Jxv1/m/aNS9YBj42SfvOC64Bfzog3jJtglKZ2nDJRWgWl7HHWOvEL/0se mgBDfzS/sUdet/yvbjKs4lVVZT/YQ8zRANtRkNQo0MJEQpq4p2kak6qPP+Hc3k9k0HOE IC0Q== X-Gm-Message-State: AJIora/hqVn2YYxsxETQlya/il5UO+yFhv9NcYCFu6tyyniZovK48o/M hawl4JiErmjMs97TC2uD3flv7w== X-Google-Smtp-Source: AGRyM1seML2C6cExQXr/yx9Kz5AE8FNTtpnbRBYUZah3TZh/OgFOlrjAABXtZQVPMVW3CR249ci2mg== X-Received: by 2002:a17:903:1108:b0:168:fa61:1456 with SMTP id n8-20020a170903110800b00168fa611456mr7157115plh.162.1657779136504; Wed, 13 Jul 2022 23:12:16 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (0.223.81.34.bc.googleusercontent.com. [34.81.223.0]) by smtp.gmail.com with ESMTPSA id j10-20020a170902690a00b0016a17da4ad4sm509683plk.39.2022.07.13.23.12.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 23:12:15 -0700 (PDT) From: Judy Hsiao To: Andy Gross Cc: Bjorn Andersson , 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 v1 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Date: Thu, 14 Jul 2022 06:11:50 +0000 Message-Id: <20220714061151.2126288-3-judyhsiao@chromium.org> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog In-Reply-To: <20220714061151.2126288-1-judyhsiao@chromium.org> References: <20220714061151.2126288-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 | 121 ++++++++++++++++++ 1 file changed, 121 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..ec8f2e555a14 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-audio-rt5682.dtsi @@ -0,0 +1,121 @@ +// 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 Thu Jul 14 06:11:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12917332 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 C1FB1C433EF for ; Thu, 14 Jul 2022 06:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235164AbiGNGMg (ORCPT ); Thu, 14 Jul 2022 02:12:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234808AbiGNGM0 (ORCPT ); Thu, 14 Jul 2022 02:12:26 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4571831DCA for ; Wed, 13 Jul 2022 23:12:24 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id i8-20020a17090a4b8800b001ef8a65bfbdso1761834pjh.1 for ; Wed, 13 Jul 2022 23:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gZyhuFG5d+vLE7E3cs3GPiS+/kLdkFYk6kxnyEhMdQM=; b=k/v4zjmAQW9Wh4qvVmiK/VkmCkpFTmHARFcwMF2GDMaBKS/H7UG467Eb0pgP5hdJfr yjHYWLjG5nZKx1ejISlG4aGxyEiX4RpWiuXMPcc1xtIBPz9/jC6GQ1Qmqp9PxOWrrnUd nZvFuoT0M1YCQaaYh9yF+PkGS63DYXRVorhro= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gZyhuFG5d+vLE7E3cs3GPiS+/kLdkFYk6kxnyEhMdQM=; b=gqR+xatVWHNvdhDgAWOhZ1ocLlX1txlbP+8sgEcsGL1sUDiDBMpWVTWVm13Ep+SuJM iyG6tpOIDWGNH5xDwmMJEQPEoVUF0H3fsUWa2P/yUNwg+Dya1maS6Ce9Znqj20sia5LA bMiEht6S+QqLTtjBhLJEz0XRtHXSTxhQaOkCgFaE4p/cGM/mVu5LdTvlY+UilbG1W3/b uW0rs8ctN5kc8IDE6KSfVpDgAcehGxqzKZ+ys159b6Or3BwoULABSoQXLu70a2R6Vo0K EJzW5p25OJcZqh+sc31YhxsAgost9/tnX7PfzP+jRc2McodsDZvNKS26CPjhSoOmDTvs fQfA== X-Gm-Message-State: AJIora9n37ylimh5K1vvz2rtfFDIJLb3BpkSN0oSqjN2IIltjRmhZ26y eW56ji9ROVLYpGzOMdQg02UoNQ== X-Google-Smtp-Source: AGRyM1utcVRvtqwzH/GkdBj9fzus+d0urr+B8L7BDv9yOl4Q/WFGlsHlqBp+jqxiqTZJrkC5lnMu8g== X-Received: by 2002:a17:90a:bc95:b0:1ef:8b48:fa0b with SMTP id x21-20020a17090abc9500b001ef8b48fa0bmr14098354pjr.189.1657779143640; Wed, 13 Jul 2022 23:12:23 -0700 (PDT) Received: from judyhsiao0523.c.googlers.com.com (0.223.81.34.bc.googleusercontent.com. [34.81.223.0]) by smtp.gmail.com with ESMTPSA id j10-20020a170902690a00b0016a17da4ad4sm509683plk.39.2022.07.13.23.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 23:12:23 -0700 (PDT) From: Judy Hsiao To: Andy Gross Cc: Bjorn Andersson , 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 v1 3/3] arm64: dts: qcom: sc7280: include sc7280-herobrine-audio-rt5682.dtsi in villager and herobrine-r1 Date: Thu, 14 Jul 2022 06:11:51 +0000 Message-Id: <20220714061151.2126288-4-judyhsiao@chromium.org> X-Mailer: git-send-email 2.37.0.144.g8ac04bfd2-goog In-Reply-To: <20220714061151.2126288-1-judyhsiao@chromium.org> References: <20220714061151.2126288-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Include sc7280-herobrine-audio-rt5682.dtsi in villager and herobrine-r1 as these boards 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 c1647a85a371..98280436813d 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "sc7280-herobrine.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 cbd8a2d1ef2a..077c58c93a65 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-villager-r0.dts @@ -8,6 +8,7 @@ /dts-v1/; #include "sc7280-herobrine.dtsi" +#include "sc7280-herobrine-audio-rt5682.dtsi" / { model = "Google Villager (rev0)";