From patchwork Thu May 19 08:41:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12854670 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 DCC62C433FE for ; Thu, 19 May 2022 08:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235513AbiESIlr (ORCPT ); Thu, 19 May 2022 04:41:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232134AbiESIlr (ORCPT ); Thu, 19 May 2022 04:41:47 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C3F656F80 for ; Thu, 19 May 2022 01:41:46 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id t11-20020a17090a6a0b00b001df6f318a8bso8153563pjj.4 for ; Thu, 19 May 2022 01:41:46 -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=BeyPRgXV6R69fCc8NB7DOVZ/M+tjtQuZOgPzKJMOoU0=; b=O+59+mVXhHaNLtySVWGIOlyQeB2NuasroODMWBN/ZQL/mkC9HAsI7ak95yBuOqU3e+ CO2uiW+Ij8RkAvQEykR7vlTpfRXGsHImFJcob2OBvsDX29uMB64gO/7wKEhbvlOIzPt0 FFp611gxKBk0fW1hS4bV59E/AE+MGHKpMQeek= 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=BeyPRgXV6R69fCc8NB7DOVZ/M+tjtQuZOgPzKJMOoU0=; b=c5KQBFn6qHhZhB/5YB1NhgFdiMPc79Xhk5Q7sWQ+vKndlUTThSTgvnAscAxBZcLyOz sUqSC4swlf59wxjxBJ3nPSO/1eYwj5qUSwToo+IKw9qsD91yYC0XTQl5ADpOQfpm0Azz O2z/RLNoIUSGmFgWlawRCvHjuRG/l0GOQ7/FcEDSnBFIdTa0djEc5OT07lBG5uxJ5djn wT5TgSFJRAOW0RFmBGrXOfvejsl5b5is1+UV27DzCiXNMFCHQbhLPP2i4DDQuNIKYNxN wk/IddDJpCqF9VzCC9esp1qbrzkBehA2cT6lpaSe6t3MsqyTz6hA0lBjlTbRotEdwLT6 Vt7w== X-Gm-Message-State: AOAM531PJphqbEkZDvOQPl2uOnIU+raLy7vF/ReMPR+jkxFgMhKKnP8O mcPy1skVSCpkPLRQQ87wWliAQg== X-Google-Smtp-Source: ABdhPJy1BehqzaPWoPY6ZsIPaNIucqksWRIRqGHRvFgeS+FiaoDVf/faVp+eB9T7uqN+qHx6cld/dg== X-Received: by 2002:a17:902:b588:b0:161:64fe:af8c with SMTP id a8-20020a170902b58800b0016164feaf8cmr3807527pls.26.1652949705948; Thu, 19 May 2022 01:41:45 -0700 (PDT) Received: from judyhsiao0319.c.googlers.com.com (164.135.233.35.bc.googleusercontent.com. [35.233.135.164]) by smtp.gmail.com with ESMTPSA id m10-20020a170902f20a00b0015f33717794sm3066185plc.42.2022.05.19.01.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 01:41:45 -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, tzungbi@chromium.org, 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: [v1 1/3] arm64: dts: qcom: sc7280: Add drive strength property for secondary MI2S Date: Thu, 19 May 2022 08:41:17 +0000 Message-Id: <20220519084119.675990-2-judyhsiao@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220519084119.675990-1-judyhsiao@chromium.org> References: <20220519084119.675990-1-judyhsiao@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add drive strength property for secondary MI2S on sc7280 based platforms Signed-off-by: Judy Hsiao Reported-by: kernel test robot --- arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi index 9cb1bc8ed6b5..6d8744e130b0 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi @@ -612,6 +612,20 @@ &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>; +}; + &pcie1_clkreq_n { bias-pull-up; drive-strength = <2>; From patchwork Thu May 19 08:41:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12854671 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 4ED1BC433FE for ; Thu, 19 May 2022 08:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235536AbiESIl4 (ORCPT ); Thu, 19 May 2022 04:41:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235538AbiESIlw (ORCPT ); Thu, 19 May 2022 04:41:52 -0400 Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E918F719EA for ; Thu, 19 May 2022 01:41:50 -0700 (PDT) Received: by mail-pj1-x102b.google.com with SMTP id oe17-20020a17090b395100b001df77d29587so8174788pjb.2 for ; Thu, 19 May 2022 01:41:50 -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=E29o2OrjQJPX4ejfeiUBtB17vXGy1rGi2BaTBPCNZj8=; b=OQCPMxY349PjztzMOplaJS4Sp7Ei3DLYM4PURvx8vBKfBbFrl76ZpS+P5xkgoI0z2b gs8N5c69+Y2gb6URk5Pmfu45f7mEJX5nQS0xJSvm0iHnbbKkHAKSjcPTSMqCvy8KtQ1q qVOfLGRPkiyuZVwwyTkrOPw/J81/wgW/kjKME= 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=E29o2OrjQJPX4ejfeiUBtB17vXGy1rGi2BaTBPCNZj8=; b=R+WMZgqaZPHlfCzCiv+/90DP+xdsK0sfpA/Npql2RSjooQVjT6tRtqy66iZw+pAZYC DPP5VXBslpHO4PxH9pxkHlnxtmU1B/aDMywaYcV+B/EK2wDUweP2BCdIcGeCzrE5YOV4 tRKC0G/NLIIMMSXvjKB0crf5SBvcZ0Z2I6qYvc+4lrkMEefViSIFZVD8f6gLxEiUyrqZ k0rXqrl+nUqbJzi5I9N0Zj3r3ZbAf9v5rZppQ/S75q1F2grH+NcHcdWiEmKzVOVI398C /S8eOmX/iMWB2qA0hhsQumaBf+W41jyoNmMJpezUepH6AHZfIYldJ70LGPgbv9wQTbYp flAg== X-Gm-Message-State: AOAM533JHYhR5WqDizDhTxEkSSkcxkNrw4vAAF72y+C3CguiWx1o+YWV vOm12Kwj9RFJ5r5cRGnFGdBCeA== X-Google-Smtp-Source: ABdhPJzHRinj2Abx9GWDGmJvozeWDISKzzVCZPFsstS82nev1wiETtBwp6tSU18WCQHuyZ6xRGoZeg== X-Received: by 2002:a17:90b:1808:b0:1dc:8904:76a1 with SMTP id lw8-20020a17090b180800b001dc890476a1mr4053595pjb.202.1652949710113; Thu, 19 May 2022 01:41:50 -0700 (PDT) Received: from judyhsiao0319.c.googlers.com.com (164.135.233.35.bc.googleusercontent.com. [35.233.135.164]) by smtp.gmail.com with ESMTPSA id m10-20020a170902f20a00b0015f33717794sm3066185plc.42.2022.05.19.01.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 01:41:49 -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, tzungbi@chromium.org, 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: [v1 2/3] arm64: dts: qcom: sc7280: Add sc7280-herobrine-audio-rt5682.dtsi Date: Thu, 19 May 2022 08:41:18 +0000 Message-Id: <20220519084119.675990-3-judyhsiao@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220519084119.675990-1-judyhsiao@chromium.org> References: <20220519084119.675990-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 --- .../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..9e449817f6fd --- /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>; + #sound-dai-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>; +}; From patchwork Thu May 19 08:41:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judy Hsiao X-Patchwork-Id: 12854672 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 981D5C433F5 for ; Thu, 19 May 2022 08:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235543AbiESIl6 (ORCPT ); Thu, 19 May 2022 04:41:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235541AbiESIly (ORCPT ); Thu, 19 May 2022 04:41:54 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC99669712 for ; Thu, 19 May 2022 01:41:52 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id k16so4558348pff.5 for ; Thu, 19 May 2022 01:41:52 -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=ZB7BWpRnlBzFfCqwBENpii045L63Udnz6UdJqFoKbrg=; b=eBu42ys+IO+PrtxiPquedThK1eYYkiOQ9y24LY+CRYn8KUWwW/USGjjydW7q4KauzN HNeOwV7MpJMqQBf54xArMEDqXhHOhRVSg7FBBzDBtUqtJX5WopXcBH0WZh7aeDhRNeCq zor0fg3418FPsOA+3KOz4Kxrxah+Tq3JcyF2I= 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=ZB7BWpRnlBzFfCqwBENpii045L63Udnz6UdJqFoKbrg=; b=kckVbRZ8IbjUCzmcmIjXdt9fHif4pI5v4ABgQJAOHTqLTFuKiw40fNetVAmeLYrA4w Dqs8rMSmzgVaoqHVHE99IhHxsnA+LYh0KULUumeoaXsVX0AwEpUGY07dh7fvo2Xs9t/J 7MY7n93LRxnu2m2XuMYPHWFZmHBp4GrmIho40+jfuBREyIbDRqltTaMenvEl6e5soXPc RGTQtcyv6gU2T7X//60PMhQXAvxFxsx9UqSDmwabUXsVt3HCqSTvNd777CsMgVJQfLK2 sjmapa1gZSOcfJOlv8YL1KJLuFb3c6HVrE8ur5fWX3FEAZFzLtHpxKKGk7B4ZCkKCjPs hTIQ== X-Gm-Message-State: AOAM530q3obt0jkJhKK86a3pTp54frrv/wxjNrmyhHMFns7t7Bn4ibuJ Ndt3x76vHlAx3WA6SX76X9VAjQ== X-Google-Smtp-Source: ABdhPJwF4/cVUxxYJLVP49Ec+fM1+SLeiTfcIk2mNv3OvodJUJtgEWEcdDAlvxUs2qU7Hp9Y5zwzpQ== X-Received: by 2002:aa7:9e1e:0:b0:518:3ee0:57a7 with SMTP id y30-20020aa79e1e000000b005183ee057a7mr2511884pfq.42.1652949712085; Thu, 19 May 2022 01:41:52 -0700 (PDT) Received: from judyhsiao0319.c.googlers.com.com (164.135.233.35.bc.googleusercontent.com. [35.233.135.164]) by smtp.gmail.com with ESMTPSA id m10-20020a170902f20a00b0015f33717794sm3066185plc.42.2022.05.19.01.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 01:41:51 -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, tzungbi@chromium.org, 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: [v1 3/3] arm64: dts: qcom: sc7280: include sc7280-herobrine-audio-rt5682.dtsi in villager and herobrine-r1 Date: Thu, 19 May 2022 08:41:19 +0000 Message-Id: <20220519084119.675990-4-judyhsiao@chromium.org> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220519084119.675990-1-judyhsiao@chromium.org> References: <20220519084119.675990-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 Reported-by: kernel test robot --- 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 b69ca09d9bfb..f68d28f8701b 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 d3d6ffad4eff..7a4acd3b9ee3 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+)";