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

Commit 63870d1a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable audio over display"

parents fc6d5587 7284a890

qcom/shima-audio-overlay.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ 
	qcom,wcn-bt = <1>;

	qcom,tdm-max-slots = <8>;

	qcom,wcd-disabled = <0>;

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

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

	qcom,audio-routing =

		"AMIC1", "Analog Mic1",

		"Analog Mic1", "MIC BIAS3",
@@ -310,10 +310,12 @@ 
	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;

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

		      <&wcd938x_codec>, <&swr_haptics>,

		      <&wsa883x_0221>, <&wsa883x_0222>;

		      <&wsa883x_0221>, <&wsa883x_0222>,

		      <&ext_disp_audio_codec>;

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

			   "wcd938x_codec", "swr-haptics",

			   "wsa-codec1", "wsa-codec2";

			   "wsa-codec1", "wsa-codec2",

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

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

	qcom,cps_reg_phy_addr = <0x3250300 0x3250304 0x3250318>;

	qcom,cps_wsa_vbatt_temp_reg_addr = <0x0003429 0x0003422>;

qcom/shima-qrd.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -293,10 +293,10 @@ 


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

		      <&wcd938x_codec>, <&swr_haptics>,

		      <&wsa883x_0222>;

		      <&wsa883x_0222>, <&ext_disp_audio_codec>;

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

			   "wcd938x_codec", "swr-haptics",

			   "wsa-codec2";

			   "wsa-codec2", "msm-ext-disp-audio-codec-rx";

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

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

				  <&bolero>;