]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: soc_sdw_utils: remove codec name index of snd_soc_sdca codecs
authorBard Liao <yung-chuan.liao@linux.intel.com>
Mon, 16 Mar 2026 01:03:08 +0000 (09:03 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 16 Mar 2026 18:14:39 +0000 (18:14 +0000)
The index could change if any endpoint is not present. Remove the index
and let the machine driver get the right codec name from the registered
components.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260316010308.285622-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sdw_utils/soc_sdw_utils.c

index fe9b79ace3871aa7305c7708b49b5dc983d5ab99..75658148df57c0e3a0005f7469655671bf607c8b 100644 (file)
@@ -855,7 +855,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                .dais = {
                        {
                                .direction = {true, false},
-                               .codec_name = "snd_soc_sdca.UAJ.1",
+                               .codec_name = "snd_soc_sdca.UAJ",
                                .dai_name = "IT 41",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
@@ -863,7 +863,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        },
                        {
                                .direction = {false, true},
-                               .codec_name = "snd_soc_sdca.SmartMic.0",
+                               .codec_name = "snd_soc_sdca.SmartMic",
                                .dai_name = "OT 113",
                                .dai_type = SOC_SDW_DAI_TYPE_MIC,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
@@ -871,7 +871,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        },
                        {
                                .direction = {false, true},
-                               .codec_name = "snd_soc_sdca.UAJ.1",
+                               .codec_name = "snd_soc_sdca.UAJ",
                                .dai_name = "OT 36",
                                .dai_type = SOC_SDW_DAI_TYPE_JACK,
                                .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
@@ -880,7 +880,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                .dai_num = 3,
                .auxs = {
                        {
-                               .codec_name = "snd_soc_sdca.HID.2",
+                               .codec_name = "snd_soc_sdca.HID",
                        },
                },
                .aux_num = 1,