On Wed, Jul 24, 2019 at 10:04 AM Daniel Baluta daniel.baluta@gmail.com wrote:
On Tue, Jul 23, 2019 at 6:19 PM Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com wrote:
diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index 61b97fc55bb2..2aa3a1cdf60c 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -36,6 +36,15 @@ config SND_SOC_SOF_ACPI Say Y if you need this option If unsure select "N".
+config SND_SOC_SOF_DT
tristate "SOF DT enumeration support"select SND_SOC_SOFselect SND_SOC_SOF_OPTIONShelpThis adds support for Device Tree enumeration. This option isrequired to enable i.MX8 devices.Say Y if you need this option. If unsure select "N".[snip]
diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig index fff64a9970f0..fa35994a79c4 100644 --- a/sound/soc/sof/imx/Kconfig +++ b/sound/soc/sof/imx/Kconfig @@ -12,6 +12,7 @@ if SND_SOC_SOF_IMX_TOPLEVEL
config SND_SOC_SOF_IMX8 tristate "SOF support for i.MX8"
select SND_SOC_SOF_DTThis looks upside down. You should select SOF_DT first then include the NXP stuff.
help This adds support for Sound Open Firmware for NXP i.MX8 platforms Say Y if you have such a device.diff --git a/sound/soc/sof/sof-dt-dev.c b/sound/soc/sof/sof-dt-dev.c new file mode 100644 index 000000000000..31429bbb5c7e --- /dev/null +++ b/sound/soc/sof/sof-dt-dev.c @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// +// Copyright 2019 NXP +// +// Author: Daniel Baluta daniel.baluta@nxp.com +//
+#include <linux/firmware.h> +#include <linux/module.h> +#include <linux/pm_runtime.h> +#include <sound/sof.h>
+#include "ops.h"
+extern struct snd_sof_dsp_ops sof_imx8_ops;
+static char *fw_path; +module_param(fw_path, charp, 0444); +MODULE_PARM_DESC(fw_path, "alternate path for SOF firmware.");
+static char *tplg_path; +module_param(tplg_path, charp, 0444); +MODULE_PARM_DESC(tplg_path, "alternate path for SOF topology.");
+/* platform specific devices */ +#if IS_ENABLED(CONFIG_SND_SOC_SOF_IMX8) +static struct sof_dev_desc sof_dt_imx8qxp_desc = {
.default_fw_path = "imx/sof",.default_tplg_path = "imx/sof-tplg",.nocodec_fw_filename = "sof-imx8.ri",.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",.ops = &sof_imx8_ops,+}; +#endif
+static const struct dev_pm_ops sof_dt_pm = {
SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,NULL)+};
+static void sof_dt_probe_complete(struct device *dev) +{
/* allow runtime_pm */pm_runtime_set_autosuspend_delay(dev, SND_SOF_SUSPEND_DELAY_MS);pm_runtime_use_autosuspend(dev);pm_runtime_enable(dev);+}
+static int sof_dt_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;I wonder if you really need to use the same structures. For Intel we get absolutely zero info from the firmware so rely on an ACPI codec ID as a key to find information on which firmware and topology to use, and which machine driver to load. You could have all this information in a DT blob?
Yes. I see your point. I will still need to make a generic structure for snd_soc_acpi_mach so that everyone can use sof_nocodec_setup function.
Maybe something like this:
struct snd_soc_mach { union { struct snd_soc_acpi_mach acpi_mach; struct snd_soc_of_mach of_mach; } };
and then change the prototype of sof_nocodec_setup.
Hi Pierre,
I fixed all the comments except the one above. Replacing snd_soc_acpi_mach with a generic snd_soc_mach is not trivial task.
I wonder if it is acceptable to get the initial patches as they are now and later switch to generic ACPI/OF abstraction.
Asking this because for the moment on the i.MX side I have only implemented no codec version and we don't probe any of the machine drivers we have.
So, there is this only one member of snd_soc_acpi_mach that imx version is making use of:
mach->drv_name = "sof-nocodec";
That's all.
I think the change as it is now is very clean and non-intrusive. Later we will get options to read firmware name and stuff from DT.
Anyhow, I don't think we can get rid of snd_dev_desc structure on i.MX. This will be used to store the information read from DT:
static struct sof_dev_desc sof_of_imx8qxp_desc = { » .default_fw_path = "imx/sof", » .default_tplg_path = "imx/sof-tplg", » .nocodec_fw_filename = "sof-imx8.ri", » .nocodec_tplg_filename = "sof-imx8-nocodec.tplg", » .ops = &sof_imx8_ops, };
For the moment we will only use the default values.
thanks, Daniel.