]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: sdw_utils: Add missed component_name strings for speaker amps
authorPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Wed, 9 Jul 2025 02:57:45 +0000 (10:57 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 9 Jul 2025 13:33:58 +0000 (14:33 +0100)
Several speaker amp was missed when the compoennt_name was added, which
results missing " spk:" from the components string, confusing UCM.

Fixes: f792733e08d5 ("ASoC: sdw_utils: add component_name string to dai_info")
Cc: stable@vger.kernel.org
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20250709025745.1285788-1-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sdw_utils/soc_sdw_utils.c

index a744ca019378a4b7d3c015d73ebe6fdc5bb3439f..1580331cd34c5849c9df6686739177da50cda1a2 100644 (file)
@@ -218,6 +218,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {true, false},
                                .dai_name = "rt1308-aif",
+                               .component_name = "rt1308",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
                                .init = asoc_sdw_rt_amp_init,
@@ -238,6 +239,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {true, true},
                                .dai_name = "rt1316-aif",
+                               .component_name = "rt1316",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
                                .init = asoc_sdw_rt_amp_init,
@@ -257,6 +259,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {true, true},
                                .dai_name = "rt1318-aif",
+                               .component_name = "rt1318",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
                                .init = asoc_sdw_rt_amp_init,
@@ -370,6 +373,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {true, false},
                                .dai_name = "rt721-sdca-aif2",
+                               .component_name = "rt721",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                /* No feedback capability is provided by rt721-sdca codec driver*/
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
@@ -596,6 +600,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {true, false},
                                .dai_name = "cs42l43-dp6",
+                               .component_name = "cs42l43",
                                .dai_type = SOC_SDW_DAI_TYPE_AMP,
                                .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
                                .init = asoc_sdw_cs42l43_spk_init,