ASoC: SOF: imx: Read ESAI parameters and send them to DSP

ESAI parameters are read for topology file, packed into
sof_ipc_dai_esai_parms struct and then sent to DSP.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191008164443.1358-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 6490b15771528912924a51818869b034ffb1bc95..d72798d2b3026f825c8f520a254046f862e37140 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -682,6 +682,14 @@ static int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
        case SOF_DAI_INTEL_ALH:
                /* do nothing for ALH dai_link */
                break;
+       case SOF_DAI_IMX_ESAI:
+               channels->min = dai->dai_config->esai.tdm_slots;
+               channels->max = dai->dai_config->esai.tdm_slots;
+
+               dev_dbg(sdev->dev,
+                       "channels_min: %d channels_max: %d\n",
+                       channels->min, channels->max);
+               break;
        default:
                dev_err(sdev->dev, "error: invalid DAI type %d\n",
                        dai->dai_config->type);

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index 2e5fab1cfbb4f8098f89cb092fc0025a4925fec2..a29109ea3c06514caef2ce9b6d3cf141c9fb8423 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -641,6 +641,13 @@ static const struct sof_topology_token dmic_tokens[] = {
 
 };
 
+/* ESAI */
+static const struct sof_topology_token esai_tokens[] = {
+       {SOF_TKN_IMX_ESAI_MCLK_ID,
+               SND_SOC_TPLG_TUPLE_TYPE_SHORT, get_token_u16,
+               offsetof(struct sof_ipc_dai_esai_params, mclk_id), 0},
+};
+
 /*
  * DMIC PDM Tokens
  * SOF_TKN_INTEL_DMIC_PDM_CTRL_ID should be the first token
@@ -2549,8 +2556,66 @@ static int sof_link_esai_load(struct snd_soc_component *scomp, int index,
                              struct snd_soc_tplg_hw_config *hw_config,
                              struct sof_ipc_dai_config *config)
 {
-       /*TODO: Add implementation */
-       return 0;
+       struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
+       struct snd_soc_tplg_private *private = &cfg->priv;
+       struct sof_ipc_reply reply;
+       u32 size = sizeof(*config);
+       int ret;
+
+       /* handle master/slave and inverted clocks */
+       sof_dai_set_format(hw_config, config);
+
+       /* init IPC */
+       memset(&config->esai, 0, sizeof(struct sof_ipc_dai_esai_params));
+       config->hdr.size = size;
+
+       ret = sof_parse_tokens(scomp, &config->esai, esai_tokens,
+                              ARRAY_SIZE(esai_tokens), private->array,
+                              le32_to_cpu(private->size));
+       if (ret != 0) {
+               dev_err(sdev->dev, "error: parse esai tokens failed %d\n",
+                       le32_to_cpu(private->size));
+               return ret;
+       }
+
+       config->esai.mclk_rate = le32_to_cpu(hw_config->mclk_rate);
+       config->esai.bclk_rate = le32_to_cpu(hw_config->bclk_rate);
+       config->esai.fsync_rate = le32_to_cpu(hw_config->fsync_rate);
+       config->esai.mclk_direction = hw_config->mclk_direction;
+       config->esai.tdm_slots = le32_to_cpu(hw_config->tdm_slots);
+       config->esai.tdm_slot_width = le32_to_cpu(hw_config->tdm_slot_width);
+       config->esai.rx_slots = le32_to_cpu(hw_config->rx_slots);
+       config->esai.tx_slots = le32_to_cpu(hw_config->tx_slots);
+
+       dev_info(sdev->dev,
+                "tplg: config ESAI%d fmt 0x%x mclk %d width %d slots %d mclk id %d\n",
+               config->dai_index, config->format,
+               config->esai.mclk_rate, config->esai.tdm_slot_width,
+               config->esai.tdm_slots, config->esai.mclk_id);
+
+       if (config->esai.tdm_slots < 1 || config->esai.tdm_slots > 8) {
+               dev_err(sdev->dev, "error: invalid channel count for ESAI%d\n",
+                       config->dai_index);
+               return -EINVAL;
+       }
+
+       /* send message to DSP */
+       ret = sof_ipc_tx_message(sdev->ipc,
+                                config->hdr.cmd, config, size, &reply,
+                                sizeof(reply));
+       if (ret < 0) {
+               dev_err(sdev->dev, "error: failed to set DAI config for ESAI%d\n",
+                       config->dai_index);
+               return ret;
+       }
+
+       /* set config for all DAI's with name matching the link name */
+       ret = sof_set_dai_config(sdev, size, link, config);
+       if (ret < 0)
+               dev_err(sdev->dev, "error: failed to save DAI config for ESAI%d\n",
+                       config->dai_index);
+
+       return ret;
 }
 
 static int sof_link_dmic_load(struct snd_soc_component *scomp, int index,