To prepare for SOF integration, we need new fields in the machine table. It is intended that the same table is used for both closed-source and open-source firmware to avoid repeating ACPI-related information multiple times No functional change
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- include/sound/soc-acpi.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 75fb32e..3e61f93 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -60,12 +60,29 @@ struct snd_soc_acpi_mach { const char *drv_name; /* firmware file name */ const char *fw_filename; - /* board name */ const char *board; struct snd_soc_acpi_mach * (*machine_quirk)(void *arg); const void *quirk_data; + + /* intended for platform data or machine specific-ops */ void *pdata; + + /* SOF firmware file name */ + const char *sof_fw_filename; + /* SOF default topology */ + const char *sof_tplg_filename; + + /* ASoC platform name - used for binding machine drivers if non NULL */ + const char *asoc_plat_name; + + /* machine driver private data fixup */ + struct platform_device * (*new_mach_data)(void *pdata); + + /* FIXME: is this needed, was only used for BYTCR-detection + int (*confirm_mach)(struct device *dev, + const struct sof_dev_desc **desc); + */ };
#define SND_SOC_ACPI_MAX_CODECS 3