| Message ID | 20211006161805.938950-2-brent.lu@intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Multiple headphone codec driver support | expand |
On Wed, Oct 6, 2021 at 7:21 PM Brent Lu <brent.lu@intel.com> wrote: > > Current design to support second headphone driver in the same machine > driver is to duplicate the entries in snd_soc_acpi_mach array and > board configs in machine driver. We can avoid this by adding an id_alt > field in snd_soc_acpi_mach structure to specify alternative ACPI HIDs > for machine driver enumeration and leave the codec type detection to > machine driver if necessary. ... > +static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) > +{ > + struct snd_soc_acpi_codecs *id_alt = machine->id_alt; > + int i; > + > + if (acpi_dev_present(machine->id, NULL, -1)) > + return true; > + > + if (id_alt == NULL) > + return false; > + > + for (i = 0; i < id_alt->num_codecs; i++) { > + if (acpi_dev_present(id_alt->codecs[i], NULL, -1)) > + return true; > + } > + > + return false; > +} Wondering if you may modify data structure in a way that makes it possible to use for_each_acpi_dev_match(). ... > + if (snd_soc_acpi_id_present(mach) != false) { ' != fase' is redundant.
> +static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) > +{ > + struct snd_soc_acpi_codecs *id_alt = machine->id_alt; > + int i; > + > + if (acpi_dev_present(machine->id, NULL, -1)) > + return true; > + > + if (id_alt == NULL) if (!id_alt) > + return false; > + > + for (i = 0; i < id_alt->num_codecs; i++) { > + if (acpi_dev_present(id_alt->codecs[i], NULL, -1)) > + return true; > + } > + > + return false; > +}
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h index 2f3fa385c092..fcf6bae9f9d7 100644 --- a/include/sound/soc-acpi.h +++ b/include/sound/soc-acpi.h @@ -129,6 +129,7 @@ struct snd_soc_acpi_link_adr { * all firmware/topology related fields. * * @id: ACPI ID (usually the codec's) used to find a matching machine driver. + * @id_alt: array of ACPI IDs used as an alternative of id field. * @link_mask: describes required board layout, e.g. for SoundWire. * @links: array of link _ADR descriptors, null terminated. * @drv_name: machine driver name @@ -146,6 +147,7 @@ struct snd_soc_acpi_link_adr { /* Descriptor for SST ASoC machine driver */ struct snd_soc_acpi_mach { const u8 id[ACPI_ID_LEN]; + struct snd_soc_acpi_codecs *id_alt; const u32 link_mask; const struct snd_soc_acpi_link_adr *links; const char *drv_name; diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 395229bf5c51..ab67d640c20f 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -8,6 +8,25 @@ #include <linux/module.h> #include <sound/soc-acpi.h> +static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) +{ + struct snd_soc_acpi_codecs *id_alt = machine->id_alt; + int i; + + if (acpi_dev_present(machine->id, NULL, -1)) + return true; + + if (id_alt == NULL) + return false; + + for (i = 0; i < id_alt->num_codecs; i++) { + if (acpi_dev_present(id_alt->codecs[i], NULL, -1)) + return true; + } + + return false; +} + struct snd_soc_acpi_mach * snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) { @@ -15,7 +34,7 @@ snd_soc_acpi_find_machine(struct snd_soc_acpi_mach *machines) struct snd_soc_acpi_mach *mach_alt; for (mach = machines; mach->id[0]; mach++) { - if (acpi_dev_present(mach->id, NULL, -1)) { + if (snd_soc_acpi_id_present(mach) != false) { if (mach->machine_quirk) { mach_alt = mach->machine_quirk(mach); if (!mach_alt)
Current design to support second headphone driver in the same machine driver is to duplicate the entries in snd_soc_acpi_mach array and board configs in machine driver. We can avoid this by adding an id_alt field in snd_soc_acpi_mach structure to specify alternative ACPI HIDs for machine driver enumeration and leave the codec type detection to machine driver if necessary. Signed-off-by: Brent Lu <brent.lu@intel.com> --- include/sound/soc-acpi.h | 2 ++ sound/soc/soc-acpi.c | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)