Skip to content

Commit

Permalink
ANDROID: ASoC: Intel: avs: Account for UID of ACPI device
Browse files Browse the repository at this point in the history
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.

Change-Id: I2c46429c623c80c459d012ea37b98393cd426a44
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
  • Loading branch information
crojewsk-intel committed Feb 27, 2023
1 parent 3ddcdd5 commit 50ac5fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions include/sound/soc-acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/intel/avs/board_selection.c
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,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)
Expand Down

0 comments on commit 50ac5fd

Please sign in to comment.