ASoC: intel: sof_sdw: Move the builtin microphones to dataport 1
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 19 Oct 2023 17:34:05 +0000 (12:34 -0500)
committerMark Brown <broonie@kernel.org>
Thu, 19 Oct 2023 18:00:16 +0000 (19:00 +0100)
cs42l43 supports 4 hardwired microphones, but only supports up to 2
microphone headsets. Only dataport 1 can support 4 channel capture,
but that is currently used for the headset microphone. Switch things
around such that DP1 is used for the builtin mics and DP2 is used for
the headset microphones.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231019173411.166759-5-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_sdw.c

index ad1d01ebbcd90592e79f96cbbf3dedfd43fecc89..3312ad8a563b3fb812ba4070fd0914b9a07848fd 100644 (file)
@@ -939,16 +939,16 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                        {
                                .direction = {false, true},
                                .dai_name = "cs42l43-dp1",
-                               .dai_type = SOF_SDW_DAI_TYPE_JACK,
-                               .dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID},
+                               .dai_type = SOF_SDW_DAI_TYPE_MIC,
+                               .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
+                               .init = sof_sdw_cs42l43_dmic_init,
                        },
                        {
                                .direction = {false, true},
                                .dai_name = "cs42l43-dp2",
-                               .dai_type = SOF_SDW_DAI_TYPE_MIC,
-                               .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
-                               .init = sof_sdw_cs42l43_dmic_init,
-                       }
+                               .dai_type = SOF_SDW_DAI_TYPE_JACK,
+                               .dailink = {SDW_UNUSED_DAI_ID, SDW_JACK_IN_DAI_ID},
+                       },
                },
                .dai_num = 3,
        },