Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c33e33a authored by Aditya Bavanari's avatar Aditya Bavanari
Browse files

ARM: dts: msm: Update audio routing for atoll target 



Update audio routing for atoll target in default
and wcd937x variant. Add support for multi display
port in atoll target.

Change-Id: I049f8f6a4afec7ce74fabcc050f46fd8edbae07d
Signed-off-by: default avatarAditya Bavanari <abavanar@codeaurora.org>
parent 7c3314cd

arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ 
		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;

		qcom,cdc-micbias3-mv = <1800>;

		qcom,cdc-micbias4-mv = <1800>;



		qcom,cdc-static-supplies = "cdc-vdd-rxtx",

					   "cdc-vddio",
@@ -328,6 +329,9 @@ 
		"RX_TX DEC3_INP", "TX DEC3 MUX",

		"SpkrLeft IN", "WSA_SPK1 OUT",

		"SpkrRight IN", "WSA_SPK2 OUT",

		"VA_AIF1 CAP", "VA_SWR_CLK",

		"VA_AIF2 CAP", "VA_SWR_CLK",

		"VA_AIF3 CAP", "VA_SWR_CLK",

		"VA MIC BIAS3", "Digital Mic0",

		"VA MIC BIAS3", "Digital Mic1",

		"VA MIC BIAS1", "Digital Mic2",
@@ -379,8 +383,8 @@ 
				  "SpkrLeft", "SpkrRight";

	qcom,codec-max-aux-devs = <1>;

	qcom,codec-aux-devs = <&wcd938x_codec>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&bolero>,

				  <&lpi_tlmm>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>,

				  <&lpi_tlmm>, <&bolero>;

};



&q6core {

arch/arm64/boot/dts/qcom/atoll-audio.dtsi

+11 −2
Original line number Diff line number Diff line
@@ -28,6 +28,15 @@ 
		qcom,clk-div = <192>;

		qcom,clk-mult = <10>;

	};



	dai_dp1: qcom,msm-dai-q6-dp1 {

		compatible = "qcom,msm-dai-q6-hdmi";

		qcom,msm-dai-q6-dev-id = <1>;

	};

};



&dai_dp {

	qcom,msm-dai-q6-dev-id = <0>;

};



&audio_apr {
@@ -94,7 +103,7 @@ 
				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_dp>,

		asoc-cpu = <&dai_dp>, <&dai_dp1>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,
@@ -126,7 +135,7 @@ 
				<&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-dp.24608",

		asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-dp.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

arch/arm64/boot/dts/qcom/atoll-wcd937x-idp-audio-overlay.dtsi

+11 −12
Original line number Diff line number Diff line
@@ -77,18 +77,17 @@ 
		"RX_TX DEC3_INP", "TX DEC3 MUX",

		"SpkrLeft IN", "WSA_SPK1 OUT",

		"SpkrRight IN", "WSA_SPK2 OUT",

		"VA MIC BIAS3", "Digital Mic0",

		"VA MIC BIAS3", "Digital Mic1",

		"VA MIC BIAS1", "Digital Mic2",

		"VA MIC BIAS1", "Digital Mic3",

		"VA MIC BIAS4", "Digital Mic4",

		"VA MIC BIAS4", "Digital Mic5",

		"VA DMIC0", "VA MIC BIAS3",

		"VA DMIC1", "VA MIC BIAS3",

		"VA DMIC2", "VA MIC BIAS1",

		"VA DMIC3", "VA MIC BIAS1",

		"VA DMIC4", "VA MIC BIAS4",

		"VA DMIC5", "VA MIC BIAS4",

		"VA_AIF1 CAP", "VA_SWR_CLK",

		"VA_AIF2 CAP", "VA_SWR_CLK",

		"VA_AIF3 CAP", "VA_SWR_CLK",

		"VA MIC BIAS1", "Digital Mic0",

		"VA MIC BIAS1", "Digital Mic1",

		"VA MIC BIAS3", "Digital Mic2",

		"VA MIC BIAS3", "Digital Mic3",

		"VA DMIC0", "VA MIC BIAS1",

		"VA DMIC1", "VA MIC BIAS1",

		"VA DMIC2", "VA MIC BIAS3",

		"VA DMIC3", "VA MIC BIAS3",

		"VA SWR_ADC0", "VA_SWR_CLK",

		"VA SWR_ADC1", "VA_SWR_CLK",

		"VA SWR_ADC2", "VA_SWR_CLK",