ASoC: SOF: nocodec: modify DAI link definitions
Subsystems (3)
Kai Vehmanen
reviewerPATCH 1/1 ASoC: SOF: nocodec: modify DAI link definitions
From: Ranjani Sridharan <[email protected]>
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.
--- include/sound/sof.h | 6 ++++-- sound/soc/sof/nocodec.c | 18 ++++++++++++++---- sound/soc/sof/pcm.c | 3 +-- sound/soc/sof/sof-audio.c | 2 +- sound/soc/sof/sof-audio.h | 3 +++ 5 files changed, 23 insertions(+), 9 deletions(-)
include/sound/sof.h +4 -2
@@ -100,6 +100,8 @@ struct sof_dev_desc { const struct snd_sof_dsp_ops *ops; }; -int sof_nocodec_setup (struct device *dev, -const struct snd_sof_dsp_ops *ops); +int sof_nocodec_setup (struct device *dev,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
sound/soc/sof/nocodec.c +14 -4
@@ -10,17 +10,21 @@#include <linux/module.h> #include <sound/sof.h> +#include "sof-audio.h" #include "sof-priv.h" static struct snd_soc_card sof_nocodec_card = { .name ="nocodec" ,/* the sof- prefix is added by the core */ + .topology_shortname ="sof-nocodec" , .owner =THIS_MODULE };static int sof_nocodec_bes_setup (struct device *dev,const struct snd_sof_dsp_ops *ops,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;int i;
@@ -39,6 +43,8 @@ static int sof_nocodec_bes_setup(struct device *dev,if (!links[i].name)return -ENOMEM ; + links[i].stream_name = links[i].name; + links[i].cpus = &dlc[0 ]; links[i].codecs = &dlc[1 ]; links[i].platforms = &dlc[2 ];
@@ -57,6 +63,8 @@ static int sof_nocodec_bes_setup(struct device *dev, links[i].dpcm_playback =1 ;if (ops->drv[i].capture.channels_min) links[i].dpcm_capture =1 ; + + links[i].be_hw_params_fixup = pcm_dai_link_fixup; } card->dai_link = links;
@@ -65,8 +73,9 @@ static int sof_nocodec_bes_setup(struct device *dev,return 0 ; } -int sof_nocodec_setup (struct device *dev, -const struct snd_sof_dsp_ops *ops) +int sof_nocodec_setup (struct device *dev,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;
@@ -77,7 +86,7 @@ int sof_nocodec_setup(struct device *dev,return -ENOMEM ;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);
@@ -86,6 +95,7 @@ static int sof_nocodec_probe(struct platform_device *pdev)struct snd_soc_card *card = &sof_nocodec_card; card->dev = &pdev->dev; + card->topology_shortname_created = true;return devm_snd_soc_register_card (&pdev->dev, card); }
sound/soc/sof/pcm.c +1 -2
@@ -620,8 +620,7 @@ static int sof_pcm_new(struct snd_soc_component *component, }/* fixup the BE DAI link to match any values from topology */ -static int sof_pcm_dai_link_fixup (struct snd_soc_pcm_runtime *rtd, -struct snd_pcm_hw_params *params) +int sof_pcm_dai_link_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params) {struct snd_interval *rate =hw_param_interval (params,SNDRV_PCM_HW_PARAM_RATE );
sound/soc/sof/sof-audio.c +1 -1
@@ -468,7 +468,7 @@ int sof_machine_check(struct snd_sof_dev *sdev) mach->drv_name ="sof-nocodec" ; 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 )return ret;
sound/soc/sof/sof-audio.h +3 -0
@@ -212,6 +212,9 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,enum sof_ipc_ctrl_cmd ctrl_cmd, bool send); +/* DAI link fixup */ +int sof_pcm_dai_link_fixup (struct snd_soc_pcm_runtime *rtd,struct snd_pcm_hw_params *params); +/* PM */ int sof_restore_pipelines (struct device *dev);int sof_set_hw_params_upon_resume (struct device *dev);
Signature · 1 line
2.28.0
Mark Brown
maintainerQuoted 10 lines · Kai Vehmanen
The
ignore_machinefield 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_machinelogic in the core. Modify the machine driver to set DAI link stream names and the BEhw_params_fixupcallback appropriately.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: SOF: nocodec: modify DAI link definitions
commit: f805e7e09c8f6d56f3e9bd2e7cec729f9d0855d0
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark