From nobody Mon Apr 29 16:26:34 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 D61FDC433FE for ; Fri, 30 Sep 2022 15:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231512AbiI3P1G (ORCPT ); Fri, 30 Sep 2022 11:27:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231605AbiI3P0i (ORCPT ); Fri, 30 Sep 2022 11:26:38 -0400 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35FD417CA05 for ; Fri, 30 Sep 2022 08:26:37 -0700 (PDT) Received: by mail-pl1-x62e.google.com with SMTP id 10so652490pli.0 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=yogYUv3WyQWw+gmMhRjXAEl8vRHHzc0KURO727GQ6aDE0ZHueRJmnz9C0bxwxLwDfV ftZ35e0tRJmhllu4zOLLXhqPWQKKqBrFm6RqBOMqdHWXfsXSl9JGM1nIdZQPfNKAU+61 ePSsKQ0svX8CJQWxlO6qXDPX+vwWCq86fWbXiS2hBtGrL0kuAla97LLDyiOoPZJFSa1J g7WDakREVR7w2+5aPorqYE0tzmSbzCStlFCz0gv3PXnS07LUhsnhgVQYImWUkdMtH/ZZ jDg1k+ZZmQhpzQ8bAnhkOYwWYmuLnkc8xAeZLPwVvmM82SUE9QwxM9EgVX2MYMewzLzO GPTA== X-Gm-Message-State: ACrzQf3bsVVie/i+KwXTRCtqncaRVdqbNy82frve8TKtV976lb89zWHc CiMOzjS25eleiAg/Qc+lvFGRxg== 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 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 Mon Apr 29 16:26:34 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 A0A43C433F5 for ; Fri, 30 Sep 2022 15:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231441AbiI3P1h (ORCPT ); Fri, 30 Sep 2022 11:27:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60664 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231646AbiI3P1Z (ORCPT ); Fri, 30 Sep 2022 11:27:25 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98350182752 for ; Fri, 30 Sep 2022 08:27:24 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id e11-20020a17090a77cb00b00205edbfd646so9425147pjs.1 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=CguO31ZKCFeGy0/t2aE4oCPVz6oFgKdqg1CoNGHrtMfzabUr/oA2wfu+7LMJk29Qsp xeWRnXBl7H7zfB26myXk2H1BJJVO+riCEabGM+ElNb5UJrRWGwq1L10aoiaSAcp3Rpk+ j051qpkZu5Djayr3diRrH4SEv2/fwJpn8trS6bmpYYFVkHI+8ChwUatfaFBlzad+qi7O 5MAN2zbQYIc2jD+t+yVqAFc/Gae3rtpqjLFrbhN3JqQ8rBzjT+Ufuv851dxqEDjR006Q km1z+f9i2o3mtDgyb4qFWqtqlPjl+tqK1zLNNQfBedbIR0pWS0HOVNKHcvK50WlV0xJE 308Q== X-Gm-Message-State: ACrzQf1f8uhXHbz5A7LuaBSrxX2iGA33QfS3ASW8ZNRPDvP/+7/mJrgY Ggyla785YjMua6cIqs148pgxSw== 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 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 Mon Apr 29 16:26:34 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 C565AC4321E for ; Fri, 30 Sep 2022 15:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231690AbiI3P2O (ORCPT ); Fri, 30 Sep 2022 11:28:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231685AbiI3P1s (ORCPT ); Fri, 30 Sep 2022 11:27:48 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABE16184838 for ; Fri, 30 Sep 2022 08:27:42 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id e129so4448074pgc.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=H2isgcXSgmCvorRUg7URZp+vhW8YNiCRPEk1uz4ZSUEFm05kfuAM6rvuWWmzy+da92 5gW7woxEj/fDkpdmP59UOCqpctCa9HL4MwzAvBvP7TrpfH6DExXSqBpAGcDOStu8nLwd QgwoV3WqqbYumK+B74ZKHABQP+Tj6uBILhRtUrG7h5tjTwpT+GmSnbEQi+A+0kn7nY6t mbnOdQQzaS00tAyKBZVjJcYiiWcej823+adFGO4sX1jgm6KXam80wluPYVznZxqHT5BH k1axS33BNhnCpSyyu5HXfesAnvHmw0eLhnk/Ox4ibypfgI65LnhH50kKyuIdQwyivjaK 9sDw== X-Gm-Message-State: ACrzQf2umGumC8WijwnoIOdqO5QYLAqsjeplM9P+o4RZBNXnQphkNRjc EmZ7+Ytx2j/1DAJLBYeOR9MSBQ== 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 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