ASoC: Intel: sof_sdw: change rt715-sdca dai name

As rt715-sdca dai name has been changed in codec driver, we should
change it in machine driver, too. Changing the dai name in
codec_info_list[] also help sof_sdw_rtd_init() to run .rtd_init()
from the same codec.

Reviewed-by: Chao Song <chao.song@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240326160429.13560-30-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 3874da8d7fe4ac4630c32eab02a6b7622d46a363..1816ec5dd5806013553ccb2c3a4a610785fbed9a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -838,7 +838,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                .dais = {
                        {
                                .direction = {false, true},
-                               .dai_name = "rt715-aif2",
+                               .dai_name = "rt715-sdca-aif2",
                                .dai_type = SOF_SDW_DAI_TYPE_MIC,
                                .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
                                .rtd_init = rt_dmic_rtd_init,
@@ -853,7 +853,7 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                .dais = {
                        {
                                .direction = {false, true},
-                               .dai_name = "rt715-aif2",
+                               .dai_name = "rt715-sdca-aif2",
                                .dai_type = SOF_SDW_DAI_TYPE_MIC,
                                .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
                                .rtd_init = rt_dmic_rtd_init,

diff --git a/sound/soc/intel/boards/sof_sdw_rt_dmic.c b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
index 5aec8422656cd116683bbab64b7e21d5f0a741d0..2f7ed9b31e79325b6201b79d360623031b0f7b65 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_dmic.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
@@ -14,6 +14,7 @@
 
 static const char * const dmics[] = {
        "rt715",
+       "rt715-sdca",
        "rt712-sdca-dmic",
        "rt722-sdca",
 };