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

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

Merge "ARM: dts: msm: Enable display port for yupik"

parents 2e5edd4a fa8c2355

qcom/yupik-audio-overlay.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -368,10 +368,12 @@ 
	qcom,sec-mi2s-gpios = <&cdc_sec_mi2s_gpios>;

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

		      <&wcd937x_codec>,

		      <&wsa883x_0221>, <&wsa883x_0222>;

		      <&wsa883x_0221>, <&wsa883x_0222>,

		      <&ext_disp_audio_codec>;

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

			   "wcd937x_codec",

			   "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/yupik-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ 
		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,wcn-bt = <1>;

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

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

		qcom,afe-rxtx-lb = <0>;



		clock-names = "lpass_audio_hw_vote";

qcom/yupik-qrd.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -482,10 +482,12 @@ 


	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>;