Commit 3b316e22 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown

ASoC: Intel: boards: remove .nonatomic for BE dailinks

Somehow with copy/paste and inertia we keep re-adding this field for
BE dailinks, when it's only required for hard-coded FE links.
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210505163705.305616-9-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 19f1eace
...@@ -198,7 +198,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { ...@@ -198,7 +198,6 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.init = byt_cht_cx2072x_init, .init = byt_cht_cx2072x_init,
.be_hw_params_fixup = byt_cht_cx2072x_fixup, .be_hw_params_fixup = byt_cht_cx2072x_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp2, cx2072x, platform), SND_SOC_DAILINK_REG(ssp2, cx2072x, platform),
......
...@@ -197,7 +197,6 @@ static struct snd_soc_dai_link dailink[] = { ...@@ -197,7 +197,6 @@ static struct snd_soc_dai_link dailink[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = codec_fixup, .be_hw_params_fixup = codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ops = &ssp2_ops, .ops = &ssp2_ops,
......
...@@ -337,7 +337,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { ...@@ -337,7 +337,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = byt_cht_es8316_codec_fixup, .be_hw_params_fixup = byt_cht_es8316_codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.init = byt_cht_es8316_init, .init = byt_cht_es8316_init,
......
...@@ -144,7 +144,6 @@ static struct snd_soc_dai_link dais[] = { ...@@ -144,7 +144,6 @@ static struct snd_soc_dai_link dais[] = {
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = codec_fixup, .be_hw_params_fixup = codec_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
SND_SOC_DAILINK_REG(ssp2_port, dummy, platform), SND_SOC_DAILINK_REG(ssp2_port, dummy, platform),
......
...@@ -1180,7 +1180,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { ...@@ -1180,7 +1180,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = byt_rt5640_codec_fixup, .be_hw_params_fixup = byt_rt5640_codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.init = byt_rt5640_init, .init = byt_rt5640_init,
......
...@@ -786,7 +786,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { ...@@ -786,7 +786,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = byt_rt5651_codec_fixup, .be_hw_params_fixup = byt_rt5651_codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.init = byt_rt5651_init, .init = byt_rt5651_init,
......
...@@ -351,7 +351,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { ...@@ -351,7 +351,6 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.be_hw_params_fixup = byt_wm5102_codec_fixup, .be_hw_params_fixup = byt_wm5102_codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.init = byt_wm5102_init, .init = byt_wm5102_init,
......
...@@ -471,7 +471,6 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -471,7 +471,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
.no_pcm = 1, .no_pcm = 1,
.init = cht_codec_init, .init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup, .be_hw_params_fixup = cht_codec_fixup,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ops = &cht_be_ssp2_ops, .ops = &cht_be_ssp2_ops,
......
...@@ -375,7 +375,6 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -375,7 +375,6 @@ static struct snd_soc_dai_link cht_dailink[] = {
.name = "SSP2-Codec", .name = "SSP2-Codec",
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.nonatomic = true,
.init = cht_codec_init, .init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup, .be_hw_params_fixup = cht_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
...@@ -181,7 +181,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = { ...@@ -181,7 +181,6 @@ static struct snd_soc_dai_link ehl_rt5660_dailink[] = {
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ops = &rt5660_ops, .ops = &rt5660_ops,
.nonatomic = true,
SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform), SND_SOC_DAILINK_REG(ssp0_pin, rt5660_codec, platform),
}, },
{ {
......
...@@ -241,7 +241,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -241,7 +241,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].init = sof_pcm512x_codec_init; links[id].init = sof_pcm512x_codec_init;
links[id].ops = &sof_pcm512x_ops; links[id].ops = &sof_pcm512x_ops;
links[id].nonatomic = true;
links[id].dpcm_playback = 1; links[id].dpcm_playback = 1;
/* /*
* capture only supported with specific versions of the Hifiberry DAC+ * capture only supported with specific versions of the Hifiberry DAC+
......
...@@ -637,7 +637,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -637,7 +637,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].init = sof_rt5682_codec_init; links[id].init = sof_rt5682_codec_init;
links[id].exit = sof_rt5682_codec_exit; links[id].exit = sof_rt5682_codec_exit;
links[id].ops = &sof_rt5682_ops; links[id].ops = &sof_rt5682_ops;
links[id].nonatomic = true;
links[id].dpcm_playback = 1; links[id].dpcm_playback = 1;
links[id].dpcm_capture = 1; links[id].dpcm_capture = 1;
links[id].no_pcm = 1; links[id].no_pcm = 1;
...@@ -775,7 +774,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -775,7 +774,6 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
} }
links[id].platforms = platform_component; links[id].platforms = platform_component;
links[id].num_platforms = ARRAY_SIZE(platform_component); links[id].num_platforms = ARRAY_SIZE(platform_component);
links[id].nonatomic = true;
links[id].dpcm_playback = 1; links[id].dpcm_playback = 1;
links[id].no_pcm = 1; links[id].no_pcm = 1;
links[id].cpus = &cpus[id]; links[id].cpus = &cpus[id];
......
...@@ -505,7 +505,6 @@ static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links ...@@ -505,7 +505,6 @@ static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links
dai_links->name = name; dai_links->name = name;
dai_links->platforms = platform_component; dai_links->platforms = platform_component;
dai_links->num_platforms = ARRAY_SIZE(platform_component); dai_links->num_platforms = ARRAY_SIZE(platform_component);
dai_links->nonatomic = true;
dai_links->no_pcm = 1; dai_links->no_pcm = 1;
dai_links->cpus = cpus; dai_links->cpus = cpus;
dai_links->num_cpus = cpus_num; dai_links->num_cpus = cpus_num;
......
...@@ -167,7 +167,6 @@ static struct snd_soc_dai_link dailink[] = { ...@@ -167,7 +167,6 @@ static struct snd_soc_dai_link dailink[] = {
.name = "SSP5-Codec", .name = "SSP5-Codec",
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.nonatomic = true,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ops = &sof_wm8804_ops, .ops = &sof_wm8804_ops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment