ASoC: Intel: sof_sdw: add version_id to avoid rt714/rt715 confusion

RT715 and RT714 are essentially the same chip. In addition, there are
two versions, one supporting SoundWire 1.1 and one supporting
SoundWire 1.2 (SDCA).

The previous configurations assumed that RT714 was SDCA-only, which
isn't correct. Add support for the 4 possible combinations to avoid
confusions.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Jack Yu <jack.yu@realtek.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20201002211902.287692-5-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 b56df04775c2e35ad761bf23f675f0731b347478..b29946eb4355176b2ec937c68ea74515c5c9b12a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -295,12 +295,28 @@ static struct sof_sdw_codec_info codec_info_list[] = {
        },
        {
                .part_id = 0x714,
+               .version_id = 3,
+               .direction = {false, true},
+               .dai_name = "rt715-aif2",
+               .init = sof_sdw_rt715_sdca_init,
+       },
+       {
+               .part_id = 0x715,
+               .version_id = 3,
                .direction = {false, true},
                .dai_name = "rt715-aif2",
                .init = sof_sdw_rt715_sdca_init,
        },
+       {
+               .part_id = 0x714,
+               .version_id = 2,
+               .direction = {false, true},
+               .dai_name = "rt715-aif2",
+               .init = sof_sdw_rt715_init,
+       },
        {
                .part_id = 0x715,
+               .version_id = 2,
                .direction = {false, true},
                .dai_name = "rt715-aif2",
                .init = sof_sdw_rt715_init,