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

Commit d1a5c038 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 HDMI audio support for 8996"

parents f5704ee3 f32a4e2d

arch/arm/boot/dts/qcom/msm8996-cdp.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -680,8 +680,9 @@ 
	sound-9335 {

		qcom,model = "msm8996-tasha-cdp-snd-card";

		qcom,hdmi-audio-rx;

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

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

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

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

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

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

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

		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ 
	sound-9335 {

		qcom,model = "msm8996-tasha-mtp-snd-card";

		qcom,tdm-audio-intf;

		qcom,hdmi-audio-rx;



		qcom,audio-routing =

			"AIF4 VI", "MCLK",
@@ -738,9 +739,9 @@ 
			"MIC BIAS4", "Digital Mic5",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";



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

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

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

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

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

		asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>,

				<&dai_hdmi>, <&dai_mi2s>,

				<&sb_0_rx>, <&sb_0_tx>,