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>

diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig
index 741179ccbd4e4a732e79b3da418bc9f040664049..e2ac247fc1d40c30c1e998c7789699c0b551bb52 100644 (file)
--- a/sound/hda/Kconfig
+++ b/sound/hda/Kconfig
@@ -42,6 +42,7 @@ config SND_INTEL_NHLT
 
 config SND_INTEL_DSP_CONFIG
        tristate
+       select ACPI_NHLT if ACPI
        select SND_INTEL_NHLT if ACPI
        select SND_INTEL_SOUNDWIRE_ACPI if ACPI
        # this config should be selected only for Intel DSP platforms.

diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 6a384b922e4fada5bfed7fa8b7e0f95ea7e3457a..ea050805c20f50fd7c072690b81d33cd906f141b 100644 (file)
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -13,6 +13,8 @@
 #include <sound/intel-nhlt.h>
 #include <sound/soc-acpi.h>
 
+#include <acpi/nhlt.h>
+
 static int dsp_driver;
 
 module_param(dsp_driver, int, 0444);
@@ -570,15 +572,15 @@ static const struct config_entry *snd_intel_dsp_find_config
 
 static int snd_intel_dsp_check_dmic(struct pci_dev *pci)
 {
-       struct nhlt_acpi_table *nhlt;
        int ret = 0;
 
-       nhlt = intel_nhlt_init(&pci->dev);
-       if (nhlt) {
-               if (intel_nhlt_has_endpoint_type(nhlt, NHLT_LINK_DMIC))
-                       ret = 1;
-               intel_nhlt_free(nhlt);
-       }
+       acpi_nhlt_get_gbl_table();
+
+       if (acpi_nhlt_find_endpoint(ACPI_NHLT_LINKTYPE_PDM, -1, -1, -1))
+               ret = 1;
+
+       acpi_nhlt_put_gbl_table();
+
        return ret;
 }