From nobody Wed Oct 8 20:59:58 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9201F26D4CE; Wed, 25 Jun 2025 08:29:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750840195; cv=none; b=lk1FwuePgOtzrAodOcs+9fpf8u/oV0UXMeshAok9uDKYWqx2uTzLVWJSedp6Fnib3divlqipt9YaCw4A8d467ZY/DG8bdoFxkkhB305Ojm7t2zoBIqPSWFGUnjOb9Qj+xIXkMLBatRn5UMvDnw3IPwxzeHUxDTh1XuYrWpr8i5Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750840195; c=relaxed/simple; bh=+u4nOGSB7/r3s4Vkzxi8CvdVcWSCVJwEzyrDKh3r8Zk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VFeqAHz9EVq5GXlG/H6mePuyV4KUhPY93K5vQCdvL+7RmC4xJnNWKOEzDVC86yBMmN0hn9la6MbuaUQGFiqaDUxvsisZl+ZRsm/+9iM2iQhpR1SMFPbUdpXgTfBpx+ElTe4OYfQATboyo9RsTRA7F1JQGNKUvOdgRbXA2RDaw2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=GHmBIutD; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="GHmBIutD" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55P4Yhkv014579; Wed, 25 Jun 2025 08:29:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=x/aXTGmrPQv rok1R8j5LFbwzxMK0MrgkDa0xJ4V0NLk=; b=GHmBIutDi35KqRCl/SilWLVhdMi TdoMk/OLg+OPlsuBWya38QEt5r74S5M7RDQRGPO4MmKi4kZ2GgNMYPi768eX+jwG IeXHUSq0mxpt23ZzXnTWFaKDGznINHqCbi3AmWv2ZWKDYKFIvEcQjbzGKez9cjeA AkzqxCqrLZy7fQe3ulf+ExSoRgd78rardPiG75D3VfPKs6No+VbuXAZHl9XHLSKt wsPGsBclsSfEN1Z6mrqKj8FNzvJdCHlHDNmLBXi316MmGYo2erjifaPABfc+9fFp kIJ0JXPpT6gCcO6mMUr7terr9eB4QI4edt9D0PFjpozg8fCbgze7PQKdLNg== Received: from apblrppmta01.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47f2rpycah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 08:29:48 +0000 (GMT) Received: from pps.filterd (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTP id 55P8TiCH032620; Wed, 25 Jun 2025 08:29:45 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTPS id 47dntm2eqg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 08:29:45 +0000 Received: from APBLRPPMTA01.qualcomm.com (APBLRPPMTA01.qualcomm.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 55P8Tjd9032655; Wed, 25 Jun 2025 08:29:45 GMT Received: from hu-devc-hyd-u22-c.qualcomm.com (hu-pkumpatl-hyd.qualcomm.com [10.147.245.204]) by APBLRPPMTA01.qualcomm.com (PPS) with ESMTPS id 55P8TitG032616 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 08:29:45 +0000 Received: by hu-devc-hyd-u22-c.qualcomm.com (Postfix, from userid 3914174) id BF5A25CF; Wed, 25 Jun 2025 13:59:41 +0530 (+0530) From: Prasad Kumpatla To: Bjorn Andersson , Linus Walleij , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Srinivas Kandagatla , Liam Girdwood , Mark Brown , Konrad Dybcio Cc: cros-qcom-dts-watchers@chromium.org, linux-arm-msm@vger.kernel.org, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, quic_pkumpatl@quicinc.com, kernel@oss.qualcomm.com, Mohammad Rafi Shaik Subject: [PATCH v5 8/9] arm64: dts: qcom: qcm6490-idp: Add WSA8830 speakers and WCD9370 headset codec Date: Wed, 25 Jun 2025 13:59:26 +0530 Message-Id: <20250625082927.31038-9-quic_pkumpatl@quicinc.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250625082927.31038-1-quic_pkumpatl@quicinc.com> References: <20250625082927.31038-1-quic_pkumpatl@quicinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=NdDm13D4 c=1 sm=1 tr=0 ts=685bb37c cx=c_pps a=Ou0eQOY4+eZoSc0qltEV5Q==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=6IFa9wvqVegA:10 a=COk6AnOGAAAA:8 a=U1-NlgUr8jZUk8VuFV4A:9 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDA2MiBTYWx0ZWRfX0GRLtbv1XHha d4ZzPEt0Sn/t0minTZ6c3/1wjD4aNJf1TOTrQjAUauwHEpbkYLtGyhdoBADMWe/2tsp/XHgKA3p pgwv5Hs3N1dGV3BzdB7VvQDeeCHupajO/YKTa+U9MdOlCNfIeet2uRbIdu9wZjo+SNGc6vtoXcV 24mi5onB4BbewOmnO/DCl8M1Tsg8sshqcBpeaOFjYyQt755N/VqZlg7U7Vv3WutE0mK87beeoX4 Ef7JLWD096EnWpDBUOHtmm0AYX4Gcec+oylFo6rttg9ub+BdiXBZw/tDIlL3qB23mf696nUilht SL1krz9EHkB+/vxLf4dodhBb0OmJe/YezO+j89oGfmd9FPWDRu3DqhVotJU2P9r2sSVc/2vzQzz AffhkeqixNEEEfVCOxA1UZXc0tF3VpJbwvADVmxNGbmT40QxtcDuyGbqVtcuW+G0bUUr39cH X-Proofpoint-ORIG-GUID: hlFunid8mLif8_CVR_7syveA7xAoasNX X-Proofpoint-GUID: hlFunid8mLif8_CVR_7syveA7xAoasNX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-25_01,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 mlxscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 adultscore=0 clxscore=1015 impostorscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506250062 Content-Type: text/plain; charset="utf-8" From: Mohammad Rafi Shaik Add nodes for WSA8830 speakers and WCD9370 headset codec on qcm6490-idp board. Enable lpass macros along with audio support pin controls. Signed-off-by: Mohammad Rafi Shaik Co-developed-by: Prasad Kumpatla Signed-off-by: Prasad Kumpatla --- arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 123 +++++++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 +++ 2 files changed, 135 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts b/arch/arm64/boot/dts= /qcom/qcm6490-idp.dts index 7a155ef6492e..468f5f9c0779 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-idp.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-idp.dts @@ -18,6 +18,7 @@ #include "pm7325.dtsi" #include "pm8350c.dtsi" #include "pmk8350.dtsi" +#include "qcs6490-audioreach.dtsi" =20 /delete-node/ &ipa_fw_mem; /delete-node/ &rmtfs_mem; @@ -169,6 +170,30 @@ vph_pwr: vph-pwr-regulator { regulator-min-microvolt =3D <3700000>; regulator-max-microvolt =3D <3700000>; }; + + wcd9370: audio-codec-0 { + compatible =3D "qcom,wcd9370-codec"; + + pinctrl-0 =3D <&wcd_default>; + pinctrl-names =3D "default"; + + reset-gpios =3D <&tlmm 83 GPIO_ACTIVE_HIGH>; + + vdd-buck-supply =3D <&vreg_l17b_1p7>; + vdd-rxtx-supply =3D <&vreg_l18b_1p8>; + vdd-px-supply =3D <&vreg_l18b_1p8>; + vdd-mic-bias-supply =3D <&vreg_bob_3p296>; + + qcom,micbias1-microvolt =3D <1800000>; + qcom,micbias2-microvolt =3D <1800000>; + qcom,micbias3-microvolt =3D <1800000>; + qcom,micbias4-microvolt =3D <1800000>; + + qcom,rx-device =3D <&wcd937x_rx>; + qcom,tx-device =3D <&wcd937x_tx>; + + #sound-dai-cells =3D <1>; + }; }; =20 &apps_rsc { @@ -536,6 +561,22 @@ &gpu_zap_shader { firmware-name =3D "qcom/qcm6490/a660_zap.mbn"; }; =20 +&lpass_rx_macro { + status =3D "okay"; +}; + +&lpass_tx_macro { + status =3D "okay"; +}; + +&lpass_va_macro { + status =3D "okay"; +}; + +&lpass_wsa_macro { + status =3D "okay"; +}; + &mdss { status =3D "okay"; }; @@ -716,6 +757,81 @@ &sdhc_2 { cd-gpios =3D <&tlmm 91 GPIO_ACTIVE_LOW>; }; =20 +&swr0 { + status =3D "okay"; + + wcd937x_rx: codec@0,4 { + compatible =3D "sdw20217010a00"; + reg =3D <0 4>; + + /* + * WCD9370 RX Port 1 (HPH_L/R) <=3D=3D> SWR1 Port 1 (HPH_L/R) + * WCD9370 RX Port 2 (CLSH) <=3D=3D> SWR1 Port 2 (CLSH) + * WCD9370 RX Port 3 (COMP_L/R) <=3D=3D> SWR1 Port 3 (COMP_L/R) + * WCD9370 RX Port 4 (LO) <=3D=3D> SWR1 Port 4 (LO) + * WCD9370 RX Port 5 (DSD_L/R) <=3D=3D> SWR1 Port 5 (DSD) + */ + qcom,rx-port-mapping =3D <1 2 3 4 5>; + + /* + * Static channels mapping between slave and master rx port channels. + * In the order of slave port channels, which is + * hph_l, hph_r, clsh, comp_l, comp_r, lo, dsd_r, dsd_l. + */ + qcom,rx-channel-mapping =3D /bits/ 8 <1 2 1 1 2 1 1 2>; + }; +}; + +&swr1 { + status =3D "okay"; + + wcd937x_tx: codec@0,3 { + compatible =3D "sdw20217010a00"; + reg =3D <0 3>; + + /* + * WCD9370 TX Port 1 (ADC1) <=3D> SWR2 Port 2 + * WCD9370 TX Port 2 (ADC2, 3) <=3D> SWR2 Port 2 + * WCD9370 TX Port 3 (DMIC0,1,2,3 & MBHC) <=3D> SWR2 Port 3 + * WCD9370 TX Port 4 (DMIC4,5,6,7) <=3D> SWR2 Port 4 + */ + qcom,tx-port-mapping =3D <1 1 2 3>; + + /* + * Static channel mapping between slave and master tx port channels. + * In the order of slave port channels which is adc1, adc2, adc3, + * mic0, dmic1, mbhc, dmic2, dmic3, dmci4, dmic5, dmic6, dmic7. + */ + qcom,tx-channel-mapping =3D /bits/ 8 <1 2 1 1 2 3 3 4 1 2 3 4>; + }; +}; + +&swr2 { + status =3D "okay"; + + left_spkr: speaker@0,1 { + compatible =3D "sdw10217020200"; + reg =3D <0 1>; + powerdown-gpios =3D <&tlmm 63 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrLeft"; + #thermal-sensor-cells =3D <0>; + vdd-supply =3D <&vreg_l18b_1p8>; + qcom,port-mapping =3D <1 2 3 7>; + }; + + right_spkr: speaker@0,2 { + compatible =3D "sdw10217020200"; + reg =3D <0 2>; + powerdown-gpios =3D <&tlmm 62 GPIO_ACTIVE_LOW>; + #sound-dai-cells =3D <0>; + sound-name-prefix =3D "SpkrRight"; + #thermal-sensor-cells =3D <0>; + vdd-supply =3D <&vreg_l18b_1p8>; + qcom,port-mapping =3D <4 5 6 8>; + }; +}; + &tlmm { gpio-reserved-ranges =3D <32 2>, /* ADSP */ <48 4>; /* NFC */ @@ -725,6 +841,13 @@ sd_cd: sd-cd-state { function =3D "gpio"; bias-pull-up; }; + + wcd_default: wcd-reset-n-active-state { + pins =3D "gpio83"; + function =3D "gpio"; + drive-strength =3D <16>; + bias-disable; + }; }; =20 &uart5 { diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qco= m/sc7280.dtsi index fff92fd836ab..b9cca45a5fb2 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -2898,21 +2898,33 @@ lpass_dmic23_data: dmic23-data-state { lpass_rx_swr_clk: rx-swr-clk-state { pins =3D "gpio3"; function =3D "swr_rx_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; }; =20 lpass_rx_swr_data: rx-swr-data-state { pins =3D "gpio4", "gpio5"; function =3D "swr_rx_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; }; =20 lpass_tx_swr_clk: tx-swr-clk-state { pins =3D "gpio0"; function =3D "swr_tx_clk"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-disable; }; =20 lpass_tx_swr_data: tx-swr-data-state { pins =3D "gpio1", "gpio2", "gpio14"; function =3D "swr_tx_data"; + drive-strength =3D <2>; + slew-rate =3D <1>; + bias-bus-hold; }; =20 lpass_wsa_swr_clk: wsa-swr-clk-state { --=20 2.34.1