GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ASoC: ACPI: add new fields for SOF support

Browse source 
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>
This commit is contained in:
Pierre-Louis Bossart 2017-10-12 18:49:40 -05:00 • committed by Mark Brown
parent 928c8a8f11
commit 976b5a0ee9
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/sound/soc-acpi.h
View file

@ -55,10 +55,12 @@ bool snd_soc_acpi_check_hid(const u8 hid[ACPI_ID_LEN]);
/** /**
* snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are * snd_soc_acpi_mach: ACPI-based machine descriptor. Most of the fields are
* related to the hardware, except for the firmware and topology file names. * related to the hardware, except for the firmware and topology file names.
* A platform supported by legacy and Sound Open Firmware (SOF) would expose
* all firmware/topology related fields.
* *
* @id: ACPI ID (usually the codec's) used to find a matching machine driver. * @id: ACPI ID (usually the codec's) used to find a matching machine driver.
* @drv_name: machine driver name * @drv_name: machine driver name
* @fw_filename: firmware file name. * @fw_filename: firmware file name. Used when SOF is not enabled.
* @board: board name * @board: board name
* @machine_quirk: pointer to quirk, usually based on DMI information when * @machine_quirk: pointer to quirk, usually based on DMI information when
* ACPI ID alone is not sufficient, wrong or misleading * ACPI ID alone is not sufficient, wrong or misleading
@ -66,6 +68,11 @@ bool snd_soc_acpi_check_hid(const u8 hid[ACPI_ID_LEN]);
* audio codecs whose presence if checked with ACPI * audio codecs whose presence if checked with ACPI
* @pdata: intended for platform data or machine specific-ops. This structure * @pdata: intended for platform data or machine specific-ops. This structure
* is not constant since this field may be updated at run-time * is not constant since this field may be updated at run-time
* @sof_fw_filename: Sound Open Firmware file name, if enabled
* @sof_tplg_filename: Sound Open Firmware topology file name, if enabled
* @asoc_plat_name: ASoC platform name, used for binding machine drivers
* if non NULL
* @new_mach_data: machine driver private data fixup
*/ */
/* Descriptor for SST ASoC machine driver */ /* Descriptor for SST ASoC machine driver */
struct snd_soc_acpi_mach { struct snd_soc_acpi_mach {
@ -76,6 +83,10 @@ struct snd_soc_acpi_mach {
struct snd_soc_acpi_mach * (*machine_quirk)(void *arg); struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);
const void *quirk_data; const void *quirk_data;
void *pdata; void *pdata;
const char *sof_fw_filename;
const char *sof_tplg_filename;
const char *asoc_plat_name;
struct platform_device * (*new_mach_data)(void *pdata);
}; };
#define SND_SOC_ACPI_MAX_CODECS 3 #define SND_SOC_ACPI_MAX_CODECS 3