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

Commit ade05ea5 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: modify dai link according to the dai driver"

parents bf1e9033 8fdb762e

sound/soc/msm/msm8952-dai-links.c

+0 −10
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ static struct snd_soc_dai_link msm8952_tasha_fe_dai[] = { 
		.codec_dai_name = "tasha_rx2",

		.ignore_suspend = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.no_host_mode = SND_SOC_DAI_LINK_NO_HOST,

		.ops = &msm8952_slimbus_2_be_ops,

	},
@@ -243,7 +242,6 @@ static struct snd_soc_dai_link msm8952_tasha_be_dai[] = { 
		.codec_dai_name = "tasha_tx1",

		.no_pcm = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.be_id = MSM_BACKEND_DAI_SLIMBUS_3_TX,

		.be_hw_params_fixup = msm_slim_0_tx_be_hw_params_fixup,

		.ops = &msm8952_slimbus_be_ops,
@@ -873,7 +871,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name   = "MultiMedia7",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",
@@ -938,7 +935,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia10",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -955,7 +951,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia11",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -972,7 +967,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia12",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -989,7 +983,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia13",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -1006,7 +999,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia14",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -1023,7 +1015,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia15",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},
@@ -1040,7 +1031,6 @@ static struct snd_soc_dai_link msm8952_common_fe_dai[] = { 
		.cpu_dai_name	= "MultiMedia16",

		.platform_name  = "msm-compress-dsp",

		.dynamic = 1,

		.dpcm_capture = 1,

		.dpcm_playback = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			 SND_SOC_DPCM_TRIGGER_POST},

sound/soc/msm/msm8952.c

+0 −1
Original line number Diff line number Diff line
@@ -1954,7 +1954,6 @@ static struct snd_soc_dai_link msm8952_dai[] = { 
		.cpu_dai_name = "LSM1",

		.platform_name = "msm-lsm-client",

		.dynamic = 1,

		.dpcm_playback = 1,

		.dpcm_capture = 1,

		.trigger = {SND_SOC_DPCM_TRIGGER_POST,

			SND_SOC_DPCM_TRIGGER_POST },