]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: qdsp6: q6afe-dai: move lpass audio ports to common file
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 26 Oct 2021 11:16:42 +0000 (12:16 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 26 Oct 2021 12:49:58 +0000 (13:49 +0100)
Various Q6DSP frameworks will use LPASS Audio IP, so move all the hardware
specific details to a common file so that they could be reused across
multiple Q6DSP frameworks.

In this case all the audio ports definitions can be moved to a common file
to be able to reuse across multiple Q6DSP frameworks.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20211026111655.1702-5-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/qcom/qdsp6/Makefile
sound/soc/qcom/qdsp6/q6afe-dai.c
sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c [new file with mode: 0644]
sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h [new file with mode: 0644]

index 3c1dd9f32f1dabe8ee9a150ebaa5f9614f8fd19e..11e8705bbc5c49abd886682efc79149154e440e7 100644 (file)
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_SND_SOC_QDSP6_COMMON) += q6dsp-common.o
+snd-q6dsp-common-objs := q6dsp-common.o q6dsp-lpass-ports.o
+
+obj-$(CONFIG_SND_SOC_QDSP6_COMMON) += snd-q6dsp-common.o
 obj-$(CONFIG_SND_SOC_QDSP6_CORE) += q6core.o
 obj-$(CONFIG_SND_SOC_QDSP6_AFE) += q6afe.o
 obj-$(CONFIG_SND_SOC_QDSP6_AFE_DAI) += q6afe-dai.o
index 8b664cbf6fa6bd23a932d41540a4e4cf44753c9d..8bb7452b8f18c7972f5106f7dc8707ca35d5342d 100644 (file)
 #include <sound/pcm.h>
 #include <sound/soc.h>
 #include <sound/pcm_params.h>
+#include "q6dsp-lpass-ports.h"
 #include "q6afe.h"
 
-#define Q6AFE_TDM_PB_DAI(pre, num, did) {                              \
-               .playback = {                                           \
-                       .stream_name = pre" TDM"#num" Playback",        \
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
-                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
-                               SNDRV_PCM_RATE_176400,                  \
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
-                                  SNDRV_PCM_FMTBIT_S24_LE |            \
-                                  SNDRV_PCM_FMTBIT_S32_LE,             \
-                       .channels_min = 1,                              \
-                       .channels_max = 8,                              \
-                       .rate_min = 8000,                               \
-                       .rate_max = 176400,                             \
-               },                                                      \
-               .name = #did,                                           \
-               .ops = &q6tdm_ops,                                      \
-               .id = did,                                              \
-               .probe = msm_dai_q6_dai_probe,                          \
-               .remove = msm_dai_q6_dai_remove,                        \
-       }
-
-#define Q6AFE_TDM_CAP_DAI(pre, num, did) {                             \
-               .capture = {                                            \
-                       .stream_name = pre" TDM"#num" Capture",         \
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
-                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
-                               SNDRV_PCM_RATE_176400,                  \
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
-                                  SNDRV_PCM_FMTBIT_S24_LE |            \
-                                  SNDRV_PCM_FMTBIT_S32_LE,             \
-                       .channels_min = 1,                              \
-                       .channels_max = 8,                              \
-                       .rate_min = 8000,                               \
-                       .rate_max = 176400,                             \
-               },                                                      \
-               .name = #did,                                           \
-               .ops = &q6tdm_ops,                                      \
-               .id = did,                                              \
-               .probe = msm_dai_q6_dai_probe,                          \
-               .remove = msm_dai_q6_dai_remove,                        \
-       }
-
-#define Q6AFE_CDC_DMA_RX_DAI(did) {                            \
-               .playback = {                                           \
-                       .stream_name = #did" Playback", \
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
-                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
-                               SNDRV_PCM_RATE_176400,                  \
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
-                                  SNDRV_PCM_FMTBIT_S24_LE |            \
-                                  SNDRV_PCM_FMTBIT_S32_LE,             \
-                       .channels_min = 1,                              \
-                       .channels_max = 8,                              \
-                       .rate_min = 8000,                               \
-                       .rate_max = 176400,                             \
-               },                                                      \
-               .name = #did,                                           \
-               .ops = &q6dma_ops,                                      \
-               .id = did,                                              \
-               .probe = msm_dai_q6_dai_probe,                          \
-               .remove = msm_dai_q6_dai_remove,                        \
-       }
-
-#define Q6AFE_CDC_DMA_TX_DAI(did) {                            \
-               .capture = {                                            \
-                       .stream_name = #did" Capture",          \
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
-                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
-                               SNDRV_PCM_RATE_176400,                  \
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
-                                  SNDRV_PCM_FMTBIT_S24_LE |            \
-                                  SNDRV_PCM_FMTBIT_S32_LE,             \
-                       .channels_min = 1,                              \
-                       .channels_max = 8,                              \
-                       .rate_min = 8000,                               \
-                       .rate_max = 176400,                             \
-               },                                                      \
-               .name = #did,                                           \
-               .ops = &q6dma_ops,                                      \
-               .id = did,                                              \
-               .probe = msm_dai_q6_dai_probe,                          \
-               .remove = msm_dai_q6_dai_remove,                        \
-       }
 
 struct q6afe_dai_priv_data {
        uint32_t sd_line_mask;
@@ -784,591 +702,6 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai)
        return 0;
 }
 
-static struct snd_soc_dai_driver q6afe_dais[] = {
-       {
-               .playback = {
-                       .stream_name = "HDMI Playback",
-                       .rates = SNDRV_PCM_RATE_48000 |
-                                SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 2,
-                       .channels_max = 8,
-                       .rate_max =     192000,
-                       .rate_min =     48000,
-               },
-               .ops = &q6hdmi_ops,
-               .id = HDMI_RX,
-               .name = "HDMI",
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .name = "SLIMBUS_0_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_0_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .playback = {
-                       .stream_name = "Slimbus Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .name = "SLIMBUS_0_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_0_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus1 Playback",
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 2,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .name = "SLIMBUS_1_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_1_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .name = "SLIMBUS_1_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_1_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus1 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus2 Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .name = "SLIMBUS_2_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_2_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-
-       }, {
-               .name = "SLIMBUS_2_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_2_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus2 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus3 Playback",
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 2,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .name = "SLIMBUS_3_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_3_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-
-       }, {
-               .name = "SLIMBUS_3_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_3_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus3 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus4 Playback",
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 2,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .name = "SLIMBUS_4_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_4_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-
-       }, {
-               .name = "SLIMBUS_4_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_4_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus4 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus5 Playback",
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 2,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .name = "SLIMBUS_5_RX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_5_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-
-       }, {
-               .name = "SLIMBUS_5_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_5_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus5 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Slimbus6 Playback",
-                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
-                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 2,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-               .ops = &q6slim_ops,
-               .name = "SLIMBUS_6_RX",
-               .id = SLIMBUS_6_RX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-
-       }, {
-               .name = "SLIMBUS_6_TX",
-               .ops = &q6slim_ops,
-               .id = SLIMBUS_6_TX,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-               .capture = {
-                       .stream_name = "Slimbus6 Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min = 8000,
-                       .rate_max = 192000,
-               },
-       }, {
-               .playback = {
-                       .stream_name = "Primary MI2S Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = PRIMARY_MI2S_RX,
-               .name = "PRI_MI2S_RX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .capture = {
-                       .stream_name = "Primary MI2S Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = PRIMARY_MI2S_TX,
-               .name = "PRI_MI2S_TX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .playback = {
-                       .stream_name = "Secondary MI2S Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .name = "SEC_MI2S_RX",
-               .id = SECONDARY_MI2S_RX,
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .capture = {
-                       .stream_name = "Secondary MI2S Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = SECONDARY_MI2S_TX,
-               .name = "SEC_MI2S_TX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .playback = {
-                       .stream_name = "Tertiary MI2S Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .name = "TERT_MI2S_RX",
-               .id = TERTIARY_MI2S_RX,
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .capture = {
-                       .stream_name = "Tertiary MI2S Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = TERTIARY_MI2S_TX,
-               .name = "TERT_MI2S_TX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .playback = {
-                       .stream_name = "Quaternary MI2S Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .name = "QUAT_MI2S_RX",
-               .id = QUATERNARY_MI2S_RX,
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .capture = {
-                       .stream_name = "Quaternary MI2S Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = QUATERNARY_MI2S_TX,
-               .name = "QUAT_MI2S_TX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .playback = {
-                       .stream_name = "Quinary MI2S Playback",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                       SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
-                       SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     192000,
-               },
-               .id = QUINARY_MI2S_RX,
-               .name = "QUIN_MI2S_RX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       }, {
-               .capture = {
-                       .stream_name = "Quinary MI2S Capture",
-                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
-                                SNDRV_PCM_RATE_16000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
-                       .channels_min = 1,
-                       .channels_max = 8,
-                       .rate_min =     8000,
-                       .rate_max =     48000,
-               },
-               .id = QUINARY_MI2S_TX,
-               .name = "QUIN_MI2S_TX",
-               .ops = &q6i2s_ops,
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       },
-       Q6AFE_TDM_PB_DAI("Primary", 0, PRIMARY_TDM_RX_0),
-       Q6AFE_TDM_PB_DAI("Primary", 1, PRIMARY_TDM_RX_1),
-       Q6AFE_TDM_PB_DAI("Primary", 2, PRIMARY_TDM_RX_2),
-       Q6AFE_TDM_PB_DAI("Primary", 3, PRIMARY_TDM_RX_3),
-       Q6AFE_TDM_PB_DAI("Primary", 4, PRIMARY_TDM_RX_4),
-       Q6AFE_TDM_PB_DAI("Primary", 5, PRIMARY_TDM_RX_5),
-       Q6AFE_TDM_PB_DAI("Primary", 6, PRIMARY_TDM_RX_6),
-       Q6AFE_TDM_PB_DAI("Primary", 7, PRIMARY_TDM_RX_7),
-       Q6AFE_TDM_CAP_DAI("Primary", 0, PRIMARY_TDM_TX_0),
-       Q6AFE_TDM_CAP_DAI("Primary", 1, PRIMARY_TDM_TX_1),
-       Q6AFE_TDM_CAP_DAI("Primary", 2, PRIMARY_TDM_TX_2),
-       Q6AFE_TDM_CAP_DAI("Primary", 3, PRIMARY_TDM_TX_3),
-       Q6AFE_TDM_CAP_DAI("Primary", 4, PRIMARY_TDM_TX_4),
-       Q6AFE_TDM_CAP_DAI("Primary", 5, PRIMARY_TDM_TX_5),
-       Q6AFE_TDM_CAP_DAI("Primary", 6, PRIMARY_TDM_TX_6),
-       Q6AFE_TDM_CAP_DAI("Primary", 7, PRIMARY_TDM_TX_7),
-       Q6AFE_TDM_PB_DAI("Secondary", 0, SECONDARY_TDM_RX_0),
-       Q6AFE_TDM_PB_DAI("Secondary", 1, SECONDARY_TDM_RX_1),
-       Q6AFE_TDM_PB_DAI("Secondary", 2, SECONDARY_TDM_RX_2),
-       Q6AFE_TDM_PB_DAI("Secondary", 3, SECONDARY_TDM_RX_3),
-       Q6AFE_TDM_PB_DAI("Secondary", 4, SECONDARY_TDM_RX_4),
-       Q6AFE_TDM_PB_DAI("Secondary", 5, SECONDARY_TDM_RX_5),
-       Q6AFE_TDM_PB_DAI("Secondary", 6, SECONDARY_TDM_RX_6),
-       Q6AFE_TDM_PB_DAI("Secondary", 7, SECONDARY_TDM_RX_7),
-       Q6AFE_TDM_CAP_DAI("Secondary", 0, SECONDARY_TDM_TX_0),
-       Q6AFE_TDM_CAP_DAI("Secondary", 1, SECONDARY_TDM_TX_1),
-       Q6AFE_TDM_CAP_DAI("Secondary", 2, SECONDARY_TDM_TX_2),
-       Q6AFE_TDM_CAP_DAI("Secondary", 3, SECONDARY_TDM_TX_3),
-       Q6AFE_TDM_CAP_DAI("Secondary", 4, SECONDARY_TDM_TX_4),
-       Q6AFE_TDM_CAP_DAI("Secondary", 5, SECONDARY_TDM_TX_5),
-       Q6AFE_TDM_CAP_DAI("Secondary", 6, SECONDARY_TDM_TX_6),
-       Q6AFE_TDM_CAP_DAI("Secondary", 7, SECONDARY_TDM_TX_7),
-       Q6AFE_TDM_PB_DAI("Tertiary", 0, TERTIARY_TDM_RX_0),
-       Q6AFE_TDM_PB_DAI("Tertiary", 1, TERTIARY_TDM_RX_1),
-       Q6AFE_TDM_PB_DAI("Tertiary", 2, TERTIARY_TDM_RX_2),
-       Q6AFE_TDM_PB_DAI("Tertiary", 3, TERTIARY_TDM_RX_3),
-       Q6AFE_TDM_PB_DAI("Tertiary", 4, TERTIARY_TDM_RX_4),
-       Q6AFE_TDM_PB_DAI("Tertiary", 5, TERTIARY_TDM_RX_5),
-       Q6AFE_TDM_PB_DAI("Tertiary", 6, TERTIARY_TDM_RX_6),
-       Q6AFE_TDM_PB_DAI("Tertiary", 7, TERTIARY_TDM_RX_7),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 0, TERTIARY_TDM_TX_0),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 1, TERTIARY_TDM_TX_1),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 2, TERTIARY_TDM_TX_2),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 3, TERTIARY_TDM_TX_3),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 4, TERTIARY_TDM_TX_4),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 5, TERTIARY_TDM_TX_5),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 6, TERTIARY_TDM_TX_6),
-       Q6AFE_TDM_CAP_DAI("Tertiary", 7, TERTIARY_TDM_TX_7),
-       Q6AFE_TDM_PB_DAI("Quaternary", 0, QUATERNARY_TDM_RX_0),
-       Q6AFE_TDM_PB_DAI("Quaternary", 1, QUATERNARY_TDM_RX_1),
-       Q6AFE_TDM_PB_DAI("Quaternary", 2, QUATERNARY_TDM_RX_2),
-       Q6AFE_TDM_PB_DAI("Quaternary", 3, QUATERNARY_TDM_RX_3),
-       Q6AFE_TDM_PB_DAI("Quaternary", 4, QUATERNARY_TDM_RX_4),
-       Q6AFE_TDM_PB_DAI("Quaternary", 5, QUATERNARY_TDM_RX_5),
-       Q6AFE_TDM_PB_DAI("Quaternary", 6, QUATERNARY_TDM_RX_6),
-       Q6AFE_TDM_PB_DAI("Quaternary", 7, QUATERNARY_TDM_RX_7),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 0, QUATERNARY_TDM_TX_0),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 1, QUATERNARY_TDM_TX_1),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 2, QUATERNARY_TDM_TX_2),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 3, QUATERNARY_TDM_TX_3),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 4, QUATERNARY_TDM_TX_4),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 5, QUATERNARY_TDM_TX_5),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 6, QUATERNARY_TDM_TX_6),
-       Q6AFE_TDM_CAP_DAI("Quaternary", 7, QUATERNARY_TDM_TX_7),
-       Q6AFE_TDM_PB_DAI("Quinary", 0, QUINARY_TDM_RX_0),
-       Q6AFE_TDM_PB_DAI("Quinary", 1, QUINARY_TDM_RX_1),
-       Q6AFE_TDM_PB_DAI("Quinary", 2, QUINARY_TDM_RX_2),
-       Q6AFE_TDM_PB_DAI("Quinary", 3, QUINARY_TDM_RX_3),
-       Q6AFE_TDM_PB_DAI("Quinary", 4, QUINARY_TDM_RX_4),
-       Q6AFE_TDM_PB_DAI("Quinary", 5, QUINARY_TDM_RX_5),
-       Q6AFE_TDM_PB_DAI("Quinary", 6, QUINARY_TDM_RX_6),
-       Q6AFE_TDM_PB_DAI("Quinary", 7, QUINARY_TDM_RX_7),
-       Q6AFE_TDM_CAP_DAI("Quinary", 0, QUINARY_TDM_TX_0),
-       Q6AFE_TDM_CAP_DAI("Quinary", 1, QUINARY_TDM_TX_1),
-       Q6AFE_TDM_CAP_DAI("Quinary", 2, QUINARY_TDM_TX_2),
-       Q6AFE_TDM_CAP_DAI("Quinary", 3, QUINARY_TDM_TX_3),
-       Q6AFE_TDM_CAP_DAI("Quinary", 4, QUINARY_TDM_TX_4),
-       Q6AFE_TDM_CAP_DAI("Quinary", 5, QUINARY_TDM_TX_5),
-       Q6AFE_TDM_CAP_DAI("Quinary", 6, QUINARY_TDM_TX_6),
-       Q6AFE_TDM_CAP_DAI("Quinary", 7, QUINARY_TDM_TX_7),
-       {
-               .playback = {
-                       .stream_name = "Display Port Playback",
-                       .rates = SNDRV_PCM_RATE_48000 |
-                                SNDRV_PCM_RATE_96000 |
-                                SNDRV_PCM_RATE_192000,
-                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
-                                  SNDRV_PCM_FMTBIT_S24_LE,
-                       .channels_min = 2,
-                       .channels_max = 8,
-                       .rate_max =     192000,
-                       .rate_min =     48000,
-               },
-               .ops = &q6hdmi_ops,
-               .id = DISPLAY_PORT_RX,
-               .name = "DISPLAY_PORT",
-               .probe = msm_dai_q6_dai_probe,
-               .remove = msm_dai_q6_dai_remove,
-       },
-       Q6AFE_CDC_DMA_RX_DAI(WSA_CODEC_DMA_RX_0),
-       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_0),
-       Q6AFE_CDC_DMA_RX_DAI(WSA_CODEC_DMA_RX_1),
-       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_1),
-       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_2),
-       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_0),
-       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_1),
-       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_2),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_0),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_0),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_1),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_1),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_2),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_2),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_3),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_3),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_4),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_4),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_5),
-       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_5),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_6),
-       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_7),
-};
-
-static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
-                                  const struct of_phandle_args *args,
-                                  const char **dai_name)
-{
-       int id = args->args[0];
-       int ret = -EINVAL;
-       int i;
-
-       for (i = 0; i  < ARRAY_SIZE(q6afe_dais); i++) {
-               if (q6afe_dais[i].id == id) {
-                       *dai_name = q6afe_dais[i].name;
-                       ret = 0;
-                       break;
-               }
-       }
-
-       return ret;
-}
-
 static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
        SND_SOC_DAPM_AIF_IN("HDMI_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
        SND_SOC_DAPM_AIF_IN("SLIMBUS_0_RX", NULL, 0, SND_SOC_NOPM, 0, 0),
@@ -1627,7 +960,7 @@ static const struct snd_soc_component_driver q6afe_dai_component = {
        .num_dapm_widgets = ARRAY_SIZE(q6afe_dai_widgets),
        .dapm_routes = q6afe_dapm_routes,
        .num_dapm_routes = ARRAY_SIZE(q6afe_dapm_routes),
-       .of_xlate_dai_name = q6afe_of_xlate_dai_name,
+       .of_xlate_dai_name = q6dsp_audio_ports_of_xlate_dai_name,
 
 };
 
@@ -1715,19 +1048,29 @@ static void of_q6afe_parse_dai_data(struct device *dev,
 
 static int q6afe_dai_dev_probe(struct platform_device *pdev)
 {
+       struct q6dsp_audio_port_dai_driver_config cfg;
+       struct snd_soc_dai_driver *dais;
        struct q6afe_dai_data *dai_data;
        struct device *dev = &pdev->dev;
+       int num_dais;
 
        dai_data = devm_kzalloc(dev, sizeof(*dai_data), GFP_KERNEL);
        if (!dai_data)
                return -ENOMEM;
 
        dev_set_drvdata(dev, dai_data);
-
        of_q6afe_parse_dai_data(dev, dai_data);
 
-       return devm_snd_soc_register_component(dev, &q6afe_dai_component,
-                                         q6afe_dais, ARRAY_SIZE(q6afe_dais));
+       cfg.probe = msm_dai_q6_dai_probe;
+       cfg.remove = msm_dai_q6_dai_remove;
+       cfg.q6hdmi_ops = &q6hdmi_ops;
+       cfg.q6slim_ops = &q6slim_ops;
+       cfg.q6i2s_ops = &q6i2s_ops;
+       cfg.q6tdm_ops = &q6tdm_ops;
+       cfg.q6dma_ops = &q6dma_ops;
+       dais = q6dsp_audio_ports_set_config(dev, &cfg, &num_dais);
+
+       return devm_snd_soc_register_component(dev, &q6afe_dai_component, dais, num_dais);
 }
 
 #ifdef CONFIG_OF
diff --git a/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c b/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c
new file mode 100644 (file)
index 0000000..f67c16f
--- /dev/null
@@ -0,0 +1,627 @@
+// SPDX-License-Identifier: GPL-2.0
+// Copyright (c) 2020, Linaro Limited
+
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/pcm_params.h>
+#include <dt-bindings/sound/qcom,q6afe.h>
+#include "q6dsp-lpass-ports.h"
+
+#define Q6AFE_TDM_PB_DAI(pre, num, did) {                              \
+               .playback = {                                           \
+                       .stream_name = pre" TDM"#num" Playback",        \
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
+                               SNDRV_PCM_RATE_176400,                  \
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                                  SNDRV_PCM_FMTBIT_S24_LE |            \
+                                  SNDRV_PCM_FMTBIT_S32_LE,             \
+                       .channels_min = 1,                              \
+                       .channels_max = 8,                              \
+                       .rate_min = 8000,                               \
+                       .rate_max = 176400,                             \
+               },                                                      \
+               .name = #did,                                           \
+               .id = did,                                              \
+       }
+
+#define Q6AFE_TDM_CAP_DAI(pre, num, did) {                             \
+               .capture = {                                            \
+                       .stream_name = pre" TDM"#num" Capture",         \
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
+                               SNDRV_PCM_RATE_176400,                  \
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                                  SNDRV_PCM_FMTBIT_S24_LE |            \
+                                  SNDRV_PCM_FMTBIT_S32_LE,             \
+                       .channels_min = 1,                              \
+                       .channels_max = 8,                              \
+                       .rate_min = 8000,                               \
+                       .rate_max = 176400,                             \
+               },                                                      \
+               .name = #did,                                           \
+               .id = did,                                              \
+       }
+
+#define Q6AFE_CDC_DMA_RX_DAI(did) {                            \
+               .playback = {                                           \
+                       .stream_name = #did" Playback", \
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
+                               SNDRV_PCM_RATE_176400,                  \
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                                  SNDRV_PCM_FMTBIT_S24_LE |            \
+                                  SNDRV_PCM_FMTBIT_S32_LE,             \
+                       .channels_min = 1,                              \
+                       .channels_max = 8,                              \
+                       .rate_min = 8000,                               \
+                       .rate_max = 176400,                             \
+               },                                                      \
+               .name = #did,                                           \
+               .id = did,                                              \
+       }
+
+#define Q6AFE_CDC_DMA_TX_DAI(did) {                            \
+               .capture = {                                            \
+                       .stream_name = #did" Capture",          \
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\
+                               SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\
+                               SNDRV_PCM_RATE_176400,                  \
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |            \
+                                  SNDRV_PCM_FMTBIT_S24_LE |            \
+                                  SNDRV_PCM_FMTBIT_S32_LE,             \
+                       .channels_min = 1,                              \
+                       .channels_max = 8,                              \
+                       .rate_min = 8000,                               \
+                       .rate_max = 176400,                             \
+               },                                                      \
+               .name = #did,                                           \
+               .id = did,                                              \
+       }
+
+
+static struct snd_soc_dai_driver q6dsp_audio_fe_dais[] = {
+       {
+               .playback = {
+                       .stream_name = "HDMI Playback",
+                       .rates = SNDRV_PCM_RATE_48000 |
+                                SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 2,
+                       .channels_max = 8,
+                       .rate_max =     192000,
+                       .rate_min =     48000,
+               },
+               .id = HDMI_RX,
+               .name = "HDMI",
+       }, {
+               .name = "SLIMBUS_0_RX",
+               .id = SLIMBUS_0_RX,
+               .playback = {
+                       .stream_name = "Slimbus Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .name = "SLIMBUS_0_TX",
+               .id = SLIMBUS_0_TX,
+               .capture = {
+                       .stream_name = "Slimbus Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus1 Playback",
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 2,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_1_RX",
+               .id = SLIMBUS_1_RX,
+       }, {
+               .name = "SLIMBUS_1_TX",
+               .id = SLIMBUS_1_TX,
+               .capture = {
+                       .stream_name = "Slimbus1 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus2 Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_2_RX",
+               .id = SLIMBUS_2_RX,
+
+       }, {
+               .name = "SLIMBUS_2_TX",
+               .id = SLIMBUS_2_TX,
+               .capture = {
+                       .stream_name = "Slimbus2 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus3 Playback",
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 2,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_3_RX",
+               .id = SLIMBUS_3_RX,
+
+       }, {
+               .name = "SLIMBUS_3_TX",
+               .id = SLIMBUS_3_TX,
+               .capture = {
+                       .stream_name = "Slimbus3 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus4 Playback",
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 2,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_4_RX",
+               .id = SLIMBUS_4_RX,
+
+       }, {
+               .name = "SLIMBUS_4_TX",
+               .id = SLIMBUS_4_TX,
+               .capture = {
+                       .stream_name = "Slimbus4 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus5 Playback",
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 2,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_5_RX",
+               .id = SLIMBUS_5_RX,
+
+       }, {
+               .name = "SLIMBUS_5_TX",
+               .id = SLIMBUS_5_TX,
+               .capture = {
+                       .stream_name = "Slimbus5 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Slimbus6 Playback",
+                       .rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |
+                                SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 2,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+               .name = "SLIMBUS_6_RX",
+               .id = SLIMBUS_6_RX,
+
+       }, {
+               .name = "SLIMBUS_6_TX",
+               .id = SLIMBUS_6_TX,
+               .capture = {
+                       .stream_name = "Slimbus6 Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min = 8000,
+                       .rate_max = 192000,
+               },
+       }, {
+               .playback = {
+                       .stream_name = "Primary MI2S Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = PRIMARY_MI2S_RX,
+               .name = "PRI_MI2S_RX",
+       }, {
+               .capture = {
+                       .stream_name = "Primary MI2S Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = PRIMARY_MI2S_TX,
+               .name = "PRI_MI2S_TX",
+       }, {
+               .playback = {
+                       .stream_name = "Secondary MI2S Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .name = "SEC_MI2S_RX",
+               .id = SECONDARY_MI2S_RX,
+       }, {
+               .capture = {
+                       .stream_name = "Secondary MI2S Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = SECONDARY_MI2S_TX,
+               .name = "SEC_MI2S_TX",
+       }, {
+               .playback = {
+                       .stream_name = "Tertiary MI2S Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .name = "TERT_MI2S_RX",
+               .id = TERTIARY_MI2S_RX,
+       }, {
+               .capture = {
+                       .stream_name = "Tertiary MI2S Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = TERTIARY_MI2S_TX,
+               .name = "TERT_MI2S_TX",
+       }, {
+               .playback = {
+                       .stream_name = "Quaternary MI2S Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .name = "QUAT_MI2S_RX",
+               .id = QUATERNARY_MI2S_RX,
+       }, {
+               .capture = {
+                       .stream_name = "Quaternary MI2S Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = QUATERNARY_MI2S_TX,
+               .name = "QUAT_MI2S_TX",
+       }, {
+               .playback = {
+                       .stream_name = "Quinary MI2S Playback",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                       SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |
+                       SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     192000,
+               },
+               .id = QUINARY_MI2S_RX,
+               .name = "QUIN_MI2S_RX",
+       }, {
+               .capture = {
+                       .stream_name = "Quinary MI2S Capture",
+                       .rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
+                                SNDRV_PCM_RATE_16000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
+                       .channels_min = 1,
+                       .channels_max = 8,
+                       .rate_min =     8000,
+                       .rate_max =     48000,
+               },
+               .id = QUINARY_MI2S_TX,
+               .name = "QUIN_MI2S_TX",
+       },
+       Q6AFE_TDM_PB_DAI("Primary", 0, PRIMARY_TDM_RX_0),
+       Q6AFE_TDM_PB_DAI("Primary", 1, PRIMARY_TDM_RX_1),
+       Q6AFE_TDM_PB_DAI("Primary", 2, PRIMARY_TDM_RX_2),
+       Q6AFE_TDM_PB_DAI("Primary", 3, PRIMARY_TDM_RX_3),
+       Q6AFE_TDM_PB_DAI("Primary", 4, PRIMARY_TDM_RX_4),
+       Q6AFE_TDM_PB_DAI("Primary", 5, PRIMARY_TDM_RX_5),
+       Q6AFE_TDM_PB_DAI("Primary", 6, PRIMARY_TDM_RX_6),
+       Q6AFE_TDM_PB_DAI("Primary", 7, PRIMARY_TDM_RX_7),
+       Q6AFE_TDM_CAP_DAI("Primary", 0, PRIMARY_TDM_TX_0),
+       Q6AFE_TDM_CAP_DAI("Primary", 1, PRIMARY_TDM_TX_1),
+       Q6AFE_TDM_CAP_DAI("Primary", 2, PRIMARY_TDM_TX_2),
+       Q6AFE_TDM_CAP_DAI("Primary", 3, PRIMARY_TDM_TX_3),
+       Q6AFE_TDM_CAP_DAI("Primary", 4, PRIMARY_TDM_TX_4),
+       Q6AFE_TDM_CAP_DAI("Primary", 5, PRIMARY_TDM_TX_5),
+       Q6AFE_TDM_CAP_DAI("Primary", 6, PRIMARY_TDM_TX_6),
+       Q6AFE_TDM_CAP_DAI("Primary", 7, PRIMARY_TDM_TX_7),
+       Q6AFE_TDM_PB_DAI("Secondary", 0, SECONDARY_TDM_RX_0),
+       Q6AFE_TDM_PB_DAI("Secondary", 1, SECONDARY_TDM_RX_1),
+       Q6AFE_TDM_PB_DAI("Secondary", 2, SECONDARY_TDM_RX_2),
+       Q6AFE_TDM_PB_DAI("Secondary", 3, SECONDARY_TDM_RX_3),
+       Q6AFE_TDM_PB_DAI("Secondary", 4, SECONDARY_TDM_RX_4),
+       Q6AFE_TDM_PB_DAI("Secondary", 5, SECONDARY_TDM_RX_5),
+       Q6AFE_TDM_PB_DAI("Secondary", 6, SECONDARY_TDM_RX_6),
+       Q6AFE_TDM_PB_DAI("Secondary", 7, SECONDARY_TDM_RX_7),
+       Q6AFE_TDM_CAP_DAI("Secondary", 0, SECONDARY_TDM_TX_0),
+       Q6AFE_TDM_CAP_DAI("Secondary", 1, SECONDARY_TDM_TX_1),
+       Q6AFE_TDM_CAP_DAI("Secondary", 2, SECONDARY_TDM_TX_2),
+       Q6AFE_TDM_CAP_DAI("Secondary", 3, SECONDARY_TDM_TX_3),
+       Q6AFE_TDM_CAP_DAI("Secondary", 4, SECONDARY_TDM_TX_4),
+       Q6AFE_TDM_CAP_DAI("Secondary", 5, SECONDARY_TDM_TX_5),
+       Q6AFE_TDM_CAP_DAI("Secondary", 6, SECONDARY_TDM_TX_6),
+       Q6AFE_TDM_CAP_DAI("Secondary", 7, SECONDARY_TDM_TX_7),
+       Q6AFE_TDM_PB_DAI("Tertiary", 0, TERTIARY_TDM_RX_0),
+       Q6AFE_TDM_PB_DAI("Tertiary", 1, TERTIARY_TDM_RX_1),
+       Q6AFE_TDM_PB_DAI("Tertiary", 2, TERTIARY_TDM_RX_2),
+       Q6AFE_TDM_PB_DAI("Tertiary", 3, TERTIARY_TDM_RX_3),
+       Q6AFE_TDM_PB_DAI("Tertiary", 4, TERTIARY_TDM_RX_4),
+       Q6AFE_TDM_PB_DAI("Tertiary", 5, TERTIARY_TDM_RX_5),
+       Q6AFE_TDM_PB_DAI("Tertiary", 6, TERTIARY_TDM_RX_6),
+       Q6AFE_TDM_PB_DAI("Tertiary", 7, TERTIARY_TDM_RX_7),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 0, TERTIARY_TDM_TX_0),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 1, TERTIARY_TDM_TX_1),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 2, TERTIARY_TDM_TX_2),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 3, TERTIARY_TDM_TX_3),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 4, TERTIARY_TDM_TX_4),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 5, TERTIARY_TDM_TX_5),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 6, TERTIARY_TDM_TX_6),
+       Q6AFE_TDM_CAP_DAI("Tertiary", 7, TERTIARY_TDM_TX_7),
+       Q6AFE_TDM_PB_DAI("Quaternary", 0, QUATERNARY_TDM_RX_0),
+       Q6AFE_TDM_PB_DAI("Quaternary", 1, QUATERNARY_TDM_RX_1),
+       Q6AFE_TDM_PB_DAI("Quaternary", 2, QUATERNARY_TDM_RX_2),
+       Q6AFE_TDM_PB_DAI("Quaternary", 3, QUATERNARY_TDM_RX_3),
+       Q6AFE_TDM_PB_DAI("Quaternary", 4, QUATERNARY_TDM_RX_4),
+       Q6AFE_TDM_PB_DAI("Quaternary", 5, QUATERNARY_TDM_RX_5),
+       Q6AFE_TDM_PB_DAI("Quaternary", 6, QUATERNARY_TDM_RX_6),
+       Q6AFE_TDM_PB_DAI("Quaternary", 7, QUATERNARY_TDM_RX_7),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 0, QUATERNARY_TDM_TX_0),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 1, QUATERNARY_TDM_TX_1),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 2, QUATERNARY_TDM_TX_2),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 3, QUATERNARY_TDM_TX_3),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 4, QUATERNARY_TDM_TX_4),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 5, QUATERNARY_TDM_TX_5),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 6, QUATERNARY_TDM_TX_6),
+       Q6AFE_TDM_CAP_DAI("Quaternary", 7, QUATERNARY_TDM_TX_7),
+       Q6AFE_TDM_PB_DAI("Quinary", 0, QUINARY_TDM_RX_0),
+       Q6AFE_TDM_PB_DAI("Quinary", 1, QUINARY_TDM_RX_1),
+       Q6AFE_TDM_PB_DAI("Quinary", 2, QUINARY_TDM_RX_2),
+       Q6AFE_TDM_PB_DAI("Quinary", 3, QUINARY_TDM_RX_3),
+       Q6AFE_TDM_PB_DAI("Quinary", 4, QUINARY_TDM_RX_4),
+       Q6AFE_TDM_PB_DAI("Quinary", 5, QUINARY_TDM_RX_5),
+       Q6AFE_TDM_PB_DAI("Quinary", 6, QUINARY_TDM_RX_6),
+       Q6AFE_TDM_PB_DAI("Quinary", 7, QUINARY_TDM_RX_7),
+       Q6AFE_TDM_CAP_DAI("Quinary", 0, QUINARY_TDM_TX_0),
+       Q6AFE_TDM_CAP_DAI("Quinary", 1, QUINARY_TDM_TX_1),
+       Q6AFE_TDM_CAP_DAI("Quinary", 2, QUINARY_TDM_TX_2),
+       Q6AFE_TDM_CAP_DAI("Quinary", 3, QUINARY_TDM_TX_3),
+       Q6AFE_TDM_CAP_DAI("Quinary", 4, QUINARY_TDM_TX_4),
+       Q6AFE_TDM_CAP_DAI("Quinary", 5, QUINARY_TDM_TX_5),
+       Q6AFE_TDM_CAP_DAI("Quinary", 6, QUINARY_TDM_TX_6),
+       Q6AFE_TDM_CAP_DAI("Quinary", 7, QUINARY_TDM_TX_7),
+       {
+               .playback = {
+                       .stream_name = "Display Port Playback",
+                       .rates = SNDRV_PCM_RATE_48000 |
+                                SNDRV_PCM_RATE_96000 |
+                                SNDRV_PCM_RATE_192000,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE |
+                                  SNDRV_PCM_FMTBIT_S24_LE,
+                       .channels_min = 2,
+                       .channels_max = 8,
+                       .rate_max =     192000,
+                       .rate_min =     48000,
+               },
+               .id = DISPLAY_PORT_RX,
+               .name = "DISPLAY_PORT",
+       },
+       Q6AFE_CDC_DMA_RX_DAI(WSA_CODEC_DMA_RX_0),
+       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_0),
+       Q6AFE_CDC_DMA_RX_DAI(WSA_CODEC_DMA_RX_1),
+       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_1),
+       Q6AFE_CDC_DMA_TX_DAI(WSA_CODEC_DMA_TX_2),
+       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_0),
+       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_1),
+       Q6AFE_CDC_DMA_TX_DAI(VA_CODEC_DMA_TX_2),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_0),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_0),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_1),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_1),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_2),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_2),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_3),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_3),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_4),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_4),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_5),
+       Q6AFE_CDC_DMA_TX_DAI(TX_CODEC_DMA_TX_5),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_6),
+       Q6AFE_CDC_DMA_RX_DAI(RX_CODEC_DMA_RX_7),
+};
+
+int q6dsp_audio_ports_of_xlate_dai_name(struct snd_soc_component *component,
+                                       const struct of_phandle_args *args,
+                                       const char **dai_name)
+{
+       int id = args->args[0];
+       int ret = -EINVAL;
+       int i;
+
+       for (i = 0; i  < ARRAY_SIZE(q6dsp_audio_fe_dais); i++) {
+               if (q6dsp_audio_fe_dais[i].id == id) {
+                       *dai_name = q6dsp_audio_fe_dais[i].name;
+                       ret = 0;
+                       break;
+               }
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(q6dsp_audio_ports_of_xlate_dai_name);
+
+struct snd_soc_dai_driver *q6dsp_audio_ports_set_config(struct device *dev,
+                               struct q6dsp_audio_port_dai_driver_config *cfg,
+                               int *num_dais)
+{
+       int i;
+
+       for (i = 0; i  < ARRAY_SIZE(q6dsp_audio_fe_dais); i++) {
+               q6dsp_audio_fe_dais[i].probe = cfg->probe;
+               q6dsp_audio_fe_dais[i].remove = cfg->remove;
+
+               switch (q6dsp_audio_fe_dais[i].id) {
+               case HDMI_RX:
+               case DISPLAY_PORT_RX:
+                       q6dsp_audio_fe_dais[i].ops = cfg->q6hdmi_ops;
+                       break;
+               case SLIMBUS_0_RX ... SLIMBUS_6_TX:
+                       q6dsp_audio_fe_dais[i].ops = cfg->q6slim_ops;
+                       break;
+               case QUINARY_MI2S_RX ... QUINARY_MI2S_TX:
+               case PRIMARY_MI2S_RX ... QUATERNARY_MI2S_TX:
+                       q6dsp_audio_fe_dais[i].ops = cfg->q6i2s_ops;
+                       break;
+               case PRIMARY_TDM_RX_0 ... QUINARY_TDM_TX_7:
+                       q6dsp_audio_fe_dais[i].ops = cfg->q6tdm_ops;
+                       break;
+               case WSA_CODEC_DMA_RX_0 ... RX_CODEC_DMA_RX_7:
+                       q6dsp_audio_fe_dais[i].ops = cfg->q6dma_ops;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       *num_dais = ARRAY_SIZE(q6dsp_audio_fe_dais);
+       return q6dsp_audio_fe_dais;
+}
+EXPORT_SYMBOL_GPL(q6dsp_audio_ports_set_config);
diff --git a/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h b/sound/soc/qcom/qdsp6/q6dsp-lpass-ports.h
new file mode 100644 (file)
index 0000000..7f052c8
--- /dev/null
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __Q6DSP_AUDIO_PORTS_H__
+#define __Q6DSP_AUDIO_PORTS_H__
+
+struct q6dsp_audio_port_dai_driver_config {
+       int (*probe)(struct snd_soc_dai *dai);
+       int (*remove)(struct snd_soc_dai *dai);
+       const struct snd_soc_dai_ops *q6hdmi_ops;
+       const struct snd_soc_dai_ops *q6slim_ops;
+       const struct snd_soc_dai_ops *q6i2s_ops;
+       const struct snd_soc_dai_ops *q6tdm_ops;
+       const struct snd_soc_dai_ops *q6dma_ops;
+};
+
+struct snd_soc_dai_driver *q6dsp_audio_ports_set_config(struct device *dev,
+                                       struct q6dsp_audio_port_dai_driver_config *cfg,
+                                       int *num_dais);
+int q6dsp_audio_ports_of_xlate_dai_name(struct snd_soc_component *component,
+                                       const struct of_phandle_args *args,
+                                       const char **dai_name);
+#endif /* __Q6DSP_AUDIO_PORTS_H__ */