Skip to content

L
linux
Commit 1785af9f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: intel: sof: use asoc_dummy_dlc 

Now we can share asoc_dummy_dlc. This patch use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com
Link: https://lore.kernel.org/r/87wn22ypig.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org
parent 82528f31
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 70 deletions
sound/soc/intel/boards/ehl_rt5660.c
View file @ 1785af9f
...@@ -254,7 +254,6 @@ static void hdmi_link_init(struct snd_soc_card *card, ...@@ -254,7 +254,6 @@ static void hdmi_link_init(struct snd_soc_card *card,
struct sof_card_private *ctx, struct sof_card_private *ctx,
struct snd_soc_acpi_mach *mach) struct snd_soc_acpi_mach *mach)
{ {
struct snd_soc_dai_link *link;
int i; int i;
if (mach->mach_params.common_hdmi_codec_drv && if (mach->mach_params.common_hdmi_codec_drv &&
...@@ -267,11 +266,8 @@ static void hdmi_link_init(struct snd_soc_card *card, ...@@ -267,11 +266,8 @@ static void hdmi_link_init(struct snd_soc_card *card,
* if HDMI is not enabled in kernel config, or * if HDMI is not enabled in kernel config, or
* hdmi codec is not supported * hdmi codec is not supported
*/ */
for (i = HDMI_LINK_START; i <= HDMI_LINE_END; i++) { for (i = HDMI_LINK_START; i <= HDMI_LINE_END; i++)
link = &card->dai_link[i]; card->dai_link[i].codecs[0] = asoc_dummy_dlc;
link->codecs[0].name = "snd-soc-dummy";
link->codecs[0].dai_name = "snd-soc-dummy-dai";
}
} }
static int snd_ehl_rt5660_probe(struct platform_device *pdev) static int snd_ehl_rt5660_probe(struct platform_device *pdev)
......
sound/soc/intel/boards/sof_cs42l42.c
View file @ 1785af9f
...@@ -296,13 +296,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { ...@@ -296,13 +296,6 @@ static struct snd_soc_dai_link_component dmic_component[] = {
} }
}; };
static struct snd_soc_dai_link_component dummy_component[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
static int create_spk_amp_dai_links(struct device *dev, static int create_spk_amp_dai_links(struct device *dev,
struct snd_soc_dai_link *links, struct snd_soc_dai_link *links,
struct snd_soc_dai_link_component *cpus, struct snd_soc_dai_link_component *cpus,
...@@ -510,8 +503,8 @@ static int create_bt_offload_dai_links(struct device *dev, ...@@ -510,8 +503,8 @@ static int create_bt_offload_dai_links(struct device *dev,
goto devm_err; goto devm_err;
links[*id].id = *id; links[*id].id = *id;
links[*id].codecs = dummy_component; links[*id].codecs = &asoc_dummy_dlc;
links[*id].num_codecs = ARRAY_SIZE(dummy_component); links[*id].num_codecs = 1;
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);
......
sound/soc/intel/boards/sof_es8336.c
View file @ 1785af9f
...@@ -393,13 +393,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { ...@@ -393,13 +393,6 @@ static struct snd_soc_dai_link_component dmic_component[] = {
} }
}; };
static struct snd_soc_dai_link_component dummy_component[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
static int sof_es8336_late_probe(struct snd_soc_card *card) static int sof_es8336_late_probe(struct snd_soc_card *card)
{ {
struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card); struct sof_es8336_private *priv = snd_soc_card_get_drvdata(card);
...@@ -572,8 +565,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -572,8 +565,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
if (!links[id].name) if (!links[id].name)
return NULL; return NULL;
links[id].id = id + hdmi_id_offset; links[id].id = id + hdmi_id_offset;
links[id].codecs = dummy_component; links[id].codecs = &asoc_dummy_dlc;
links[id].num_codecs = ARRAY_SIZE(dummy_component); links[id].num_codecs = 1;
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].dpcm_capture = 1; links[id].dpcm_capture = 1;
......
sound/soc/intel/boards/sof_nau8825.c
View file @ 1785af9f
...@@ -346,13 +346,6 @@ static struct snd_soc_dai_link_component nau8318_components[] = { ...@@ -346,13 +346,6 @@ static struct snd_soc_dai_link_component nau8318_components[] = {
} }
}; };
static struct snd_soc_dai_link_component dummy_component[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
int ssp_codec, int ssp_codec,
int ssp_amp, int ssp_amp,
...@@ -532,8 +525,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -532,8 +525,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);
if (!links[id].name) if (!links[id].name)
goto devm_err; goto devm_err;
links[id].codecs = dummy_component; links[id].codecs = &asoc_dummy_dlc;
links[id].num_codecs = ARRAY_SIZE(dummy_component); links[id].num_codecs = 1;
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].dpcm_playback = 1; links[id].dpcm_playback = 1;
......
sound/soc/intel/boards/sof_pcm512x.c
View file @ 1785af9f
...@@ -331,8 +331,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -331,8 +331,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
devm_kasprintf(dev, GFP_KERNEL, devm_kasprintf(dev, GFP_KERNEL,
"intel-hdmi-hifi%d", i); "intel-hdmi-hifi%d", i);
} else { } else {
idisp_components[i - 1].name = "snd-soc-dummy"; idisp_components[i - 1] = asoc_dummy_dlc;
idisp_components[i - 1].dai_name = "snd-soc-dummy-dai";
} }
if (!idisp_components[i - 1].dai_name) if (!idisp_components[i - 1].dai_name)
goto devm_err; goto devm_err;
......
sound/soc/intel/boards/sof_rt5682.c
View file @ 1785af9f
...@@ -607,13 +607,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { ...@@ -607,13 +607,6 @@ static struct snd_soc_dai_link_component dmic_component[] = {
} }
}; };
static struct snd_soc_dai_link_component dummy_component[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
#define IDISP_CODEC_MASK 0x4 #define IDISP_CODEC_MASK 0x4
static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
...@@ -745,8 +738,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -745,8 +738,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
if (!idisp_components[i - 1].dai_name) if (!idisp_components[i - 1].dai_name)
goto devm_err; goto devm_err;
} else { } else {
idisp_components[i - 1].name = "snd-soc-dummy"; idisp_components[i - 1] = asoc_dummy_dlc;
idisp_components[i - 1].dai_name = "snd-soc-dummy-dai";
} }
links[id].codecs = &idisp_components[i - 1]; links[id].codecs = &idisp_components[i - 1];
...@@ -841,8 +833,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -841,8 +833,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);
if (!links[id].name) if (!links[id].name)
goto devm_err; goto devm_err;
links[id].codecs = dummy_component; links[id].codecs = &asoc_dummy_dlc;
links[id].num_codecs = ARRAY_SIZE(dummy_component); links[id].num_codecs = 1;
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].dpcm_playback = 1; links[id].dpcm_playback = 1;
......
sound/soc/intel/boards/sof_sdw.c
View file @ 1785af9f
...@@ -1488,8 +1488,7 @@ static int sof_card_dai_links_create(struct device *dev, ...@@ -1488,8 +1488,7 @@ static int sof_card_dai_links_create(struct device *dev,
if (!idisp_components[i].dai_name) if (!idisp_components[i].dai_name)
return -ENOMEM; return -ENOMEM;
} else { } else {
idisp_components[i].name = "snd-soc-dummy"; idisp_components[i] = asoc_dummy_dlc;
idisp_components[i].dai_name = "snd-soc-dummy-dai";
} }
cpu_name = devm_kasprintf(dev, GFP_KERNEL, cpu_name = devm_kasprintf(dev, GFP_KERNEL,
...@@ -1514,21 +1513,13 @@ static int sof_card_dai_links_create(struct device *dev, ...@@ -1514,21 +1513,13 @@ static int sof_card_dai_links_create(struct device *dev,
if (!name) if (!name)
return -ENOMEM; return -ENOMEM;
ssp_components = devm_kzalloc(dev, sizeof(*ssp_components),
GFP_KERNEL);
if (!ssp_components)
return -ENOMEM;
ssp_components->name = "snd-soc-dummy";
ssp_components->dai_name = "snd-soc-dummy-dai";
cpu_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port); cpu_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port);
if (!cpu_name) if (!cpu_name)
return -ENOMEM; return -ENOMEM;
cpus[cpu_id].dai_name = cpu_name; cpus[cpu_id].dai_name = cpu_name;
init_dai_link(dev, links + link_index, be_id, name, 1, 1, init_dai_link(dev, links + link_index, be_id, name, 1, 1,
cpus + cpu_id, 1, ssp_components, 1, NULL, NULL); cpus + cpu_id, 1, &asoc_dummy_dlc, 1, NULL, NULL);
} }
card->dai_link = links; card->dai_link = links;
......
sound/soc/intel/boards/sof_ssp_amp.c
View file @ 1785af9f
...@@ -167,13 +167,6 @@ static struct snd_soc_dai_link_component dmic_component[] = { ...@@ -167,13 +167,6 @@ static struct snd_soc_dai_link_component dmic_component[] = {
} }
}; };
static struct snd_soc_dai_link_component dummy_component[] = {
{
.name = "snd-soc-dummy",
.dai_name = "snd-soc-dummy-dai",
}
};
static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd) static int sof_hdmi_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct sof_card_private *ctx = snd_soc_card_get_drvdata(rtd->card);
...@@ -233,8 +226,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -233,8 +226,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
if (!links[id].name) if (!links[id].name)
return NULL; return NULL;
links[id].id = id; links[id].id = id;
links[id].codecs = dummy_component; links[id].codecs = &asoc_dummy_dlc;
links[id].num_codecs = ARRAY_SIZE(dummy_component); links[id].num_codecs = 1;
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].dpcm_capture = 1; links[id].dpcm_capture = 1;
...@@ -331,8 +324,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -331,8 +324,7 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
if (!idisp_components[i - 1].dai_name) if (!idisp_components[i - 1].dai_name)
goto devm_err; goto devm_err;
} else { } else {
idisp_components[i - 1].name = "snd-soc-dummy"; idisp_components[i - 1] = asoc_dummy_dlc;
idisp_components[i - 1].dai_name = "snd-soc-dummy-dai";
} }
links[id].codecs = &idisp_components[i - 1]; links[id].codecs = &idisp_components[i - 1];
...@@ -360,8 +352,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, ...@@ -360,8 +352,8 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev,
links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);
if (!links[id].name) if (!links[id].name)
goto devm_err; goto devm_err;
links[id].codecs = dummy_component; links[id].codecs = &asoc_dummy_dlc;
links[id].num_codecs = ARRAY_SIZE(dummy_component); links[id].num_codecs = 1;
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].dpcm_playback = 1; links[id].dpcm_playback = 1;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7