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

Commit 4f5a0984 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for audio over display port for sm6150"

parents d5df5c28 010b7db9

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

+4 −2
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ 
&sm6150_snd {

	qcom,model = "sm6150-idp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Analog Mic2",
@@ -230,8 +231,9 @@ 
	qcom,msm-mbhc-gnd-swh = <1>;

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

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

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

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

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

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

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

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

			<&wsa881x_0213>, <&wsa881x_0214>;

arch/arm64/boot/dts/qcom/sm6150-external-codec.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
&sm6150_snd {

	qcom,model = "sm6150-tavil-snd-card";

	qcom,tavil_codec = <1>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AIF4 VI", "MCLK",

		"RX_BIAS", "MCLK",
@@ -91,8 +92,8 @@ 
		"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";

	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,hph-en0-gpio = <&tavil_hph_en0>;

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

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