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

Commit 8224a40d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Add device nodes for second AFE rx and proxy tx devices"

parents 26c309a5 af4d2b1f

qcom/sa6155-audio.dtsi

+20 −4
Original line number Diff line number Diff line
@@ -458,6 +458,20 @@ 
		pinctrl-1 = <&pri_aux_pcm_sck_sleep &pri_aux_pcm_ws_sleep

			&pri_aux_pcm_data0_sleep &pri_aux_pcm_data1_sleep>;

	};



qcom,msm-dai-q6 {

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



		afe_pcm_rx_1: qcom,msm-dai-q6-be-afe-pcm-rx-1 {

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

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

		};



		afe_proxy_tx_1: qcom,msm-dai-q6-afe-proxy-tx-1 {

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

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

		};

	};

};



&audio_apr {
@@ -496,10 +510,11 @@ 
				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_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>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&afe_pcm_rx_1>, <&afe_proxy_tx_1>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music_2_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,

				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,
@@ -533,6 +548,7 @@ 
				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

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

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.226", "msm-dai-q6-dev.242",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

qcom/sa8155-audio.dtsi

+20 −4
Original line number Diff line number Diff line
@@ -461,6 +461,20 @@ 
		pinctrl-1 = <&pri_aux_pcm_clk_sleep &pri_aux_pcm_sync_sleep

			     &pri_aux_pcm_din_sleep &pri_aux_pcm_dout_sleep>;

	};



qcom,msm-dai-q6 {

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



		afe_pcm_rx_1: qcom,msm-dai-q6-be-afe-pcm-rx-1 {

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

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

		};



		afe_proxy_tx_1: qcom,msm-dai-q6-afe-proxy-tx-1 {

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

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

		};

	};

};



&audio_apr {
@@ -500,10 +514,11 @@ 
				<&dai_mi2s4>, <&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_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>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&afe_pcm_rx_1>, <&afe_proxy_tx_1>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music_2_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_rx_1>,

				<&dai_pri_tdm_rx_2>, <&dai_pri_tdm_rx_3>,
@@ -537,6 +552,7 @@ 
				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

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

				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.226", "msm-dai-q6-dev.242",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",