Unverified Commit dcf4694f authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: soc-acpi: introduce new 'machine check' callback 



The existing machine_quirk() returns a pointer to a soc_acpi_mach
structure.
For SoundWire/SDCA support, we need a slightly different
functionality where a quirk function either validates or NACKs an
initial selection, based on additional firmware/DMI information.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20241016102333.294448-8-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9aa6df9c

include/sound/soc-acpi.h

+5 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ struct snd_soc_acpi_link_adr { 
 * ACPI ID alone is not sufficient, wrong or misleading

 * @quirk_data: data used to uniquely identify a machine, usually a list of

 * audio codecs whose presence if checked with ACPI

 * @machine_check: pointer to quirk function. The functionality is similar to

 * the use of @machine_quirk, except that the return value is a boolean: the intent

 * is to skip a machine if the additional hardware/firmware verification invalidates

 * the initial selection in the snd_soc_acpi_mach table.

 * @pdata: intended for platform data or machine specific-ops. This structure

 *  is not constant since this field may be updated at run-time

 * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled
@@ -203,6 +207,7 @@ struct snd_soc_acpi_mach { 
	const char *board;

	struct snd_soc_acpi_mach * (*machine_quirk)(void *arg);

	const void *quirk_data;

	bool (*machine_check)(void *arg);

	void *pdata;

	struct snd_soc_acpi_mach_params mach_params;

	const char *sof_tplg_filename;