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

Commit a28ee7ed 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" into msm-4.19

parents a95244b5 4194c0f1

qcom/msm-audio.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -352,6 +352,16 @@ 
			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";

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

qcom/sdm660-audio.dtsi

+8 −4
Original line number Diff line number Diff line
@@ -85,7 +85,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",
@@ -107,7 +108,8 @@ 
				"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.36929",

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

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

			<&pmic_analog_codec>, <&msm_sdw_codec>,

			<&ext_disp_audio_codec>;
@@ -193,7 +195,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", "msm-dai-q6-mi2s.4",
@@ -218,7 +221,8 @@ 
				"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.36929",

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

		asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;

		asoc-codec-names = "msm-stub-codec.1",

				"msm-ext-disp-audio-codec-rx";