Commit label r00088.2 - ES2 0.0.088.2

TRACKING-ID:db40d318-f9e4-4d1e-8ac6-41266717b2b8

1 files changed, 10 insertions, 295 deletions

diff --git a/qcom/monaco-wsa-audio-overlay.dtsi b/qcom/monaco-wsa-audio-overlay.dtsi
index 85d6d27a..84d129fc 100755
--- a/qcom/monaco-wsa-audio-overlay.dtsi
+++ b/qcom/monaco-wsa-audio-overlay.dtsi
@@ -1,178 +1,15 @@
-#include <dt-bindings/clock/qcom,audio-ext-clk.h>
-#include <dt-bindings/sound/qcom,bolero-clk-rsc.h>
-#include <dt-bindings/sound/audio-codec-port-types.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
 
-&spf_core_platform {
-	cdc_dmic01_gpios: cdc_dmic01_pinctrl {
-		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;
-		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;
-		qcom,lpi-gpios;
-	};
-
-	cdc_dmic23_gpios: cdc_dmic23_pinctrl {
-		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;
-		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;
-		qcom,lpi-gpios;
-	};
-
-	rx_swr_gpios: rx_swr_clk_data_pinctrl {
-		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active>;
-		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep>;
-		qcom,lpi-gpios;
-	};
-
-	va_swr_gpios: va_swr_clk_data_pinctrl {
-		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active
-			    &tx_swr_data2_active>;
-		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep
-			    &tx_swr_data2_sleep>;
-		qcom,lpi-gpios;
-		qcom,chip-wakeup-reg = <0x003ca064>;
-		qcom,chip-wakeup-maskbit = <0>;
-		qcom,chip-wakeup-default-val = <0x1>;
-	};
-
-	bolero: bolero-cdc {
-		compatible = "qcom,bolero-codec";
-		clock-names = "lpass_audio_hw_vote";
-		clocks = <&lpass_audio_hw_vote 0>;
-		bolero-clk-rsc-mngr {
-			compatible = "qcom,bolero-clk-rsc-mngr";
-		};
-
-		va_macro: va-macro@0a730000 {
-			swr0: va_swr_master {
-			};
-		};
-
-		tx_macro: tx-macro@0a620000 {
-		};
-
-		rx_macro: rx-macro@0a600000 {
-			swr1: rx_swr_master {
-			};
-		};
-	};
-
-	monaco_snd: sound {
-		qcom,mi2s-audio-intf = <0>;
-		qcom,cc-va-intf-enable = <0>;
-		qcom,auxpcm-audio-intf = <0>;
-		qcom,tdm-audio-intf = <0>;
-		qcom,wcn-btfm = <0>;
-		qcom,afe-rxtx-lb = <0>;
-
-		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
-				<&loopback>, <&compress>, <&hostless>,
-				<&afe>, <&lsm>, <&routing>, <&compr>,
-				<&pcm_noirq>;
-		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",
-				"msm-pcm-dsp.2", "msm-voip-dsp",
-				"msm-pcm-voice", "msm-pcm-loopback",
-				"msm-compress-dsp", "msm-pcm-hostless",
-				"msm-pcm-afe", "msm-lsm-client",
-				"msm-pcm-routing", "msm-compr-dsp",
-				"msm-pcm-dsp-noirq";
-		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,
-				<&dai_mi2s2>, <&dai_mi2s3>,
-				<&dai_pri_auxpcm>,
-				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
-				<&dai_quat_auxpcm>,
-				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,
-				<&afe_proxy_tx>, <&incall_record_rx>,
-				<&incall_record_tx>, <&incall_music_rx>,
-				<&incall_music_2_rx>,
-				<&proxy_rx>, <&proxy_tx>,
-				<&usb_audio_rx>, <&usb_audio_tx>,
-				<&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>,
-				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
-				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
-				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
-				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
-				<&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>,
-				<&va_cdc_dma_2_tx>,
-				<&rx_cdc_dma_0_rx>, <&tx_cdc_dma_0_tx>,
-				<&rx_cdc_dma_1_rx>, <&tx_cdc_dma_1_tx>,
-				<&rx_cdc_dma_2_rx>, <&tx_cdc_dma_2_tx>,
-				<&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>,
-				<&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>,
-				<&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>,
-				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>,
-				<&afe_loopback_tx>;
-		asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
-				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
-				"msm-dai-q6-auxpcm.1",
-				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",
-				"msm-dai-q6-auxpcm.4", "msm-dai-q6-dev.224",
-				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",
-				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
-				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
-				"msm-dai-q6-dev.32770",
-				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195",
-				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",
-				"msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399",
-				"msm-dai-q6-dev.16401",
-				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",
-				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
-				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",
-				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",
-				"msm-dai-cdc-dma-dev.45089",
-				"msm-dai-cdc-dma-dev.45091",
-				"msm-dai-cdc-dma-dev.45093",
-				"msm-dai-cdc-dma-dev.45104",
-				"msm-dai-cdc-dma-dev.45105",
-				"msm-dai-cdc-dma-dev.45106",
-				"msm-dai-cdc-dma-dev.45107",
-				"msm-dai-cdc-dma-dev.45108",
-				"msm-dai-cdc-dma-dev.45109",
-				"msm-dai-cdc-dma-dev.45110",
-				"msm-dai-cdc-dma-dev.45111",
-				"msm-dai-cdc-dma-dev.45112",
-				"msm-dai-cdc-dma-dev.45113",
-				"msm-dai-cdc-dma-dev.45114",
-				"msm-dai-cdc-dma-dev.45115",
-				"msm-dai-cdc-dma-dev.45116",
-				"msm-dai-cdc-dma-dev.45118",
-				"msm-dai-q6-dev.24577";
-	};
+&soc {
+wsa_spkr_en: wsa_spkr_en_pinctrl {
+	compatible = "qcom,msm-cdc-pinctrl";
+	pinctrl-names = "aud_active", "aud_sleep";
+	pinctrl-0 = <&spkr_1_sd_n_active>;
+	pinctrl-1 = <&spkr_1_sd_n_sleep>;
+};
 };
 
-&bolero {
-	qcom,num-macros = <3>;
-	qcom,bolero-version = <6>;
-	bolero-clk-rsc-mngr {
-		compatible = "qcom,bolero-clk-rsc-mngr";
-		qcom,fs-gen-sequence = <0x3000 0x1 0x1>, <0x3004 0x3 0x3>,
-					<0x3004 0x3 0x1>, <0x3080 0x2 0x2>;
-	qcom,rx_mclk_mode_muxsel = <0x0a5640d8>;
-	qcom,va_mclk_mode_muxsel = <0x0a7a0000>;
-	clock-names = "tx_core_clk", "tx_npl_clk", "rx_core_clk", "rx_npl_clk",
-		"va_core_clk", "va_npl_clk";
-	clocks = <&clock_audio_tx_1 0>, <&clock_audio_tx_2 0>,
-		<&clock_audio_rx_1 0>, <&clock_audio_rx_2 0>,
-		<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;
-	};
-
-	tx_macro: tx-macro@0a620000 {
-		compatible = "qcom,tx-macro";
-		reg = <0x0a620000 0x0>;
-		clock-names = "tx_core_clk", "tx_npl_clk";
-		clocks = <&clock_audio_tx_1 0>,
-			 <&clock_audio_tx_2 0>;
-		qcom,tx-dmic-sample-rate = <2400000>;
-		qcom,is-used-swr-gpio = <0>;
-	};
 
-	rx_macro: rx-macro@0a600000 {
+&rx_macro {
 		compatible = "qcom,rx-macro";
 		reg = <0x0a600000 0x0>;
 		clock-names = "rx_core_clk", "rx_npl_clk";
@@ -182,6 +19,7 @@
 		qcom,rx_mclk_mode_muxsel = <0x0a5640d8>;
 		qcom,rx-bcl-pmic-params = /bits/ 8 <0x00 0x04 0x3E>;
 		qcom,default-clk-id = <TX_CORE_CLK>;
+		qcom,rx-wsa-enable = <1>;
 		swr1: rx_swr_master {
 			compatible = "qcom,swr-mstr";
 			#address-cells = <2>;
@@ -220,60 +58,12 @@
 		};
 	};
 
-	va_macro: va-macro@0a730000 {
-		compatible = "qcom,va-macro";
-		reg = <0x0a730000 0x0>;
-		clock-names = "lpass_audio_hw_vote";
-		clocks = <&lpass_audio_hw_vote 0>;
-		qcom,va-dmic-sample-rate = <600000>;
-		qcom,va-clk-mux-select = <1>;
-		qcom,va-island-mode-muxsel = <0x0a7a0000>;
-		qcom,default-clk-id = <TX_CORE_CLK>;
-		qcom,is-used-swr-gpio = <1>;
-		qcom,va-swr-gpios = <&va_swr_gpios>;
-		swr0: va_swr_master {
-			compatible = "qcom,swr-mstr";
-			#address-cells = <2>;
-			#size-cells = <0>;
-			clock-names = "lpass_audio_hw_vote";
-			clocks = <&lpass_audio_hw_vote 0>;
-			qcom,swr_master_id = <3>;
-			qcom,swrm-hctl-reg = <0x0a7ec100>;
-			qcom,mipi-sdw-block-packing-mode = <1>;
-			swrm-io-base = <0x0a740000 0x0>;
-			interrupts =
-				<0 296 IRQ_TYPE_LEVEL_HIGH>,
-				<0 79 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "swr_master_irq", "swr_wake_irq";
-			qcom,swr-wakeup-required = <1>;
-			qcom,swr-num-ports = <3>;
-			qcom,swr-port-mapping = <1 ADC1 0x1>, <1 ADC2 0x2>,
-				<1 ADC3 0x4>, <1 ADC4 0x8>,
-				<2 DMIC0 0x1>, <2 DMIC1 0x2>,
-				<2 DMIC2 0x4>, <2 DMIC3 0x8>,
-				<3 DMIC4 0x1>, <3 DMIC5 0x2>,
-				<3 DMIC6 0x4>, <3 DMIC7 0x8>;
-			qcom,swr-num-dev = <1>;
-			qcom,swr-clock-stop-mode0 = <1>;
-			qcom,swr-mstr-irq-wakeup-capable = <1>;
-		};
-	};
-};
-
 &monaco_snd {
 	qcom,model = "monaco-idp-wsa-snd-card";
 	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
 	qcom,wcn-btfm = <1>;
 	qcom,va-bolero-codec = <1>;
 	qcom,audio-routing =
-		"TX DMIC0", "Digital Mic0",
-		"Digital Mic0", "MIC BIAS1",
-		"TX DMIC1", "Digital Mic1",
-		"Digital Mic1", "MIC BIAS1",
-		"TX DMIC2", "Digital Mic2",
-		"Digital Mic2", "MIC BIAS2",
-		"TX DMIC3", "Digital Mic3",
-		"Digital Mic3", "MIC BIAS2",
 		"SpkrLeft IN", "AUX_OUT",
 		"TX SWR_INPUT", "VA_TX_SWR_CLK",
 		"RX_TX DEC0_INP", "TX DEC0 MUX",
@@ -286,18 +76,7 @@
 		"VA SWR_INPUT", "VA_SWR_CLK",
 		"VA_AIF1 CAP", "VA_SWR_CLK",
 		"VA_AIF2 CAP", "VA_SWR_CLK",
-		"VA_AIF3 CAP", "VA_SWR_CLK",
-		"VA DMIC0", "Digital Mic0",
-		"VA DMIC1", "Digital Mic1",
-		"VA DMIC2", "Digital Mic2",
-		"VA DMIC3", "Digital Mic3",
-		"VA DMIC0", "VA MIC BIAS1",
-		"VA DMIC1", "VA MIC BIAS1",
-		"VA DMIC2", "VA MIC BIAS2",
-		"VA DMIC3", "VA MIC BIAS2";
-
-	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
-	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
+		"VA_AIF3 CAP", "VA_SWR_CLK";
 
 	nvmem-cells = <&adsp_variant>;
 	nvmem-cell-names = "adsp_variant";
@@ -310,67 +89,3 @@
 	qcom,msm_audio_ssr_devs = <&audio_gpr>, <&bolero>, <&lpi_tlmm>;
 };
 
-&soc {
-	audio_pkt_core_platform: qcom,audio-pkt-core-platform {
-		compatible = "qcom,audio-pkt-core-platform";
-	};
-
-	wsa_spkr_en: wsa_spkr_en_pinctrl {
-		compatible = "qcom,msm-cdc-pinctrl";
-		pinctrl-names = "aud_active", "aud_sleep";
-		pinctrl-0 = <&spkr_1_sd_n_active>;
-		pinctrl-1 = <&spkr_1_sd_n_sleep>;
-	};
-
-	clock_audio_rx_1: rx_core_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_4>;
-		qcom,codec-lpass-ext-clk-freq = <22579200>;
-		qcom,codec-lpass-clk-id = <0x30E>;
-		#clock-cells = <1>;
-	};
-
-	clock_audio_rx_2: rx_npl_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_5>;
-		qcom,codec-lpass-ext-clk-freq = <22579200>;
-		qcom,codec-lpass-clk-id = <0x30F>;
-		#clock-cells = <1>;
-	};
-
-	clock_audio_tx_1: tx_core_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_6>;
-		qcom,codec-lpass-ext-clk-freq = <19200000>;
-		qcom,codec-lpass-clk-id = <0x30C>;
-		#clock-cells = <1>;
-	};
-
-	clock_audio_tx_2: tx_npl_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_7>;
-		qcom,codec-lpass-ext-clk-freq = <19200000>;
-		qcom,codec-lpass-clk-id = <0x30D>;
-		#clock-cells = <1>;
-	};
-
-	clock_audio_va_1: va_core_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK>;
-		qcom,codec-lpass-ext-clk-freq = <19200000>;
-		qcom,codec-lpass-clk-id = <0x307>;
-		#clock-cells = <1>;
-	};
-
-	clock_audio_va_2: va_npl_clk {
-		compatible = "qcom,audio-ref-clk";
-		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_8>;
-		qcom,codec-lpass-ext-clk-freq = <19200000>;
-		qcom,codec-lpass-clk-id = <0x308>;
-		#clock-cells = <1>;
-	};
-};
-
-&va_cdc_dma_0_tx {
-	qcom,msm-dai-is-island-supported = <1>;
-};