ASoC: intel: sof_sdw: Allow direct specification of CODEC name

Add support for MFD based CODEC drivers, by allowing the CODEC name to
not be the SoundWire device directly.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.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://lore.kernel.org/r/20230731214257.444605-20-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 846ba8e1515cfc3dfd0e7ccd487e93bc51ce2b66..e6faed2b99b2082fd0556c6dc310353803b3ffca 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1174,7 +1174,11 @@ static int create_codec_dai_name(struct device *dev,
                class_id = SDW_CLASS_ID(adr);
 
                comp_index = i - adr_index + offset;
-               if (is_unique_device(adr_link, sdw_version, mfg_id, part_id,
+               if (codec_info_list[codec_index].codec_name) {
+                       codec[comp_index].name =
+                               devm_kstrdup(dev, codec_info_list[codec_index].codec_name,
+                                            GFP_KERNEL);
+               } else if (is_unique_device(adr_link, sdw_version, mfg_id, part_id,
                                     class_id, i)) {
                        codec_str = "sdw:%01x:%04x:%04x:%02x";
                        codec[comp_index].name =

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 37402170d5f9a4025315daa64a9a656b0605c27a..fe234b98eb64d8a0534da7eefb6057d04e31657c 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -80,6 +80,7 @@ struct sof_sdw_dai_info {
 struct sof_sdw_codec_info {
        const int part_id;
        const int version_id;
+       const char *codec_name;
        int amp_num;
        const u8 acpi_id[ACPI_ID_LEN];
        const bool ignore_pch_dmic;