Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: ACPI: add new fields for SOF support

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>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Pierre-Louis Bossart and committed by
Mark Brown
976b5a0e 928c8a8f

+12 -1
+12 -1
include/sound/soc-acpi.h
··· 55 55 /** 56 56 * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are 57 57 * related to the hardware, except for the firmware and topology file names. 58 + * A platform supported by legacy and Sound Open Firmware (SOF) would expose 59 + * all firmware/topology related fields. 58 60 * 59 61 * @id: ACPI ID (usually the codec's) used to find a matching machine driver. 60 62 * @drv_name: machine driver name 61 - * @fw_filename: firmware file name. 63 + * @fw_filename: firmware file name. Used when SOF is not enabled. 62 64 * @board: board name 63 65 * @machine_quirk: pointer to quirk, usually based on DMI information when 64 66 * ACPI ID alone is not sufficient, wrong or misleading ··· 68 66 * audio codecs whose presence if checked with ACPI 69 67 * @pdata: intended for platform data or machine specific-ops. This structure 70 68 * is not constant since this field may be updated at run-time 69 + * @sof_fw_filename: Sound Open Firmware file name, if enabled 70 + * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled 71 + * @asoc_plat_name: ASoC platform name, used for binding machine drivers 72 + * if non NULL 73 + * @new_mach_data: machine driver private data fixup 71 74 */ 72 75 /* Descriptor for SST ASoC machine driver */ 73 76 struct snd_soc_acpi_mach { ··· 83 76 struct snd_soc_acpi_mach * (*machine_quirk)(void *arg); 84 77 const void *quirk_data; 85 78 void *pdata; 79 + const char *sof_fw_filename; 80 + const char *sof_tplg_filename; 81 + const char *asoc_plat_name; 82 + struct platform_device * (*new_mach_data)(void *pdata); 86 83 }; 87 84 88 85 #define SND_SOC_ACPI_MAX_CODECS 3