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

Commit 390fd0c3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add CPU dai for additional proxy ports"

parents 00c98a0a e84ae141

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

+9 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -101,7 +101,8 @@ 
			<&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>;

			<&incall_music_rx>, <&incall_music_2_rx>,

			<&proxy_rx>, <&proxy_tx>;



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

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
@@ -116,7 +117,8 @@ 
				"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.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";



		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

				<&pmic_analog_codec>;
@@ -261,7 +263,8 @@ 
				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music_2_rx>,

				<&sb_5_rx>, <&bt_sco_rx>, <&bt_sco_tx>,

				<&int_fm_rx>, <&int_fm_tx>, <&sb_6_rx>;

				<&int_fm_rx>, <&int_fm_tx>, <&sb_6_rx>,

				<&proxy_rx>, <&proxy_tx>;



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

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -277,7 +280,8 @@ 
				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.16394", "msm-dai-q6-dev.12288",

				"msm-dai-q6-dev.12289", "msm-dai-q6-dev.12292",

				"msm-dai-q6-dev.12293", "msm-dai-q6-dev.16396";

				"msm-dai-q6-dev.12293", "msm-dai-q6-dev.16396",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";



		qcom,cdc-us-euro-gpios = <&tlmm 63 0>;

		qcom,msm-mbhc-hphl-swh = <0>;

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

+5 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -96,7 +96,8 @@ 
			<&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>;

			<&incall_music_rx>, <&incall_music_2_rx>,

			<&proxy_rx>, <&proxy_tx>;



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

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
@@ -111,7 +112,8 @@ 
				"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.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";



		asoc-codec = <&stub_codec>, <&msm_digital_codec>,

				<&pmic_analog_codec>;