Merge "ARM: dts: msm: Update audio routing for atoll target" (0fbcbafd) · Commits · e / devices / android_kernel_xiaomi_nabu

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 {

+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",

+11 −12