Skip to content

Commit 8368551

Browse files
crojewsk-intelbroonie
authored andcommitted
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: Cezary Rojewski <[email protected]> Signed-off-by: Amadeusz Sławiński <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1cf036d commit 8368551

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

include/sound/soc-acpi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ struct snd_soc_acpi_link_adr {
170170
/* Descriptor for SST ASoC machine driver */
171171
struct snd_soc_acpi_mach {
172172
u8 id[ACPI_ID_LEN];
173+
const char *uid;
173174
const struct snd_soc_acpi_codecs *comp_ids;
174175
const u32 link_mask;
175176
const struct snd_soc_acpi_link_adr *links;

sound/soc/intel/avs/board_selection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static int avs_register_i2s_boards(struct avs_dev *adev)
443443
}
444444

445445
for (mach = boards->machs; mach->id[0]; mach++) {
446-
if (!acpi_dev_present(mach->id, NULL, -1))
446+
if (!acpi_dev_present(mach->id, mach->uid, -1))
447447
continue;
448448

449449
if (mach->machine_quirk)

0 commit comments

Comments
 (0)