ASoC: soc_sdw_utils: add name_prefix to asoc_sdw_codec_info struct

Currently, the codec name_prefix of Intel SoundWire machine driver is
from the ACPI match table. We can have it in the asoc_sdw_codec_info
struct as a default name_prefix of a codec if there is no corresponding
audio config found in the ACPI match table.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Simon Trimmer <simont@opensource.cirrus.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://patch.msgid.link/20251014071335.3844631-4-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bard Liao 2025-10-14 15:13:29 +08:00 committed by Mark Brown
parent 3180c7b157
commit aa1ee85ce3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 30 additions and 0 deletions

View File

@ -68,6 +68,7 @@ struct asoc_sdw_codec_info {
const int part_id;
const int version_id;
const char *codec_name;
const char *name_prefix;
int amp_num;
const u8 acpi_id[ACPI_ID_LEN];
const bool ignore_internal_dmic;

View File

@ -60,6 +60,7 @@ static const struct snd_kcontrol_new rt700_controls[] = {
struct asoc_sdw_codec_info codec_info_list[] = {
{
.part_id = 0x0000, /* TAS2783A */
.name_prefix = "tas2783",
.dais = {
{
.direction = {true, true},
@ -78,6 +79,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x700,
.name_prefix = "rt700",
.dais = {
{
.direction = {true, true},
@ -95,6 +97,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x711,
.name_prefix = "rt711",
.version_id = 3,
.dais = {
{
@ -115,6 +118,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x711,
.name_prefix = "rt711",
.version_id = 2,
.dais = {
{
@ -135,6 +139,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x712,
.name_prefix = "rt712",
.version_id = 3,
.dais = {
{
@ -176,6 +181,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1712,
.name_prefix = "rt712-dmic",
.version_id = 3,
.dais = {
{
@ -190,6 +196,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x713,
.name_prefix = "rt713",
.version_id = 3,
.dais = {
{
@ -217,6 +224,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1713,
.name_prefix = "rt713-dmic",
.version_id = 3,
.dais = {
{
@ -231,6 +239,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1308,
.name_prefix = "rt1308",
.acpi_id = "10EC1308",
.dais = {
{
@ -253,6 +262,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1316,
.name_prefix = "rt1316",
.dais = {
{
.direction = {true, true},
@ -273,6 +283,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1318,
.name_prefix = "rt1318",
.dais = {
{
.direction = {true, true},
@ -293,6 +304,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x1320,
.name_prefix = "rt1320",
.dais = {
{
.direction = {true, false},
@ -313,6 +325,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x714,
.name_prefix = "rt714",
.version_id = 3,
.ignore_internal_dmic = true,
.dais = {
@ -328,6 +341,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x715,
.name_prefix = "rt715",
.version_id = 3,
.ignore_internal_dmic = true,
.dais = {
@ -343,6 +357,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x714,
.name_prefix = "rt714",
.version_id = 2,
.ignore_internal_dmic = true,
.dais = {
@ -358,6 +373,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x715,
.name_prefix = "rt715",
.version_id = 2,
.ignore_internal_dmic = true,
.dais = {
@ -373,6 +389,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x721,
.name_prefix = "rt721",
.version_id = 3,
.dais = {
{
@ -415,6 +432,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x722,
.name_prefix = "rt722",
.version_id = 3,
.dais = {
{
@ -459,6 +477,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x8373,
.name_prefix = "Left",
.dais = {
{
.direction = {true, true},
@ -478,6 +497,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x8363,
.name_prefix = "Left",
.dais = {
{
.direction = {true, false},
@ -497,6 +517,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x5682,
.name_prefix = "rt5682",
.dais = {
{
.direction = {true, true},
@ -514,6 +535,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x3556,
.name_prefix = "AMP",
.dais = {
{
.direction = {true, false},
@ -540,6 +562,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x3563,
.name_prefix = "AMP",
.dais = {
{
.direction = {true, false},
@ -566,6 +589,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x4242,
.name_prefix = "cs42l42",
.dais = {
{
.direction = {true, true},
@ -583,6 +607,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x4243,
.name_prefix = "cs42l43",
.codec_name = "cs42l43-codec",
.count_sidecar = asoc_sdw_bridge_cs35l56_count_sidecar,
.add_sidecar = asoc_sdw_bridge_cs35l56_add_sidecar,
@ -634,6 +659,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0xaaaa, /* generic codec mockup */
.name_prefix = "sdw_mockup_mmulti-function",
.version_id = 0,
.dais = {
{
@ -659,6 +685,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0xaa55, /* headset codec mockup */
.name_prefix = "sdw_mockup_headset0",
.version_id = 0,
.dais = {
{
@ -672,6 +699,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x55aa, /* amplifier mockup */
.name_prefix = "sdw_mockup_amp1",
.version_id = 0,
.dais = {
{
@ -685,6 +713,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
},
{
.part_id = 0x5555,
.name_prefix = "sdw_mockup_mic0",
.version_id = 0,
.dais = {
{