korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-29 07:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: SOF: nocodec: modify DAI link definitions

Browse Source 
The ignore_machine field in the component driver is used to
ignore the FE DAI links defined in the machine driver,
override BE fixups and set the stream names for the
DAI links defined in the machine driver. This is required
to make SOF compatible with the legacy machine drivers.

In the case of the nocodec machine driver in SOF, there is
no need to rely upon this ignore_machine logic in the core.
Modify the machine driver to set DAI link stream names and the
BE hw_params_fixup callback appropriately.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20201120141653.2160134-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Ranjani Sridharan 2020-11-20 16:16:53 +02:00 committed by Mark Brown
parent 7c1d0e554a
commit f805e7e09c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/sof.h
View File

@ -100,6 +100,8 @@ struct sof_dev_desc {
const struct snd_sof_dsp_ops *ops; const struct snd_sof_dsp_ops *ops;
}; };
int sof_nocodec_setup(struct device *dev, int sof_nocodec_setup(struct device *dev, const struct snd_sof_dsp_ops *ops,
const struct snd_sof_dsp_ops *ops); int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params));
#endif #endif

18
sound/soc/sof/nocodec.c
View File

@ -10,17 +10,21 @@
#include <linux/module.h> #include <linux/module.h>
#include <sound/sof.h> #include <sound/sof.h>
#include "sof-audio.h"
#include "sof-priv.h" #include "sof-priv.h"
static struct snd_soc_card sof_nocodec_card = { static struct snd_soc_card sof_nocodec_card = {
.name = "nocodec", /* the sof- prefix is added by the core */ .name = "nocodec", /* the sof- prefix is added by the core */
.topology_shortname = "sof-nocodec",
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
static int sof_nocodec_bes_setup(struct device *dev, static int sof_nocodec_bes_setup(struct device *dev,
const struct snd_sof_dsp_ops *ops, const struct snd_sof_dsp_ops *ops,
struct snd_soc_dai_link *links, struct snd_soc_dai_link *links,
int link_num, struct snd_soc_card *card) int link_num, struct snd_soc_card *card,
int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params))
{ {
struct snd_soc_dai_link_component *dlc; struct snd_soc_dai_link_component *dlc;
int i; int i;
@ -39,6 +43,8 @@ static int sof_nocodec_bes_setup(struct device *dev,
if (!links[i].name) if (!links[i].name)
return -ENOMEM; return -ENOMEM;
links[i].stream_name = links[i].name;
links[i].cpus = &dlc[0]; links[i].cpus = &dlc[0];
links[i].codecs = &dlc[1]; links[i].codecs = &dlc[1];
links[i].platforms = &dlc[2]; links[i].platforms = &dlc[2];
@ -57,6 +63,8 @@ static int sof_nocodec_bes_setup(struct device *dev,
links[i].dpcm_playback = 1; links[i].dpcm_playback = 1;
if (ops->drv[i].capture.channels_min) if (ops->drv[i].capture.channels_min)
links[i].dpcm_capture = 1; links[i].dpcm_capture = 1;
links[i].be_hw_params_fixup = pcm_dai_link_fixup;
} }
card->dai_link = links; card->dai_link = links;
@ -65,8 +73,9 @@ static int sof_nocodec_bes_setup(struct device *dev,
return 0; return 0;
} }
int sof_nocodec_setup(struct device *dev, int sof_nocodec_setup(struct device *dev, const struct snd_sof_dsp_ops *ops,
const struct snd_sof_dsp_ops *ops) int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
struct snd_pcm_hw_params *params))
{ {
struct snd_soc_dai_link *links; struct snd_soc_dai_link *links;
@ -77,7 +86,7 @@ int sof_nocodec_setup(struct device *dev,
return -ENOMEM; return -ENOMEM;
return sof_nocodec_bes_setup(dev, ops, links, ops->num_drv, return sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,
&sof_nocodec_card); &sof_nocodec_card, pcm_dai_link_fixup);
} }
EXPORT_SYMBOL(sof_nocodec_setup); EXPORT_SYMBOL(sof_nocodec_setup);
@ -86,6 +95,7 @@ static int sof_nocodec_probe(struct platform_device *pdev)
struct snd_soc_card *card = &sof_nocodec_card; struct snd_soc_card *card = &sof_nocodec_card;
card->dev = &pdev->dev; card->dev = &pdev->dev;
card->topology_shortname_created = true;
return devm_snd_soc_register_card(&pdev->dev, card); return devm_snd_soc_register_card(&pdev->dev, card);
} }

3
sound/soc/sof/pcm.c
View File

@ -620,8 +620,7 @@ capture:
} }
/* fixup the BE DAI link to match any values from topology */ /* fixup the BE DAI link to match any values from topology */
static int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params)
struct snd_pcm_hw_params *params)
{ {
struct snd_interval *rate = hw_param_interval(params, struct snd_interval *rate = hw_param_interval(params,
SNDRV_PCM_HW_PARAM_RATE); SNDRV_PCM_HW_PARAM_RATE);

2
sound/soc/sof/sof-audio.c
View File

@ -468,7 +468,7 @@ int sof_machine_check(struct snd_sof_dev *sdev)
mach->drv_name = "sof-nocodec"; mach->drv_name = "sof-nocodec";
sof_pdata->tplg_filename = desc->nocodec_tplg_filename; sof_pdata->tplg_filename = desc->nocodec_tplg_filename;
ret = sof_nocodec_setup(sdev->dev, desc->ops); ret = sof_nocodec_setup(sdev->dev, desc->ops, sof_pcm_dai_link_fixup);
if (ret < 0) if (ret < 0)
return ret; return ret;

3
sound/soc/sof/sof-audio.h
View File

@ -214,6 +214,9 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
enum sof_ipc_ctrl_cmd ctrl_cmd, enum sof_ipc_ctrl_cmd ctrl_cmd,
bool send); bool send);
/* DAI link fixup */
int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params);
/* PM */ /* PM */
int sof_restore_pipelines(struct device *dev); int sof_restore_pipelines(struct device *dev);
int sof_set_hw_params_upon_resume(struct device *dev); int sof_set_hw_params_upon_resume(struct device *dev);