ASoC: mediatek: mt8186: support DSP downlink

1. add DSP downlink link widget
2. add DSP to I2S route path

Signed-off-by: Chunxu Li <chunxu.li@mediatek.com>
Link: https://lore.kernel.org/r/20220818025113.17144-2-chunxu.li@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c b/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
index eb729ab00f5aa79cf08dd3601f80d86472ca450b..d7e94e6a19c704f031b18ee0a8a1190faa298f60 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
+++ b/sound/soc/mediatek/mt8186/mt8186-afe-pcm.c
@@ -1359,6 +1359,9 @@ static const struct snd_soc_dapm_widget mt8186_memif_widgets[] = {
        SND_SOC_DAPM_MUX("UL5_IN_MUX", SND_SOC_NOPM, 0, 0,
                         &ul5_in_mux_control),
 
+       SND_SOC_DAPM_MIXER("DSP_DL1_VIRT", SND_SOC_NOPM, 0, 0, NULL, 0),
+       SND_SOC_DAPM_MIXER("DSP_DL2_VIRT", SND_SOC_NOPM, 0, 0, NULL, 0),
+
        SND_SOC_DAPM_INPUT("UL1_VIRTUAL_INPUT"),
        SND_SOC_DAPM_INPUT("UL2_VIRTUAL_INPUT"),
        SND_SOC_DAPM_INPUT("UL3_VIRTUAL_INPUT"),

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c b/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
index d7a2271695489620e249f7f362e4ae445def493a..e553a555d168798bdbc8a065f45e3f44748949ce 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
@@ -658,9 +658,15 @@ static const struct snd_soc_dapm_route mtk_dai_i2s_routes[] = {
        {"I2S1_CH1", "DL1_CH1 Switch", "DL1"},
        {"I2S1_CH2", "DL1_CH2 Switch", "DL1"},
 
+       {"I2S1_CH1", "DL1_CH1 Switch", "DSP_DL1_VIRT"},
+       {"I2S1_CH2", "DL1_CH2 Switch", "DSP_DL1_VIRT"},
+
        {"I2S1_CH1", "DL2_CH1 Switch", "DL2"},
        {"I2S1_CH2", "DL2_CH2 Switch", "DL2"},
 
+       {"I2S1_CH1", "DL2_CH1 Switch", "DSP_DL2_VIRT"},
+       {"I2S1_CH2", "DL2_CH2 Switch", "DSP_DL2_VIRT"},
+
        {"I2S1_CH1", "DL3_CH1 Switch", "DL3"},
        {"I2S1_CH2", "DL3_CH2 Switch", "DL3"},
 
@@ -728,9 +734,15 @@ static const struct snd_soc_dapm_route mtk_dai_i2s_routes[] = {
        {"I2S3_CH1", "DL1_CH1 Switch", "DL1"},
        {"I2S3_CH2", "DL1_CH2 Switch", "DL1"},
 
+       {"I2S3_CH1", "DL1_CH1 Switch", "DSP_DL1_VIRT"},
+       {"I2S3_CH2", "DL1_CH2 Switch", "DSP_DL1_VIRT"},
+
        {"I2S3_CH1", "DL2_CH1 Switch", "DL2"},
        {"I2S3_CH2", "DL2_CH2 Switch", "DL2"},
 
+       {"I2S3_CH1", "DL2_CH1 Switch", "DSP_DL2_VIRT"},
+       {"I2S3_CH2", "DL2_CH2 Switch", "DSP_DL2_VIRT"},
+
        {"I2S3_CH1", "DL3_CH1 Switch", "DL3"},
        {"I2S3_CH2", "DL3_CH2 Switch", "DL3"},