Unverified Commit 91b7f7d0 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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.

This reverts commit 41566e3d.

Link: https://lore.kernel.org/linux-sound/20251014071335.3844631-1-yung-chuan.liao@linux.intel.com/


Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20251215101036.9370-3-peter.ujfalusi@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c8f3c9fa

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

+0 −49
Original line number Diff line number Diff line
@@ -15,49 +15,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_machines[] = { 
};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_machines);



/*

 * Multi-function codecs with three endpoints created for

 * headset, amp and dmic functions.

 */

static const struct snd_soc_acpi_endpoint rt_mf_endpoints[] = {

	{

		.num = 0,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{

		.num = 1,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

	{

		.num = 2,

		.aggregated = 0,

		.group_position = 0,

		.group_id = 0,

	},

};



static const struct snd_soc_acpi_adr_device rt722_3_single_adr[] = {

	{

		.adr = 0x000330025d072201ull,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt722"

	}

};



static const struct snd_soc_acpi_link_adr nvl_rt722_l3[] = {

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt722_3_single_adr),

		.adr_d = rt722_3_single_adr,

	},

	{}

};



/* 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 */
@@ -79,12 +36,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_nvl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

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

	},

	{

		.link_mask = BIT(3),

		.links = nvl_rt722_l3,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-nvl-rt722.tplg",

	},

	{},

};

EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_nvl_sdw_machines);