ASoC: SOF: topology: add code to parse config params for ACPDMIC dai

Add sof_ipc_dai_acpdmic_params and tokens to parse dmic channels and
rate params from topology file

Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20220614075251.21499-1-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sof/dai-amd.h b/include/sound/sof/dai-amd.h
index 90d09db..92f45c1 100644 (file)
--- a/include/sound/sof/dai-amd.h
+++ b/include/sound/sof/dai-amd.h
@@ -18,4 +18,11 @@ struct sof_ipc_dai_acp_params {
        uint32_t fsync_rate;    /* FSYNC frequency in Hz */
        uint32_t tdm_slots;
 } __packed;
+
+/* ACPDMIC Configuration Request - SOF_IPC_DAI_AMD_CONFIG */
+struct sof_ipc_dai_acpdmic_params {
+       uint32_t pdm_rate;
+       uint32_t pdm_ch;
+} __packed;
+
 #endif

diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h
index a818a0f..21d98f3 100644 (file)
--- a/include/sound/sof/dai.h
+++ b/include/sound/sof/dai.h
@@ -111,7 +111,7 @@ struct sof_ipc_dai_config {
                struct sof_ipc_dai_sai_params sai;
                struct sof_ipc_dai_acp_params acpbt;
                struct sof_ipc_dai_acp_params acpsp;
-               struct sof_ipc_dai_acp_params acpdmic;
+               struct sof_ipc_dai_acpdmic_params acpdmic;
                struct sof_ipc_dai_mtk_afe_params afe;
        };
 } __packed;

diff --git a/include/uapi/sound/sof/tokens.h b/include/uapi/sound/sof/tokens.h
index f7b2019..5caf75c 100644 (file)
--- a/include/uapi/sound/sof/tokens.h
+++ b/include/uapi/sound/sof/tokens.h
@@ -157,6 +157,10 @@
 /* MIXER */
 #define SOF_TKN_MIXER_TYPE                     1700
 
+/* ACPDMIC */
+#define SOF_TKN_AMD_ACPDMIC_RATE               1800
+#define SOF_TKN_AMD_ACPDMIC_CH                 1801
+
 /* CAVS AUDIO FORMAT */
 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_RATE      1900
 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_BIT_DEPTH 1901

diff --git a/sound/soc/sof/ipc3-pcm.c b/sound/soc/sof/ipc3-pcm.c
index c8774a8..b97e63d 100644 (file)
--- a/sound/soc/sof/ipc3-pcm.c
+++ b/sound/soc/sof/ipc3-pcm.c
@@ -344,10 +344,10 @@ static int sof_ipc3_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
                        channels->min, channels->max);
                break;
        case SOF_DAI_AMD_DMIC:
-               rate->min = private->dai_config->acpdmic.fsync_rate;
-               rate->max = private->dai_config->acpdmic.fsync_rate;
-               channels->min = private->dai_config->acpdmic.tdm_slots;
-               channels->max = private->dai_config->acpdmic.tdm_slots;
+               rate->min = private->dai_config->acpdmic.pdm_rate;
+               rate->max = private->dai_config->acpdmic.pdm_rate;
+               channels->min = private->dai_config->acpdmic.pdm_ch;
+               channels->max = private->dai_config->acpdmic.pdm_ch;
 
                dev_dbg(component->dev,
                        "AMD_DMIC rate_min: %d rate_max: %d\n", rate->min, rate->max);

diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
index a91d7df..5ee1537 100644 (file)
--- a/sound/soc/sof/ipc3-topology.c
+++ b/sound/soc/sof/ipc3-topology.c
@@ -266,6 +266,16 @@ static const struct sof_topology_token afe_tokens[] = {
                offsetof(struct sof_ipc_dai_mtk_afe_params, format)},
 };
 
+/* ACPDMIC */
+static const struct sof_topology_token acpdmic_tokens[] = {
+       {SOF_TKN_AMD_ACPDMIC_RATE,
+               SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
+               offsetof(struct sof_ipc_dai_acpdmic_params, pdm_rate)},
+       {SOF_TKN_AMD_ACPDMIC_CH,
+               SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
+               offsetof(struct sof_ipc_dai_acpdmic_params, pdm_ch)},
+};
+
 /* Core tokens */
 static const struct sof_topology_token core_tokens[] = {
        {SOF_TKN_COMP_CORE_ID, SND_SOC_TPLG_TUPLE_TYPE_WORD, get_token_u32,
@@ -300,6 +310,7 @@ static const struct sof_token_info ipc3_token_list[SOF_TOKEN_COUNT] = {
        [SOF_ESAI_TOKENS] = {"ESAI tokens", esai_tokens, ARRAY_SIZE(esai_tokens)},
        [SOF_SAI_TOKENS] = {"SAI tokens", sai_tokens, ARRAY_SIZE(sai_tokens)},
        [SOF_AFE_TOKENS] = {"AFE tokens", afe_tokens, ARRAY_SIZE(afe_tokens)},
+       [SOF_ACPDMIC_TOKENS] = {"ACPDMIC tokens", acpdmic_tokens, ARRAY_SIZE(acpdmic_tokens)},
 };
 
 /**
@@ -1120,20 +1131,22 @@ static int sof_link_acp_dmic_load(struct snd_soc_component *scomp, struct snd_so
        struct snd_soc_tplg_hw_config *hw_config = slink->hw_configs;
        struct sof_dai_private_data *private = dai->private;
        u32 size = sizeof(*config);
+       int ret;
 
        /* handle master/slave and inverted clocks */
        sof_dai_set_format(hw_config, config);
 
-       /* init IPC */
-       memset(&config->acpdmic, 0, sizeof(config->acpdmic));
        config->hdr.size = size;
 
-       config->acpdmic.fsync_rate = le32_to_cpu(hw_config->fsync_rate);
-       config->acpdmic.tdm_slots = le32_to_cpu(hw_config->tdm_slots);
+       /* parse the required set of ACPDMIC tokens based on num_hw_cfgs */
+       ret = sof_update_ipc_object(scomp, &config->acpdmic, SOF_ACPDMIC_TOKENS, slink->tuples,
+                                   slink->num_tuples, size, slink->num_hw_configs);
+       if (ret < 0)
+               return ret;
 
        dev_info(scomp->dev, "ACP_DMIC config ACP%d channel %d rate %d\n",
-                config->dai_index, config->acpdmic.tdm_slots,
-                config->acpdmic.fsync_rate);
+                config->dai_index, config->acpdmic.pdm_ch,
+                config->acpdmic.pdm_rate);
 
        dai->number_configs = 1;
        dai->current_config = 0;

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index 7948626..4284ea2 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -236,6 +236,7 @@ enum sof_tokens {
        SOF_AUDIO_FMT_NUM_TOKENS,
        SOF_COPIER_FORMAT_TOKENS,
        SOF_GAIN_TOKENS,
+       SOF_ACPDMIC_TOKENS,
 
        /* this should be the last */
        SOF_TOKEN_COUNT,

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 1893c59..7e54eb1 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -1739,6 +1739,10 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, struct snd_
                token_id = SOF_AFE_TOKENS;
                num_tuples += token_list[SOF_AFE_TOKENS].count;
                break;
+       case SOF_DAI_AMD_DMIC:
+               token_id = SOF_ACPDMIC_TOKENS;
+               num_tuples += token_list[SOF_ACPDMIC_TOKENS].count;
+               break;
        default:
                break;
        }