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

Commit 9afd1039 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: Enable audio over DP for sdm670"

parents efc44dfe 344bd2a7

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

+6 −4
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
	qcom,hph-en0-gpio = <&tavil_hph_en0>;

	qcom,hph-en1-gpio = <&tavil_hph_en1>;

	qcom,msm-mclk-freq = <9600000>;

	asoc-codec = <&stub_codec>;

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

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

	asoc-codec-names = "msm-stub-codec.1", "msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,

		<&wsa881x_0213>, <&wsa881x_0214>;
@@ -100,9 +100,11 @@ 
	qcom,cdc-dmic-gpios = <&cdc_dmic_gpios>;



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

		     <&pmic_analog_codec>, <&msm_sdw_codec>;

		     <&pmic_analog_codec>, <&msm_sdw_codec>,

		     <&ext_disp_audio_codec>;

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

			   "analog-codec", "msm_sdw_codec";

			   "analog-codec", "msm_sdw_codec",

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



	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_211_en>, <&wsa881x_212_en>,

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

+8 −4
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
		qcom,wcn-btfm;

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,ext-disp-audio-rx;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

			<&loopback>, <&compress>, <&hostless>,

			<&afe>, <&lsm>, <&routing>, <&cpe>, <&compr>,
@@ -50,7 +51,7 @@ 
			"msm-pcm-afe", "msm-lsm-client",

			"msm-pcm-routing", "msm-cpe-lsm",

			"msm-compr-dsp", "msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

		asoc-cpu = <&dai_dp>, <&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s4>,

			<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,

			<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
@@ -70,7 +71,8 @@ 
			<&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>;

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

		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",

			"msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
@@ -102,6 +104,7 @@ 
		compatible = "qcom,sdm670-asoc-snd";

		qcom,model = "sdm670-mtp-snd-card";

		qcom,wcn-btfm;

		qcom,ext-disp-audio-rx;

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
@@ -115,7 +118,7 @@ 
			"msm-pcm-afe", "msm-lsm-client",

			"msm-pcm-routing", "msm-compr-dsp",

			"msm-pcm-dsp-noirq";

		asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

		asoc-cpu = <&dai_dp>, <&dai_mi2s0>, <&dai_mi2s1>,

			<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s4>,

			<&dai_int_mi2s0>, <&dai_int_mi2s1>,

			<&dai_int_mi2s2>, <&dai_int_mi2s3>,
@@ -134,7 +137,8 @@ 
			<&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>;

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

		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",

			"msm-dai-q6-mi2s.7", "msm-dai-q6-mi2s.8",

arch/arm64/boot/dts/qcom/sdm670-rumi.dts

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "sdm670.dtsi"

#include "sdm670-rumi.dtsi"

#include "sdm670-audio-overlay.dtsi"

/ {

	model = "Qualcomm Technologies, Inc. SDM670 RUMI";

	compatible = "qcom,sdm670-rumi", "qcom,sdm670", "qcom,rumi";