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

Commit d992124b 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: Add Slimbus6 playback dai-link"

parents cf412120 bb017be5

arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ 
				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>, <&sb_5_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>;

				<&usb_audio_rx>, <&usb_audio_tx>, <&sb_6_rx>;

		asoc-cpu-names = "msm-dai-q6-hdmi.8",

				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",

				"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",
@@ -180,7 +180,8 @@ 
				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673";

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-dev.16396";

		asoc-codec = <&stub_codec>;

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

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

sound/soc/msm/msmcobalt.c

+16 −0
Original line number Diff line number Diff line
@@ -3127,6 +3127,22 @@ static struct snd_soc_dai_link msm_tavil_be_dai_links[] = { 
		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,

	},

	{

		.name = LPASS_BE_SLIMBUS_6_RX,

		.stream_name = "Slimbus6 Playback",

		.cpu_dai_name = "msm-dai-q6-dev.16396",

		.platform_name = "msm-pcm-routing",

		.codec_name = "tavil_codec",

		.codec_dai_name = "tavil_rx4",

		.no_pcm = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_6_RX,

		.be_hw_params_fixup = msm_be_hw_params_fixup,

		.ops = &msm_be_ops,

		/* dai link has playback support */

		.ignore_pmdown_time = 1,

		.ignore_suspend = 1,

	},

};



static struct snd_soc_dai_link msm_wcn_be_dai_links[] = {