Merge "ASoC: msm: Machine driver async ops change for msm8996" (f050280b) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8996.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -2019,6 +2019,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = {
		.cpu_dai_name = "MultiMedia1",
		.platform_name = "msm-pcm-dsp.0",
		.dynamic = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		@@ -2087,6 +2088,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = {
		.cpu_dai_name = "MultiMedia3",
		.platform_name = "msm-pcm-dsp.2",
		.dynamic = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
		.dpcm_playback = 1,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		SND_SOC_DPCM_TRIGGER_POST},
		@@ -2156,6 +2158,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = {
		.cpu_dai_name = "MultiMedia4",
		.platform_name = "msm-compress-dsp",
		.dynamic = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_HW_PARAMS,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
		@@ -2259,6 +2262,7 @@ static struct snd_soc_dai_link msm8996_common_dai_links[] = {
		.cpu_dai_name = "MultiMedia5",
		.platform_name = "msm-pcm-dsp.1",
		.dynamic = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE,
		.dpcm_playback = 1,
		.dpcm_capture = 1,
		.codec_dai_name = "snd-soc-dummy-dai",
		@@ -2954,6 +2958,8 @@ static struct snd_soc_dai_link msm8996_tomtom_be_dai_links[] = {
		.codec_name = "tomtom_codec",
		.codec_dai_name = "tomtom_rx1",
		.no_pcm = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE \|
		ASYNC_DPCM_SND_SOC_HW_PARAMS,
		.dpcm_playback = 1,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_0_RX,
		.init = &msm_audrx_init,
		@@ -2971,6 +2977,8 @@ static struct snd_soc_dai_link msm8996_tomtom_be_dai_links[] = {
		.codec_name = "tomtom_codec",
		.codec_dai_name = "tomtom_tx1",
		.no_pcm = 1,
		.async_ops = ASYNC_DPCM_SND_SOC_PREPARE \|
		ASYNC_DPCM_SND_SOC_HW_PARAMS,
		.dpcm_capture = 1,
		.be_id = MSM_BACKEND_DAI_SLIMBUS_0_TX,
		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,