From mboxrd@z Thu Jan 1 00:00:00 1970 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 EB0E6C433F5 for ; Thu, 21 Apr 2022 16:57:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1388219AbiDUQ76 (ORCPT ); Thu, 21 Apr 2022 12:59:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1385664AbiDUQ74 (ORCPT ); Thu, 21 Apr 2022 12:59:56 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE94F49CA0 for ; Thu, 21 Apr 2022 09:57:05 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id s14so5423577plk.8 for ; Thu, 21 Apr 2022 09:57:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Q2IAgvex9X3dkujovRgUSvoi3VREyFVH2u2OtN6n7C4=; b=fMWH3qkFo6p1eQi3YpmP2ZMZp5lPiLxdtO4T1c9f48A1aMlUziVN0mMRXiRMzHK9x4 Q0VCxsYmd2PhUihaVke0MQnUfl8XnnjNLzU9zK1MO+aD39mfbk0i7CNVo2/heAKmIhsS Fs2c9kpiwShaZW1QysMiXHWvB9/jmMfVFSq6g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Q2IAgvex9X3dkujovRgUSvoi3VREyFVH2u2OtN6n7C4=; b=ZZ0aRxzuFyQWv+aYqPXOsMBmUA2tzQq85+45BRq03eE3Nrldfe2JshSEjKghIWvff5 jTbAc/uG5HREbXfiK99Nnk4nhs/+On5xNtErOqLmTFpiryLMu1xnbaY5L5ZYpHyk2+ZZ 4nB3yFX21Dd5BPyXYKOn43epECCY4qO9BCftGFGNDHHdrogVs8df1tO8tWAduNsd3Evd v4XmgktxdCJFhsTFcG0JncmGXJsLdiwNZPEhIGHViczSMR3AFkuoaa7Mhcb9LDhp5Lhg Em3T8Vavlbx++t3ApDNwwLFKvXZVX+pE/a3EB8o50ouVif0GAmwN4J0pZtGmEEtNCh/G dJOA== X-Gm-Message-State: AOAM530ya5O8i87mRt/U0UaeoUd1SKcKmNBdpo8M/89HlkSRaYRZIFuQ 8MN6KciN6T4pESrTFfQZMPKBLg== X-Google-Smtp-Source: ABdhPJzFhlybj2za5Cf0sYeFVh1imb8tBXDYiBI9X7QE2CeAiWCSE2WnwcwMFR4FAviXIBLsEU4ORQ== X-Received: by 2002:a17:90b:3508:b0:1d2:ef2f:9f8c with SMTP id ls8-20020a17090b350800b001d2ef2f9f8cmr11447953pjb.42.1650560225331; Thu, 21 Apr 2022 09:57:05 -0700 (PDT) Received: from localhost ([2620:15c:202:201:d426:5807:a72:7b27]) by smtp.gmail.com with UTF8SMTPSA id p11-20020a65490b000000b003aa7791f3afsm4862691pgs.84.2022.04.21.09.57.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Apr 2022 09:57:05 -0700 (PDT) Date: Thu, 21 Apr 2022 09:57:03 -0700 From: Matthias Kaehlcke To: Srinivasa Rao Mandadapu Cc: agross@kernel.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, quic_rohkumar@quicinc.com, srinivas.kandagatla@linaro.org, dianders@chromium.org, swboyd@chromium.org, judyhsiao@chromium.org, Venkata Prasad Potturu Subject: Re: [PATCH v9 05/12] arm64: dts: qcom: sc7280: Add wcd9385 codec node for CRD 3.0/3.1 Message-ID: References: <1650552459-21077-1-git-send-email-quic_srivasam@quicinc.com> <1650552459-21077-6-git-send-email-quic_srivasam@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1650552459-21077-6-git-send-email-quic_srivasam@quicinc.com> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Thu, Apr 21, 2022 at 08:17:32PM +0530, Srinivasa Rao Mandadapu wrote: > Add wcd9385 codec node for audio use case on CRD rev5 (aka CRD 3.0/3.1) nit: rev5+ > boards. Add tlmm gpio property for switching CTIA/OMTP Headset. > > Signed-off-by: Srinivasa Rao Mandadapu > Co-developed-by: Venkata Prasad Potturu > Signed-off-by: Venkata Prasad Potturu > --- > arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts | 52 +++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts > index d0794f2..d6a3086 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-crd.dts > @@ -12,6 +12,36 @@ > / { > model = "Qualcomm Technologies, Inc. sc7280 CRD platform (rev5+)"; > compatible = "google,hoglin", "qcom,sc7280"; > + > + wcd938x: audio-codec-1 { wcd9385 (same for the CRD <= 2.0, I missed it there). > + compatible = "qcom,wcd9385-codec"; > + pinctrl-names = "default", "sleep", "us_euro_hs_sel"; > + pinctrl-0 = <&wcd_reset_n>; > + pinctrl-1 = <&wcd_reset_n_sleep>; > + pinctrl-2 = <&us_euro_hs_sel>; This looks wrong, see my comment on the CRD <= 2.0 patch (https://patchwork.kernel.org/project/linux-arm-msm/patch/1650552459-21077-5-git-send-email-quic_srivasam@quicinc.com/) > + > + reset-gpios = <&tlmm 83 GPIO_ACTIVE_HIGH>; > + us-euro-gpios = <&tlmm 81 GPIO_ACTIVE_HIGH>; > + > + qcom,rx-device = <&wcd_rx>; > + qcom,tx-device = <&wcd_tx>; > + > + vdd-rxtx-supply = <&vreg_l18b_1p8>; > + vdd-io-supply = <&vreg_l18b_1p8>; > + vdd-buck-supply = <&vreg_l17b_1p8>; > + vdd-mic-bias-supply = <&vreg_bob>; > + > + qcom,micbias1-microvolt = <1800000>; > + qcom,micbias2-microvolt = <1800000>; > + qcom,micbias3-microvolt = <1800000>; > + qcom,micbias4-microvolt = <1800000>; > + > + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 > + 500000 500000 500000>; > + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; > + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; > + #sound-dai-cells = <1>; > + }; The wcd9385 is on the qcard, so I think this node should be added to sc7280-qcard.dtsi and be marked as "disabled". This file can then just set the status to "okay". Future boards that use the wcd could do the same, rather than adding a copy of this node to their .dts file. > }; > > /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ > @@ -345,4 +375,26 @@ ap_ts_pen_1v8: &i2c13 { > "", > "", > ""; > + > + us_euro_hs_sel: us-euro-hs-sel { > + pins = "gpio81"; > + function = "gpio"; > + bias-pull-down; > + drive-strength = <2>; > + }; > + > + wcd_reset_n: wcd-reset-n { > + pins = "gpio83"; > + function = "gpio"; > + drive-strength = <8>; > + output-high; > + }; > + > + wcd_reset_n_sleep: wcd-reset-n-sleep { > + pins = "gpio83"; > + function = "gpio"; > + drive-strength = <8>; > + bias-disable; > + output-low; > + }; These are also on the qcard, please move the nodes to sc7280-qcard.dtsi