Commit 2bd7bf3c authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Takashi Iwai
Browse files

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



For now the tables are basic for mockup devices

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20251104121650.21872-4-peter.ujfalusi@linux.intel.com
parent cd53591a

include/sound/soc-acpi-intel-match.h

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[];



extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cfl_sdw_machines[];
@@ -46,6 +47,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[]; 
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[];

extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[];



/*

 * generic table used for HDA codec-based platforms, possibly with

sound/soc/intel/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ snd-soc-acpi-intel-match-y := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-matc 
	soc-acpi-intel-arl-match.o \

	soc-acpi-intel-lnl-match.o \

	soc-acpi-intel-ptl-match.o \

	soc-acpi-intel-nvl-match.o \

	soc-acpi-intel-hda-match.o \

	soc-acpi-intel-sdw-mockup-match.o sof-function-topology-lib.o

sound/soc/intel/common/soc-acpi-intel-nvl-match.c

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * soc-acpi-intel-nvl-match.c - tables and support for NVL ACPI enumeration.

 *

 * Copyright (c) 2025, Intel Corporation.

 *

 */



#include <sound/soc-acpi.h>

#include <sound/soc-acpi-intel-match.h>

#include "soc-acpi-intel-sdw-mockup-match.h"



struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = {

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);



/* this table is used when there is no I2S codec present */

struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {

	/* mockup tests need to be first */

	{

		.link_mask = GENMASK(3, 0),

		.links = sdw_mockup_headset_2amps_mic,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-nvl-rt711-rt1308-rt715.tplg",

	},

	{

		.link_mask = BIT(0) | BIT(1) | BIT(3),

		.links = sdw_mockup_headset_1amp_mic,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-nvl-rt711-rt1308-mono-rt715.tplg",

	},

	{

		.link_mask = GENMASK(2, 0),

		.links = sdw_mockup_mic_headset_1amp,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);