Skip to content

Commit 4f49e88

Browse files
committed
ASoC: Intel: soc-acpi-intel-nvl-match: Drop rt722 l3 from the match table
Revert "ASoC: Intel: soc-acpi-intel-nvl-match: add rt722 l3 support" NVL should be only using functional topologies for products, no monolithic topologies are planned to be released. In parallel a feature has been landed [1] which allows to remove the entries from the match table for sdca codecs to rely solely on function fragments. Link: https://lore.kernel.org/linux-sound/20251014071335.3844631-1-yung-chuan.liao@linux.intel.com/ This reverts commit 41566e3. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 806274d commit 4f49e88

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

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

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = {
1515
};
1616
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);
1717

18-
/*
19-
* Multi-function codecs with three endpoints created for
20-
* headset, amp and dmic functions.
21-
*/
22-
static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {
23-
{
24-
.num = 0,
25-
.aggregated = 0,
26-
.group_position = 0,
27-
.group_id = 0,
28-
},
29-
{
30-
.num = 1,
31-
.aggregated = 0,
32-
.group_position = 0,
33-
.group_id = 0,
34-
},
35-
{
36-
.num = 2,
37-
.aggregated = 0,
38-
.group_position = 0,
39-
.group_id = 0,
40-
},
41-
};
42-
43-
static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {
44-
{
45-
.adr = 0x000330025d072201ull,
46-
.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),
47-
.endpoints = rt_mf_endpoints,
48-
.name_prefix = "rt722"
49-
}
50-
};
51-
52-
static const struct snd_soc_acpi_link_adr nvl_rt722_l3[] = {
53-
{
54-
.mask = BIT(3),
55-
.num_adr = ARRAY_SIZE(rt722_3_single_adr),
56-
.adr_d = rt722_3_single_adr,
57-
},
58-
{}
59-
};
60-
6118
/* this table is used when there is no I2S codec present */
6219
struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
6320
/* mockup tests need to be first */
@@ -79,12 +36,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = {
7936
.drv_name = "sof_sdw",
8037
.sof_tplg_filename = "sof-nvl-rt715-rt711-rt1308-mono.tplg",
8138
},
82-
{
83-
.link_mask = BIT(3),
84-
.links = nvl_rt722_l3,
85-
.drv_name = "sof_sdw",
86-
.sof_tplg_filename = "sof-nvl-rt722.tplg",
87-
},
8839
{},
8940
};
9041
EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);

0 commit comments

Comments
 (0)