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

Commit 4ac01e4d 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: add noirq pcm platform driver on msm8996 auto"

parents 6d91eba6 866c951f

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -627,14 +627,14 @@ 


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

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -926,14 +926,14 @@ 


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

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

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

+2 −2
Original line number Diff line number Diff line
@@ -653,14 +653,14 @@ 


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

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -523,14 +523,14 @@ 


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

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,

				<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

				<&loopback1>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

				"msm-pcm-dsp.2", "msm-voip-dsp",

				"msm-pcm-voice", "msm-pcm-loopback",

				"msm-compress-dsp", "msm-pcm-hostless",

				"msm-pcm-afe", "msm-lsm-client",

				"msm-pcm-routing", "msm-compr-dsp",

				"msm-pcm-routing", "msm-pcm-dsp-noirq",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,

arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dts

+8 −6
Original line number Diff line number Diff line
@@ -63,14 +63,14 @@ 


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

			<&loopback>, <&compress>, <&hostless>,

			<&afe>, <&lsm>, <&routing>, <&compr>,

			<&afe>, <&lsm>, <&routing>, <&pcmnoirq>,

			<&loopback1>;

		asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

			"msm-pcm-dsp.2", "msm-voip-dsp",

			"msm-pcm-voice", "msm-pcm-loopback",

			"msm-compress-dsp", "msm-pcm-hostless",

			"msm-pcm-afe", "msm-lsm-client",

			"msm-pcm-routing", "msm-compr-dsp",

			"msm-pcm-routing", "msm-pcm-dsp-noirq",

			"msm-pcm-loopback.1";

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

			<&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
@@ -134,14 +134,16 @@ 
		compatible = "qcom,msm-pcm-routing";

	};



	compr: qcom,msm-compr-dsp {

		compatible = "qcom,msm-compr-dsp";

	};



	compress: qcom,msm-compress-dsp {

		compatible = "qcom,msm-compress-dsp";

	};



	pcmnoirq: qcom,msm-pcm-dsp-noirq {

		compatible = "qcom,msm-pcm-dsp-noirq";

		qcom,msm-pcm-low-latency;

		qcom,latency-level = "ultra";

	};



	voip: qcom,msm-voip-dsp {

		compatible = "qcom,msm-voip-dsp";

	};