mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-27 12:57:53 +00:00
Code Issues Releases Wiki Activity

ASoC: SOF: Move sof_of_machine_select() to sof-of-dev.c from sof-audio.c

Browse source 
Move the sof_of_machine_select() function to sof-of-dev.c file and provide
an inline stub in case of non OF builds.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20231129125327.23708-2-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peter Ujfalusi 2023-11-29 14:53:15 +02:00 committed by Mark Brown
parent 8c91ca76f4
commit 014fdeb0d7
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
3 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/soc/sof/sof-audio.c
View file

@ -990,28 +990,6 @@ int sof_dai_get_bclk(struct snd_soc_pcm_runtime *rtd)
}
EXPORT_SYMBOL(sof_dai_get_bclk);
static struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *sof_pdata = sdev->pdata;
const struct sof_dev_desc *desc = sof_pdata->desc;
struct snd_sof_of_mach *mach = desc->of_machines;
if (!mach)
return NULL;
for (; mach->compatible; mach++) {
if (of_machine_is_compatible(mach->compatible)) {
sof_pdata->tplg_filename = mach->sof_tplg_filename;
if (mach->fw_filename)
sof_pdata->fw_filename = mach->fw_filename;
return mach;
}
}
return NULL;
}
/*
* SOF Driver enumeration.
*/

23
sound/soc/sof/sof-of-dev.c
View file

@ -41,6 +41,29 @@ static void sof_of_probe_complete(struct device *dev)
pm_runtime_enable(dev);
}
struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
{
struct snd_sof_pdata *sof_pdata = sdev->pdata;
const struct sof_dev_desc *desc = sof_pdata->desc;
struct snd_sof_of_mach *mach = desc->of_machines;
if (!mach)
return NULL;
for (; mach->compatible; mach++) {
if (of_machine_is_compatible(mach->compatible)) {
sof_pdata->tplg_filename = mach->sof_tplg_filename;
if (mach->fw_filename)
sof_pdata->fw_filename = mach->fw_filename;
return mach;
}
}
return NULL;
}
EXPORT_SYMBOL(sof_of_machine_select);
int sof_of_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;

9
sound/soc/sof/sof-of-dev.h
View file

@ -16,6 +16,15 @@ struct snd_sof_of_mach {
const char *sof_tplg_filename;
};
#if IS_ENABLED(CONFIG_SND_SOC_SOF_OF_DEV)
struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev);
#else
static inline struct snd_sof_of_mach *sof_of_machine_select(struct snd_sof_dev *sdev)
{
return NULL;
}
#endif
extern const struct dev_pm_ops sof_of_pm;
int sof_of_probe(struct platform_device *pdev);