mirror of
https://abf.rosa.ru/djam/kernel-5.15.git
synced 2025-02-23 18:42:55 +00:00
86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
|
From 2741c914411cdc260eafe7887536e80d9d1c6966 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brent Lu <brent.lu@intel.com>
|
||
|
|
Date: Sat, 30 Oct 2021 01:14:04 +0800
|
||
|
|
Subject: [PATCH 433/435] 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>
|
||
|
|
---
|
||
|
|
include/sound/soc-acpi.h | 3 +++
|
||
|
|
sound/soc/soc-acpi.c | 24 ++++++++++++++++++++++--
|
||
|
|
2 files changed, 25 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
|
||
|
|
index d4fecd025..20958aedc 100644
|
||
|
|
--- a/include/sound/soc-acpi.h
|
||
|
|
+++ b/include/sound/soc-acpi.h
|
||
|
|
@@ -150,6 +150,8 @@ 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.
|
||
|
|
+ * @comp_ids: list of compatible audio codecs using the same machine driver,
|
||
|
|
+ * firmware and topology
|
||
|
|
* @link_mask: describes required board layout, e.g. for SoundWire.
|
||
|
|
* @links: array of link _ADR descriptors, null terminated.
|
||
|
|
* @drv_name: machine driver name
|
||
|
|
@@ -168,6 +170,7 @@ struct snd_soc_acpi_link_adr {
|
||
|
|
/* Descriptor for SST ASoC machine driver */
|
||
|
|
struct snd_soc_acpi_mach {
|
||
|
|
const u8 id[ACPI_ID_LEN];
|
||
|
|
+ const struct snd_soc_acpi_codecs *comp_ids;
|
||
|
|
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 395229bf5..2ae99b49d 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)
|
||
|
|
--
|
||
|
|
2.35.2
|
||
|
|
|