Skip to content

Commit 51bebf3

Browse files
Amadeusz Sławińskitiwai
authored andcommitted
ALSA: hda: intel-dsp-config: Switch to ACPI NHLT
Now that NHLT support in ACPI framework was introduced, migrate intel-dsp-config driver to new API. Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com> Link: https://lore.kernel.org/r/20240419084307.2718881-2-cezary.rojewski@intel.com Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent a640aca commit 51bebf3

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

sound/hda/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ config SND_INTEL_NHLT
4242

4343
config SND_INTEL_DSP_CONFIG
4444
tristate
45+
select ACPI_NHLT if ACPI
4546
select SND_INTEL_NHLT if ACPI
4647
select SND_INTEL_SOUNDWIRE_ACPI if ACPI
4748
# this config should be selected only for Intel DSP platforms.

sound/hda/intel-dsp-config.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include <sound/intel-nhlt.h>
1414
#include <sound/soc-acpi.h>
1515

16+
#include <acpi/nhlt.h>
17+
1618
static int dsp_driver;
1719

1820
module_param(dsp_driver, int, 0444);
@@ -570,15 +572,15 @@ static const struct config_entry *snd_intel_dsp_find_config
570572

571573
static int snd_intel_dsp_check_dmic(struct pci_dev *pci)
572574
{
573-
struct nhlt_acpi_table *nhlt;
574575
int ret = 0;
575576

576-
nhlt = intel_nhlt_init(&pci->dev);
577-
if (nhlt) {
578-
if (intel_nhlt_has_endpoint_type(nhlt, NHLT_LINK_DMIC))
579-
ret = 1;
580-
intel_nhlt_free(nhlt);
581-
}
577+
acpi_nhlt_get_gbl_table();
578+
579+
if (acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1))
580+
ret = 1;
581+
582+
acpi_nhlt_put_gbl_table();
583+
582584
return ret;
583585
}
584586

0 commit comments

Comments
 (0)