From 412366391332cbe1b6afab92523f6b18787ab328 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Tue, 22 Oct 2024 15:28:23 +0530 Subject: [PATCH] ARM: dts: msm: Add support for WCD939x in tuna7 -Add and update MSM_ID for tuna7. -Add Board_Id for tuna7. -Add AATC support for tuna7 platform. Change-Id: I7f470c0150ec95b556087ab6797787b9754e8464 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- Kbuild | 1 + tuna7-audio-mtp.dts | 4 ++-- tuna7-audio-mtp.dtsi | 43 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/Kbuild b/Kbuild index 4dee0ac9..41df44be 100644 --- a/Kbuild +++ b/Kbuild @@ -38,6 +38,7 @@ dtbo-y += sun-audio.dtbo \ tuna-audio-hamilton-mtp.dtbo \ tuna-audio-hamilton-rcm.dtbo \ tuna-audio-mtp.dtbo \ + tuna7-audio-mtp.dtbo \ tuna-audio-mtp-qmp1000.dtbo \ tuna-audio-qrd.dtbo \ tuna-audio-rcm.dtbo diff --git a/tuna7-audio-mtp.dts b/tuna7-audio-mtp.dts index 6d8fad89..746c8187 100644 --- a/tuna7-audio-mtp.dts +++ b/tuna7-audio-mtp.dts @@ -12,6 +12,6 @@ model = "Qualcomm Technologies, Inc. Tuna 7"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,tunap-mtp", "qcom,tunap", "qcom,mtp"; - qcom,msm-id = <681 0x10000>; - qcom,board-id = <0 0>; + qcom,msm-id = <681 0x10000>, <655 0x10000>; + qcom,board-id = <8 3>, <8 4>; }; diff --git a/tuna7-audio-mtp.dtsi b/tuna7-audio-mtp.dtsi index a8e30ed0..74de7073 100644 --- a/tuna7-audio-mtp.dtsi +++ b/tuna7-audio-mtp.dtsi @@ -21,24 +21,34 @@ status = "okay"; }; +&wcd939x_rx_slave { + status = "okay"; +}; + &wcd9378_codec { status = "disabled"; }; &wcd939x_codec { status = "okay"; + /* 0 for digital crosstalk disabled, + * 1 for digital crosstalk with local sensed a-xtalk enabled, and + * 2 for digital crosstalk with remote sensed a-xtalk enabled. + */ + qcom,usbcss-hs-xtalk-config = <0>; + qcom,usbcss-hs-rdson = <600>; + qcom,usbcss-hs-r2 = <7550>; + qcom,usbcss-hs-r3 = <1>; + qcom,usbcss-hs-r4 = <330>; + qcom,usbcss-hs-r5 = <5>; + qcom,usbcss-hs-r6 = <1>; + qcom,usbcss-hs-r7 = <5>; + qcom,usbcss-hs-lin-k-aud = <13>; + qcom,usbcss-hs-lin-k-gnd = <13>; }; &tuna_snd { qcom,model = "tuna7-mtp-snd-card"; - qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, - <&lpass_cdc>; - asoc-codec = <&stub_codec>, <&lpass_cdc>, - <&wcd939x_codec>, <&wsa884x_0220>, - <&wsa884x_0221>; - asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", - "wcd939x_codec", "wsa-codec1", - "wsa-codec2"; qcom,audio-routing = "AMIC1", "Analog Mic1", @@ -71,7 +81,7 @@ "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", - "IN3_AUX", "AUX_OUT", + "IN3_EAR", "AUX_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX", @@ -93,4 +103,19 @@ "VA DMIC1", "VA MIC BIAS3", "VA DMIC2", "VA MIC BIAS1", "VA DMIC3", "VA MIC BIAS1"; + qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>, + <&lpass_cdc>; + asoc-codec = <&stub_codec>, <&lpass_cdc>, + <&wcd939x_codec>, <&wsa884x_0220>, + <&wsa884x_0221>; + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", + "wcd939x_codec", "wsa-codec1", + "wsa-codec2"; + qcom,wsa-max-devs = <2>; + qcom,wcd-disable-legacy-surge; + wcd939x-i2c-handle = <&wcd_usbss>; + qcom,msm-mbhc-usbc-audio-supported = <1>; + qcom,msm-mbhc-hphl-swh = <0>; + qcom,msm-mbhc-gnd-swh = <0>; + qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>; };