Signed-off-by: Daniel Baluta daniel.baluta@nxp.com --- sound/soc/sof/sof-of-dev.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c index 28a9692974e5..b7b8f226217c 100644 --- a/sound/soc/sof/sof-of-dev.c +++ b/sound/soc/sof/sof-of-dev.c @@ -43,8 +43,6 @@ static int sof_of_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; const struct sof_dev_desc *desc; - /*TODO: create a generic snd_soc_xxx_mach */ - struct snd_soc_acpi_mach *mach; struct snd_sof_pdata *sof_pdata; const struct snd_sof_dsp_ops *ops; int ret; @@ -59,38 +57,12 @@ static int sof_of_probe(struct platform_device *pdev) if (!desc) return -ENODEV;

- /* get ops for platform */ - ops = desc->ops; - if (!ops) { - dev_err(dev, "error: no matching DT descriptor ops\n"); - return -ENODEV; - } - -#if IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE) - /* force nocodec mode */ - dev_warn(dev, "Force to use nocodec mode\n"); - mach = devm_kzalloc(dev, sizeof(*mach), GFP_KERNEL); - if (!mach) - return -ENOMEM; - ret = sof_nocodec_setup(dev, sof_pdata, mach, desc, ops); - if (ret < 0) - return ret; -#else - /* TODO: implement case where we actually have a codec */ - return -ENODEV; -#endif - - if (mach) - mach->mach_params.platform = dev_name(dev); - - sof_pdata->machine = mach; sof_pdata->desc = desc; sof_pdata->dev = &pdev->dev; - sof_pdata->platform = dev_name(dev); + sof_pdata->fw_filename = desc->default_fw_filename;

/* TODO: read alternate fw and tplg filenames from DT */ sof_pdata->fw_filename_prefix = sof_pdata->desc->default_fw_path; - sof_pdata->tplg_filename_prefix = sof_pdata->desc->default_tplg_path;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE) /* set callback to enable runtime_pm */

Signed-off-by: Daniel Baluta daniel.baluta@nxp.com --- sound/soc/sof/sof-of-dev.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c index 6c268634baff..06f4c85fdd1f 100644 --- a/sound/soc/sof/sof-of-dev.c +++ b/sound/soc/sof/sof-of-dev.c @@ -20,6 +20,7 @@ extern struct snd_sof_audio_ops sof_imx8_audio_ops; static struct sof_dev_desc sof_of_imx8qxp_desc = { .default_fw_path = "imx/sof", .default_tplg_path = "imx/sof-tplg", + .default_fw_filename = "sof-imx8.ri", .nocodec_fw_filename = "sof-imx8.ri", .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", .ops = &sof_imx8_ops,

On Wed, 2019-10-30 at 17:42 +0200, Daniel Baluta wrote:

This will unify machine driver descriptor between OF/ACPI.

Signed-off-by: Daniel Baluta daniel.baluta@nxp.com

include/sound/soc-of.h | 22 ++++++++++++++++++++++ include/sound/sof.h | 26 ++++++++++++++++++++++++++ sound/soc/sof/pcm.c | 2 +- sound/soc/sof/sof-audio.h | 2 +- 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 include/sound/soc-of.h

diff --git a/include/sound/soc-of.h b/include/sound/soc-of.h new file mode 100644 index 000000000000..267c92c54188 --- /dev/null +++ b/include/sound/soc-of.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0

• • Copyright 2019 NXP
• */

+#ifndef __LINUX_SND_SOC_OF_H +#define __LINUX_SND_SOC_OF_H

+#include <linux/of.h>

+/**

• • snd_soc_of_mach: DT-based machine driver descriptor
• • @drv_name: machine driver name
• • @of: DT node providing machine driver description
• */

+struct snd_soc_of_mach {

• const char *drv_name;
• struct device_node *of;

+};

+#endif diff --git a/include/sound/sof.h b/include/sound/sof.h index 4e151abecac8..60db0a73d337 100644 --- a/include/sound/sof.h +++ b/include/sound/sof.h @@ -14,10 +14,36 @@ #include <linux/pci.h> #include <sound/soc.h> #include <sound/soc-acpi.h> +#include <sound/soc-of.h>

struct snd_sof_dsp_ops; struct snd_sof_audio_ops;

+enum {

• SND_SOC_FW_TYPE_ACPI = 0,
• SND_SOC_FW_TYPE_OF,

+};

+struct snd_soc_fw_mach {

• int type;

Hi Daniel,

Thanks for this patch. I was struggling to understand where this type field could be set. But, the one difference I noticed between the sof_dev_desc for IMX vs Intel platforms was that the IMX desc lacks the "machines" field.

How about we use that to differentiate the 2 platforms? I am working on adding the part. I will update my PR with the changes soon.

Thanks, Ranjani

• union {

• struct snd_soc_acpi_mach *acpi;
  

• struct snd_soc_of_mach *of;
  

• };

+};

+static inline +const char *sof_mach_get_drv_name(const struct snd_soc_fw_mach *mach) +{

• switch (mach->type) {
• case SND_SOC_FW_TYPE_ACPI:

• return mach->acpi->drv_name;
  

• case SND_SOC_FW_TYPE_OF:

• return mach->of->drv_name;
  

• default:

• return NULL;
  

• }

+} /*

• SOF Platform data.

*/ diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c index 8de566d7ee85..c0e8ecb287d7 100644 --- a/sound/soc/sof/pcm.c +++ b/sound/soc/sof/pcm.c @@ -795,7 +795,7 @@ void snd_sof_new_platform_drv(struct sof_audio_dev *sof_audio) struct snd_soc_component_driver *pd = &sof_audio->plat_drv; const char *drv_name;

• drv_name = sof_audio->machine->drv_name;

• drv_name = sof_mach_get_drv_name(sof_audio->machine);

  pd->name = "sof-audio-component"; pd->probe = sof_pcm_probe;

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h index 8b76b8b1709b..013e7e85d61d 100644 --- a/sound/soc/sof/sof-audio.h +++ b/sound/soc/sof/sof-audio.h @@ -160,7 +160,7 @@ struct sof_audio_dev {

/* machine */ struct platform_device *pdev_mach;

• const struct snd_soc_acpi_mach *machine;

• struct snd_soc_fw_mach *machine;

  const char *tplg_filename_prefix; const char *tplg_filename;