diff options
| author | Brent Lu <brent.lu@intel.com> | 2021-10-30 01:14:04 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-29 18:55:16 +0100 |
| commit | cafa39b650ec3ba8e9efa0825f1c08e029b5a1ed (patch) | |
| tree | b00009f43edb1521d026a2cd86492cb470c4a566 /sound | |
| parent | 6c8552ebba7742e7128134859846e17edbfdf222 (diff) | |
| download | linux-stable-cafa39b650ec3ba8e9efa0825f1c08e029b5a1ed.tar.gz linux-stable-cafa39b650ec3ba8e9efa0825f1c08e029b5a1ed.tar.bz2 linux-stable-cafa39b650ec3ba8e9efa0825f1c08e029b5a1ed.zip | |
ASoC: soc-acpi: add comp_ids field for machine driver matching
A machine driver needs to be enumerated by more than one ACPI HID if
it supports second headphone driver (i.e. rt5682 and rt5682s).
However, the id field in snd_soc_acpi_mach structure could contain
only one HID. By adding a 'comp_ids' field which can contain several
HIDs, we can enumerate a machine driver by multiple ACPI HIDs.
Signed-off-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20211029171409.611600-2-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-acpi.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 395229bf5c51..2ae99b49d3f5 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -8,14 +8,34 @@ #include <linux/module.h> #include <sound/soc-acpi.h> +static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) +{ + const struct snd_soc_acpi_codecs *comp_ids = machine->comp_ids; + int i; + + if (machine->id[0]) { + if (acpi_dev_present(machine->id, NULL, -1)) + return true; + } + + if (comp_ids) { + for (i = 0; i < comp_ids->num_codecs; i++) { + if (acpi_dev_present(comp_ids->codecs[i], NULL, -1)) + return true; + } + } + + return false; +} + struct snd_soc_acpi_mach * snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) { struct snd_soc_acpi_mach *mach; struct snd_soc_acpi_mach *mach_alt; - for (mach = machines; mach->id[0]; mach++) { - if (acpi_dev_present(mach->id, NULL, -1)) { + for (mach = machines; mach->id[0] || mach->comp_ids; mach++) { + if (snd_soc_acpi_id_present(mach)) { if (mach->machine_quirk) { mach_alt = mach->machine_quirk(mach); if (!mach_alt) |