mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-17 16:00:38 -05:00
ASoC: intel: boards: remove dpcm_xxx flags
dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to xxx_only if needed. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://patch.msgid.link/877ca29vh9.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
committed by
Mark Brown
parent
44b6f24018
commit
ae0967da4b
@@ -239,8 +239,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
|
||||
SND_SOC_DPCM_TRIGGER_POST,
|
||||
SND_SOC_DPCM_TRIGGER_POST
|
||||
},
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(fe, dummy, platform),
|
||||
},
|
||||
|
||||
@@ -256,8 +254,6 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
|
||||
.ignore_pmdown_time = 1,
|
||||
.be_hw_params_fixup = broadwell_ssp0_fixup,
|
||||
.ops = &bdw_rt5650_ops,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = bdw_rt5650_init,
|
||||
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
|
||||
},
|
||||
|
||||
@@ -329,8 +329,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
|
||||
SND_SOC_DPCM_TRIGGER_POST,
|
||||
SND_SOC_DPCM_TRIGGER_POST
|
||||
},
|
||||
.dpcm_capture = 1,
|
||||
.dpcm_playback = 1,
|
||||
.ops = &bdw_rt5677_fe_ops,
|
||||
SND_SOC_DAILINK_REG(fe, dummy, platform),
|
||||
},
|
||||
@@ -356,8 +354,6 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
|
||||
.ignore_pmdown_time = 1,
|
||||
.be_hw_params_fixup = broadwell_ssp0_fixup,
|
||||
.ops = &bdw_rt5677_ops,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = bdw_rt5677_init,
|
||||
.exit = bdw_rt5677_exit,
|
||||
SND_SOC_DAILINK_REG(ssp0_port, be, platform),
|
||||
|
||||
@@ -133,8 +133,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(system, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -143,7 +141,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
SND_SOC_DAILINK_REG(offload0, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -152,7 +150,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
SND_SOC_DAILINK_REG(offload1, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -161,7 +159,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_capture = 1,
|
||||
.capture_only = 1,
|
||||
SND_SOC_DAILINK_REG(loopback, dummy, platform),
|
||||
},
|
||||
/* Back End DAI links */
|
||||
@@ -177,8 +175,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.ignore_pmdown_time = 1,
|
||||
.be_hw_params_fixup = codec_link_hw_params_fixup,
|
||||
.ops = &codec_link_ops,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -175,8 +175,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &byt_cht_cx2072x_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -185,7 +183,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &byt_cht_cx2072x_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -198,8 +196,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.init = byt_cht_cx2072x_init,
|
||||
.be_hw_params_fixup = byt_cht_cx2072x_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -174,8 +174,6 @@ static struct snd_soc_dai_link dailink[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -184,7 +182,7 @@ static struct snd_soc_dai_link dailink[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -197,8 +195,6 @@ static struct snd_soc_dai_link dailink[] = {
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -315,8 +315,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &byt_cht_es8316_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -326,7 +324,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &byt_cht_es8316_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -339,8 +337,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = byt_cht_es8316_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = byt_cht_es8316_init,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -119,8 +119,6 @@ static struct snd_soc_dai_link dais[] = {
|
||||
.ignore_suspend = 1,
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -130,7 +128,7 @@ static struct snd_soc_dai_link dais[] = {
|
||||
.ignore_suspend = 1,
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -144,8 +142,6 @@ static struct snd_soc_dai_link dais[] = {
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = codec_fixup,
|
||||
.ignore_suspend = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, dummy, platform),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1546,8 +1546,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
|
||||
.stream_name = "Baytrail Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &byt_rt5640_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -1556,7 +1554,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &byt_rt5640_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -1568,8 +1566,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = byt_rt5640_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = byt_rt5640_init,
|
||||
.exit = byt_rt5640_exit,
|
||||
.ops = &byt_rt5640_be_ssp2_ops,
|
||||
|
||||
@@ -770,8 +770,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &byt_rt5651_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -780,7 +778,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &byt_rt5651_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -793,8 +791,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = byt_rt5651_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = byt_rt5651_init,
|
||||
.ops = &byt_rt5651_be_ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
|
||||
@@ -462,8 +462,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
|
||||
.stream_name = "Baytrail Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &byt_wm5102_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
|
||||
@@ -473,7 +471,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &byt_wm5102_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -490,8 +488,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
|
||||
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.be_hw_params_fixup = byt_wm5102_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.init = byt_wm5102_init,
|
||||
SND_SOC_DAILINK_REG(ssp0_port, ssp0_codec, platform),
|
||||
},
|
||||
|
||||
@@ -351,8 +351,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -361,7 +359,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -374,8 +372,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.init = cht_codec_init,
|
||||
.be_hw_params_fixup = cht_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_be_ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -193,8 +193,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -217,8 +215,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
| SND_SOC_DAIFMT_CBC_CFC,
|
||||
.init = cht_codec_init,
|
||||
.be_hw_params_fixup = cht_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_be_ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -448,8 +448,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -458,7 +456,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -470,8 +468,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.no_pcm = 1,
|
||||
.init = cht_codec_init,
|
||||
.be_hw_params_fixup = cht_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_be_ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -358,8 +358,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(media, dummy, platform),
|
||||
},
|
||||
@@ -368,7 +366,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.stream_name = "Deep-Buffer Audio",
|
||||
.nonatomic = true,
|
||||
.dynamic = 1,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.ops = &cht_aif1_ops,
|
||||
SND_SOC_DAILINK_REG(deepbuffer, dummy, platform),
|
||||
},
|
||||
@@ -381,8 +379,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
|
||||
.no_pcm = 1,
|
||||
.init = cht_codec_init,
|
||||
.be_hw_params_fixup = cht_codec_fixup,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &cht_be_ssp2_ops,
|
||||
SND_SOC_DAILINK_REG(ssp2_port, ssp2_codec, platform),
|
||||
},
|
||||
|
||||
@@ -178,8 +178,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "SSP0-Codec",
|
||||
.id = 0,
|
||||
.no_pcm = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &rt5660_ops,
|
||||
SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform),
|
||||
},
|
||||
@@ -187,7 +185,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "dmic48k",
|
||||
.id = 1,
|
||||
.ignore_suspend = 1,
|
||||
.dpcm_capture = 1,
|
||||
.capture_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),
|
||||
},
|
||||
@@ -195,7 +193,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "dmic16k",
|
||||
.id = 2,
|
||||
.ignore_suspend = 1,
|
||||
.dpcm_capture = 1,
|
||||
.capture_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
|
||||
},
|
||||
@@ -203,7 +201,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "iDisp1",
|
||||
.id = 5,
|
||||
.init = hdmi_init,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(idisp1_pin, idisp1_codec, platform),
|
||||
},
|
||||
@@ -211,7 +209,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "iDisp2",
|
||||
.id = 6,
|
||||
.init = hdmi_init,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(idisp2_pin, idisp2_codec, platform),
|
||||
},
|
||||
@@ -219,7 +217,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "iDisp3",
|
||||
.id = 7,
|
||||
.init = hdmi_init,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(idisp3_pin, idisp3_codec, platform),
|
||||
},
|
||||
@@ -227,7 +225,7 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
|
||||
.name = "iDisp4",
|
||||
.id = 8,
|
||||
.init = hdmi_init,
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
.no_pcm = 1,
|
||||
SND_SOC_DAILINK_REG(idisp4_pin, idisp4_codec, platform),
|
||||
},
|
||||
|
||||
@@ -85,8 +85,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(system, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -95,7 +93,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
SND_SOC_DAILINK_REG(offload0, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -104,7 +102,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_playback = 1,
|
||||
.playback_only = 1,
|
||||
SND_SOC_DAILINK_REG(offload1, dummy, platform),
|
||||
},
|
||||
{
|
||||
@@ -113,7 +111,7 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.nonatomic = 1,
|
||||
.dynamic = 1,
|
||||
.trigger = {SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
|
||||
.dpcm_capture = 1,
|
||||
.capture_only = 1,
|
||||
SND_SOC_DAILINK_REG(loopback, dummy, platform),
|
||||
},
|
||||
/* Back End DAI links */
|
||||
@@ -127,8 +125,6 @@ static struct snd_soc_dai_link card_dai_links[] = {
|
||||
.ignore_pmdown_time = 1,
|
||||
.be_hw_params_fixup = codec_link_hw_params_fixup,
|
||||
.ops = &codec_link_ops,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
SND_SOC_DAILINK_REG(ssp0_port, codec, platform),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -217,8 +217,6 @@ static int set_ssp_codec_link(struct device *dev, struct snd_soc_dai_link *link,
|
||||
|
||||
link->id = be_id;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->dpcm_playback = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -268,7 +266,7 @@ static int set_dmic_link(struct device *dev, struct snd_soc_dai_link *link,
|
||||
link->init = dmic_init;
|
||||
link->ignore_suspend = 1;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->capture_only = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -326,7 +324,7 @@ static int set_idisp_hdmi_link(struct device *dev, struct snd_soc_dai_link *link
|
||||
link->id = be_id;
|
||||
link->init = (hdmi_id == 1) ? hdmi_init : NULL;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_playback = 1;
|
||||
link->playback_only = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -361,13 +359,12 @@ static int set_ssp_amp_link(struct device *dev, struct snd_soc_dai_link *link,
|
||||
/* codecs - caller to handle */
|
||||
|
||||
/* platforms */
|
||||
/* feedback stream or firmware-generated echo reference */
|
||||
link->platforms = platform_component;
|
||||
link->num_platforms = ARRAY_SIZE(platform_component);
|
||||
|
||||
link->id = be_id;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1; /* feedback stream or firmware-generated echo reference */
|
||||
link->dpcm_playback = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -407,8 +404,6 @@ static int set_bt_offload_link(struct device *dev, struct snd_soc_dai_link *link
|
||||
|
||||
link->id = be_id;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->dpcm_playback = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -448,7 +443,7 @@ static int set_hdmi_in_link(struct device *dev, struct snd_soc_dai_link *link,
|
||||
|
||||
link->id = be_id;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->capture_only = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -496,8 +491,6 @@ static int set_hda_codec_link(struct device *dev, struct snd_soc_dai_link *link,
|
||||
if (be_type == SOF_HDA_ANALOG)
|
||||
link->init = hda_init;
|
||||
link->no_pcm = 1;
|
||||
link->dpcm_capture = 1;
|
||||
link->dpcm_playback = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -455,8 +455,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].exit = sof_es8316_exit;
|
||||
links[id].ops = &sof_es8336_ops;
|
||||
links[id].nonatomic = true;
|
||||
links[id].dpcm_playback = 1;
|
||||
links[id].dpcm_capture = 1;
|
||||
links[id].no_pcm = 1;
|
||||
links[id].cpus = &cpus[id];
|
||||
links[id].num_cpus = 1;
|
||||
@@ -496,7 +494,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].platforms = platform_component;
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].ignore_suspend = 1;
|
||||
links[id].dpcm_capture = 1;
|
||||
links[id].capture_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
|
||||
id++;
|
||||
@@ -539,7 +537,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].platforms = platform_component;
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].init = sof_hdmi_init;
|
||||
links[id].dpcm_playback = 1;
|
||||
links[id].playback_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
|
||||
id++;
|
||||
@@ -569,7 +567,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].num_codecs = 1;
|
||||
links[id].platforms = platform_component;
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].dpcm_capture = 1;
|
||||
links[id].capture_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
links[id].num_cpus = 1;
|
||||
id++;
|
||||
|
||||
@@ -246,12 +246,11 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].init = sof_pcm512x_codec_init;
|
||||
links[id].ops = &sof_pcm512x_ops;
|
||||
links[id].dpcm_playback = 1;
|
||||
/*
|
||||
* capture only supported with specific versions of the Hifiberry DAC+
|
||||
*/
|
||||
if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE)
|
||||
links[id].dpcm_capture = 1;
|
||||
if (!(sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE))
|
||||
links[id].playback_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
links[id].cpus = &cpus[id];
|
||||
links[id].num_cpus = 1;
|
||||
@@ -294,7 +293,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].platforms = platform_component;
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].ignore_suspend = 1;
|
||||
links[id].dpcm_capture = 1;
|
||||
links[id].capture_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
id++;
|
||||
}
|
||||
@@ -341,7 +340,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
|
||||
links[id].platforms = platform_component;
|
||||
links[id].num_platforms = ARRAY_SIZE(platform_component);
|
||||
links[id].init = sof_hdmi_init;
|
||||
links[id].dpcm_playback = 1;
|
||||
links[id].playback_only = 1;
|
||||
links[id].no_pcm = 1;
|
||||
id++;
|
||||
}
|
||||
|
||||
@@ -167,8 +167,6 @@ static struct snd_soc_dai_link dailink[] = {
|
||||
.name = "SSP5-Codec",
|
||||
.id = 0,
|
||||
.no_pcm = 1,
|
||||
.dpcm_playback = 1,
|
||||
.dpcm_capture = 1,
|
||||
.ops = &sof_wm8804_ops,
|
||||
SND_SOC_DAILINK_REG(ssp5_pin, ssp5_codec, platform),
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user