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

Commit 87b457f0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: Change Media9 to LowLatency Loopback in auto mach drv"

parents 8e3f6393 b271b870

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

+9 −2
Original line number Diff line number Diff line
@@ -620,13 +620,15 @@ 


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

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

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

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

				<&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-compr-dsp",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -668,6 +670,11 @@ 
		vin-supply = <&vph_pwr_vreg>;

	};



	loopback1: qcom,msm-pcm-loopback-low-latency {

		compatible = "qcom,msm-pcm-loopback";

		qcom,msm-pcm-loopback-low-latency;

	};



	qcom,msm-dai-mi2s {

		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

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

+9 −2
Original line number Diff line number Diff line
@@ -863,13 +863,15 @@ 


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

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

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

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

				<&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-compr-dsp",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -910,6 +912,11 @@ 
		interrupt-names = "vbus_det_irq";

	};



	loopback1: qcom,msm-pcm-loopback-low-latency {

		compatible = "qcom,msm-pcm-loopback";

		qcom,msm-pcm-loopback-low-latency;

	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			pinctrl-names = "default", "sleep";

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

+9 −2
Original line number Diff line number Diff line
@@ -634,13 +634,15 @@ 


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

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

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

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

				<&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-compr-dsp",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -681,6 +683,11 @@ 
		interrupt-names = "vbus_det_irq";

	};



	loopback1: qcom,msm-pcm-loopback-low-latency {

		compatible = "qcom,msm-pcm-loopback";

		qcom,msm-pcm-loopback-low-latency;

	};



	usb_vbus_vreg: usb_vbus_vreg {

		compatible = "regulator-fixed";

		regulator-name = "usb_vbus_vreg";

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

+9 −2
Original line number Diff line number Diff line
@@ -523,13 +523,15 @@ 


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

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

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

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

				<&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-compr-dsp",

				"msm-pcm-loopback.1";

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

				<&dai_mi2s>, <&dai_mi2s_quat>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,
@@ -563,6 +565,11 @@ 
		asoc-codec-names = "msm-stub-codec.1";

	};



	loopback1: qcom,msm-pcm-loopback-low-latency {

		compatible = "qcom,msm-pcm-loopback";

		qcom,msm-pcm-loopback-low-latency;

	};



	qcom,msm-dai-mi2s {

		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

sound/soc/msm/apq8096-auto.c

+3 −2
Original line number Diff line number Diff line
@@ -2538,10 +2538,10 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.be_id = MSM_FRONTEND_DAI_LSM8,

	},

	{

		.name = "MSM8996 Media9",

		.name = "MSM8996 LowLatency Loopback",

		.stream_name = "MultiMedia9",

		.cpu_dai_name = "MultiMedia9",

		.platform_name = "msm-pcm-dsp.0",

		.platform_name = "msm-pcm-loopback.1",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,
@@ -2550,6 +2550,7 @@ static struct snd_soc_dai_link apq8096_common_dai_links[] = { 
		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.ignore_suspend = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		/* this dainlink has playback support */

		.ignore_pmdown_time = 1,

		.be_id = MSM_FRONTEND_DAI_MULTIMEDIA9,