Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: Intel: soc-acpi: add NVL match tables

For now the tables are basic for mockup devices

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251104121650.21872-4-peter.ujfalusi@linux.intel.com

authored by

Peter Ujfalusi and committed by
Takashi Iwai
2bd7bf3c cd53591a

+44
+2
include/sound/soc-acpi-intel-match.h
··· 34 34 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[]; 35 35 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[]; 36 36 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[]; 37 + extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[]; 37 38 38 39 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[]; 39 40 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[]; ··· 47 46 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[]; 48 47 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[]; 49 48 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[]; 49 + extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[]; 50 50 51 51 /* 52 52 * generic table used for HDA codec-based platforms, possibly with
+1
sound/soc/intel/common/Makefile
··· 11 11 soc-acpi-intel-arl-match.o \ 12 12 soc-acpi-intel-lnl-match.o \ 13 13 soc-acpi-intel-ptl-match.o \ 14 + soc-acpi-intel-nvl-match.o \ 14 15 soc-acpi-intel-hda-match.o \ 15 16 soc-acpi-intel-sdw-mockup-match.o sof-function-topology-lib.o 16 17
+41
sound/soc/intel/common/soc-acpi-intel-nvl-match.c
··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + /* 3 + * soc-acpi-intel-nvl-match.c - tables and support for NVL ACPI enumeration. 4 + * 5 + * Copyright (c) 2025, Intel Corporation. 6 + * 7 + */ 8 + 9 + #include <sound/soc-acpi.h> 10 + #include <sound/soc-acpi-intel-match.h> 11 + #include "soc-acpi-intel-sdw-mockup-match.h" 12 + 13 + struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = { 14 + {}, 15 + }; 16 + EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines); 17 + 18 + /* this table is used when there is no I2S codec present */ 19 + struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = { 20 + /* mockup tests need to be first */ 21 + { 22 + .link_mask = GENMASK(3, 0), 23 + .links = sdw_mockup_headset_2amps_mic, 24 + .drv_name = "sof_sdw", 25 + .sof_tplg_filename = "sof-nvl-rt711-rt1308-rt715.tplg", 26 + }, 27 + { 28 + .link_mask = BIT(0) | BIT(1) | BIT(3), 29 + .links = sdw_mockup_headset_1amp_mic, 30 + .drv_name = "sof_sdw", 31 + .sof_tplg_filename = "sof-nvl-rt711-rt1308-mono-rt715.tplg", 32 + }, 33 + { 34 + .link_mask = GENMASK(2, 0), 35 + .links = sdw_mockup_mic_headset_1amp, 36 + .drv_name = "sof_sdw", 37 + .sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg", 38 + }, 39 + {}, 40 + }; 41 + EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);