Unverified Commit 83685510 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: avs: Account for UID of ACPI device 



Configurations with multiple codecs attached to the platform are
supported but only if each from the set is different. Add new field
representing the 'Unique ID' so that codecs that share Vendor and Part
IDs can be differentiated and thus enabling support for such
configurations.

Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20230519201711.4073845-6-amadeuszx.slawinski@linux.intel.com


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

include/sound/soc-acpi.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr { 
/* Descriptor for SST ASoC machine driver */

struct snd_soc_acpi_mach {

	u8 id[ACPI_ID_LEN];

	const char *uid;

	const struct snd_soc_acpi_codecs *comp_ids;

	const u32 link_mask;

	const struct snd_soc_acpi_link_adr *links;

sound/soc/intel/avs/board_selection.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int avs_register_i2s_boards(struct avs_dev *adev) 
	}



	for (mach = boards->machs; mach->id[0]; mach++) {

		if (!acpi_dev_present(mach->id, NULL, -1))

		if (!acpi_dev_present(mach->id, mach->uid, -1))

			continue;



		if (mach->machine_quirk)