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

Commit 464c6191 authored by Honghao Liu's avatar Honghao Liu
Browse files

ARM: dts: msm: add support for secondary MI2S on msm8996 adp/cdp 



Update secondary MI2S DAI entry to use SD0 for TX path and SD1
for RX path, and add secondary MI2S DAI in the automotive sound
card entry for msm8996 automotive ADP/CDP platforms.

CRs-fixed: 1087945
Change-Id: I7c29aa605549f54339b108beae39a4e8816ac6dd
Signed-off-by: default avatarHonghao Liu <honghaol@codeaurora.org>
parent c8234f7c

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+12 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -696,7 +696,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

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

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -728,6 +728,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -971,7 +971,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

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

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -1003,6 +1003,8 @@ 


	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+12 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -759,7 +759,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

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

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -805,6 +805,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+12 −2
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ 
				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-loopback.1";

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,
@@ -547,7 +547,7 @@ 
				<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,

				<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;

		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",

				"msm-dai-q6-hdmi.8",

				"msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",

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

				"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@@ -571,6 +571,16 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			qcom,msm-mi2s-rx-lines = <2>;

			qcom,msm-mi2s-tx-lines = <1>;

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;