Unverified Commit 754b3dad authored by Mac Chiang's avatar Mac Chiang Committed by Mark Brown
Browse files

ASoC: Intel: soc-acpi-intel-ptl-match: drop rt721 related match tables 



Use functional topologies to support all RT721-related topology and
amplifier combinations,
e.g. sof-ptl-rt721.tplg, sof-ptl-rt721-l3-rt1320-l3.tplg.

If these entries are not removed, they will all use the sof-ptl-rt721.tplg.

Signed-off-by: default avatarMac Chiang <mac.chiang@intel.com>
Reviewed-by: default avatarLiam Girdwood <liam.r.girdwood@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260203100027.3741754-1-yung-chuan.liao@linux.intel.com


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

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

+0 −50
Original line number Diff line number Diff line
@@ -356,33 +356,6 @@ static const struct snd_soc_acpi_adr_device rt1320_3_group1_adr[] = { 
	}

};



static const struct snd_soc_acpi_adr_device rt721_0_single_adr[] = {

	{

		.adr = 0x000030025d072101ull,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt721"

	}

};



static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {

	{

		.adr = 0x000330025d072101ull,

		.num_endpoints = ARRAY_SIZE(rt_mf_endpoints),

		.endpoints = rt_mf_endpoints,

		.name_prefix = "rt721"

	}

};



static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {

	{

		.mask = BIT(3),

		.num_adr = ARRAY_SIZE(rt721_3_single_adr),

		.adr_d = rt721_3_single_adr,

	},

	{},

};



static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {

	{

		.adr = 0x000030025d072201ull,
@@ -506,15 +479,6 @@ static const struct snd_soc_acpi_link_adr ptl_cs42l43_l2_cs35l56x6_l13[] = { 
	{}

};



static const struct snd_soc_acpi_link_adr ptl_rt721_l0[] = {

	{

		.mask = BIT(0),

		.num_adr = ARRAY_SIZE(rt721_0_single_adr),

		.adr_d = rt721_0_single_adr,

	},

	{}

};



static const struct snd_soc_acpi_link_adr ptl_rt722_only[] = {

	{

		.mask = BIT(0),
@@ -734,13 +698,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { 
		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt711.tplg",

	},

	{

		.link_mask = BIT(0),

		.links = ptl_rt721_l0,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt721.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

		.link_mask = BIT(0),

		.links = ptl_rt722_only,
@@ -763,13 +720,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = { 
		.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

		.link_mask = BIT(3),

		.links = ptl_rt721_l3,

		.drv_name = "sof_sdw",

		.sof_tplg_filename = "sof-ptl-rt721.tplg",

		.get_function_tplg_files = sof_sdw_get_tplg_files,

	},

	{

		.link_mask = BIT(3),

		.links = ptl_rt722_l3,