Merge tag 'asoc-v5.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / sound / soc / amd / acp / acp-mach-common.c

diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
index cd05ee2..caa202f 100644 (file)
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -291,6 +291,32 @@ static const struct snd_soc_ops acp_card_rt5682s_ops = {
        .shutdown = acp_card_shutdown,
 };
 
+static const unsigned int dmic_channels[] = {
+       DUAL_CHANNEL, FOUR_CHANNEL,
+};
+
+static const struct snd_pcm_hw_constraint_list dmic_constraints_channels = {
+       .count = ARRAY_SIZE(dmic_channels),
+       .list = dmic_channels,
+       .mask = 0,
+};
+
+static int acp_card_dmic_startup(struct snd_pcm_substream *substream)
+{
+       struct snd_pcm_runtime *runtime = substream->runtime;
+
+       snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                                  &dmic_constraints_channels);
+       snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                  &constraints_rates);
+
+       return 0;
+}
+
+static const struct snd_soc_ops acp_card_dmic_ops = {
+       .startup = acp_card_dmic_startup,
+};
+
 /* Declare RT1019 codec components */
 SND_SOC_DAILINK_DEF(rt1019,
        DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:00", "rt1019-aif"),
@@ -438,6 +464,8 @@ SND_SOC_DAILINK_DEF(sof_sp,
        DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-sp")));
 SND_SOC_DAILINK_DEF(sof_dmic,
        DAILINK_COMP_ARRAY(COMP_CPU("acp-sof-dmic")));
+SND_SOC_DAILINK_DEF(pdm_dmic,
+       DAILINK_COMP_ARRAY(COMP_CPU("acp-pdm-dmic")));
 
 int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
 {
@@ -556,6 +584,8 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                num_links++;
 
        links = devm_kzalloc(dev, sizeof(struct snd_soc_dai_link) * num_links, GFP_KERNEL);
+       if (!links)
+               return -ENOMEM;
 
        if (drv_data->hs_cpu_id == I2S_SP) {
                links[i].name = "acp-headset-codec";
@@ -613,6 +643,26 @@ int acp_legacy_dai_links_create(struct snd_soc_card *card)
                        links[i].ops = &acp_card_maxim_ops;
                        links[i].init = acp_card_maxim_init;
                }
+               i++;
+       }
+
+       if (drv_data->dmic_cpu_id == DMIC) {
+               links[i].name = "acp-dmic-codec";
+               links[i].id = DMIC_BE_ID;
+               if (drv_data->dmic_codec_id == DMIC) {
+                       links[i].codecs = dmic_codec;
+                       links[i].num_codecs = ARRAY_SIZE(dmic_codec);
+               } else {
+                       /* Use dummy codec if codec id not specified */
+                       links[i].codecs = dummy_codec;
+                       links[i].num_codecs = ARRAY_SIZE(dummy_codec);
+               }
+               links[i].cpus = pdm_dmic;
+               links[i].num_cpus = ARRAY_SIZE(pdm_dmic);
+               links[i].platforms = platform_component;
+               links[i].num_platforms = ARRAY_SIZE(platform_component);
+               links[i].ops = &acp_card_dmic_ops;
+               links[i].dpcm_capture = 1;
        }
 
        card->dai_link = links;