Skip to content

Commit 445dce1

Browse files
ujfalusibardliao
authored andcommitted
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>
1 parent abffaf8 commit 445dce1

3 files changed

Lines changed: 44 additions & 0 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];
3434
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_machines[];
3535
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_machines[];
3636
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[];
3738

3839
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];
3940
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[];
4647
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_lnl_sdw_machines[];
4748
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[];
4849
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[];
50+
extern struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[];
4951

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

sound/soc/intel/common/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ snd-soc-acpi-intel-match-y := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-matc
1111
soc-acpi-intel-arl-match.o \
1212
soc-acpi-intel-lnl-match.o \
1313
soc-acpi-intel-ptl-match.o \
14+
soc-acpi-intel-nvl-match.o \
1415
soc-acpi-intel-hda-match.o \
1516
soc-acpi-intel-sdw-mockup-match.o sof-function-topology-lib.o
1617

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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);

0 commit comments

Comments
 (0)