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

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

Merge "ARM: dts: qcom: Update Audio dtsi entries"

parents 04279216 16afe50b

qcom/sdxlemur-audio-overlay.dtsi

+6 −5
Original line number Diff line number Diff line
@@ -24,22 +24,23 @@ 
		"DMIC4", "MIC BIAS4",

		"DMIC5", "Digital Mic5",

		"DMIC5", "MIC BIAS4",

		"SpkrLeft IN", "SPK2 OUT";

		"SpkrLeft IN", "SPK1 OUT";



	qcom,msm-mbhc-hphl-swh = <1>;

	qcom,msm-mbhc-gnd-swh = <1>;

	qcom,msm-mbhc-hs-mic-max-threshold-mv = <1700>;

	qcom,msm-mbhc-hs-mic-min-threshold-mv = <50>;

	qcom,cdc-ext-clk-rate = <19200000>;

	qcom,tavil-mclk-clk-freq = <12288000>;

	qcom,cdc-ext-clk-rate = <9600000>;

	qcom,tavil-mclk-clk-freq = <9600000>;



	asoc-codec = <&stub_codec>;

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

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

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



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

	qcom,swr-num-dev = <1>;

	qcom,wsa-devs = <&wsa881x_0214>;

	qcom,wsa-aux-dev-prefix = "SpkrLeft";

	qcom,msm_audio_ssr_devs = <&audio_gpr>, <&wcd934x_cdc>;

};



&soc {

qcom/sdxlemur-audio.dtsi

+1 −4
Original line number Diff line number Diff line
@@ -4,10 +4,7 @@ 
	snd_934x: sound-tavil {

		compatible = "qcom,sdx-asoc-snd-tavil";

		qcom,model = "sdx-tavil-i2s-snd-card";

		qcom,prim_mi2s_aux_master = <&prim_master>;

		qcom,prim_mi2s_aux_slave = <&prim_slave>;

		qcom,sec_mi2s_aux_master = <&sec_master>;

		qcom,sec_mi2s_aux_slave = <&sec_slave>;

		qcom,prim_mi2s_master = <&prim_master>;



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

				<&loopback>, <&hostless>, <&afe>, <&routing>,

qcom/sdxlemur-blsp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 
		pinctrl-names = "i2c_active", "i2c_sleep";

		pinctrl-0 = <&i2c_3_active>;

		pinctrl-1 = <&i2c_3_sleep>;

		status = "disabled";

		status = "ok";

	};



	i2c_4: i2c@838000 { /* BLSP1 QUP4: GPIO: 84,85 */

qcom/sdxlemur.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


		audio_mem: audio_region@0 {

			compatible = "shared-dma-pool";

			alloc-ranges = <0 0x00000000 0 0xffffffff>;

			alloc-ranges = <0x00000000 0xffffffff>;

			reusable;

			size = <0x400000>;

		};
@@ -683,7 +683,7 @@ 
						0x4400 2>;

			};



			qcom,gpr {

			audio_gpr: qcom,gpr {

				compatible = "qcom,gpr";

				qcom,glink-channels = "modem_apps";

				qcom,intents = <0x200 20>;