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

Commit 3b275fa8 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 bdef63d1 94b224ce

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-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
@@ -286,6 +286,15 @@ 
			compatible = "qcom,msm-dai-q6-dev";

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

		};

		proxy_rx: qcom,msm-dai-q6-proxy-rx {

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

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

		};



		proxy_tx: qcom,msm-dai-q6-proxy-tx {

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

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

		};



		usb_audio_rx: qcom,msm-dai-q6-usb-audio-rx {

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

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

+10 −4
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
			<&sb_4_rx>, <&sb_4_tx>, <&sb_5_rx>, <&sb_5_tx>,

			<&sb_6_rx>, <&sb_7_rx>, <&sb_7_tx>,

			<&sb_8_rx>, <&sb_8_tx>,

			<&proxy_rx>, <&proxy_tx>,

			<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

			<&afe_proxy_tx>, <&incall_record_rx>,

			<&incall_record_tx>, <&incall_music_rx>,
@@ -92,6 +93,7 @@ 
			"msm-dai-q6-dev.16396",

			"msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399",

			"msm-dai-q6-dev.16400", "msm-dai-q6-dev.16401",

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

			"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",
@@ -143,7 +145,8 @@ 
			<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

			<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

			<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>;

			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,

			<&proxy_rx>, <&proxy_tx>;

		asoc-cpu-names = "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",
@@ -168,7 +171,8 @@ 
			"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

			"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

			"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

			"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929";

			"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929",

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

	};



	int_codec: sound {
@@ -208,7 +212,8 @@ 
			<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

			<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

			<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>;

			<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,

			<&proxy_rx>, <&proxy_tx>;

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

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

			"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -230,7 +235,8 @@ 
			"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

			"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

			"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

			"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929";

			"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929",

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

	};



	cpe: qcom,msm-cpe-lsm {