ASoC: dapm: Add new widget type for constructing DAPM graphs on DSPs.

Add some DAPM widget types to better support the construction of DAPM
graphs within DSPs.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/Documentation/sound/soc/dapm.rst b/Documentation/sound/soc/dapm.rst
index a27f42befa4dce092fbfb9d981bba384e2c75782..8e44107933abf5f257afc4626c5e4db0d25a246f 100644 (file)
--- a/Documentation/sound/soc/dapm.rst
+++ b/Documentation/sound/soc/dapm.rst
@@ -105,6 +105,24 @@ Pre
        Special PRE widget (exec before all others)
 Post
        Special POST widget (exec after all others)
+Buffer
+       Inter widget audio data buffer within a DSP.
+Scheduler
+       DSP internal scheduler that schedules component/pipeline processing
+       work.
+Effect
+       Widget that performs an audio processing effect.
+SRC
+       Sample Rate Converter within DSP or CODEC
+ASRC
+       Asynchronous Sample Rate Converter within DSP or CODEC
+Encoder
+       Widget that encodes audio data from one format (usually PCM) to another
+       usually more compressed format.
+Decoder
+       Widget that decodes audio data from a compressed format to an
+       uncompressed format like PCM.
+
 
 (Widgets are defined in include/sound/soc-dapm.h)
 

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index a466f4bdc835948c21f27a5f9f57f91930db0090..344b96c206a39ec886a3cbb983008127266d9b48 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -510,6 +510,13 @@ enum snd_soc_dapm_type {
        snd_soc_dapm_dai_out,
        snd_soc_dapm_dai_link,          /* link between two DAI structures */
        snd_soc_dapm_kcontrol,          /* Auto-disabled kcontrol */
+       snd_soc_dapm_buffer,            /* DSP/CODEC internal buffer */
+       snd_soc_dapm_scheduler,         /* DSP/CODEC internal scheduler */
+       snd_soc_dapm_effect,            /* DSP/CODEC effect component */
+       snd_soc_dapm_src,               /* DSP/CODEC SRC component */
+       snd_soc_dapm_asrc,              /* DSP/CODEC ASRC component */
+       snd_soc_dapm_encoder,           /* FW/SW audio encoder component */
+       snd_soc_dapm_decoder,           /* FW/SW audio decoder component */
 };
 
 enum snd_soc_dapm_subclass {

diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 6702533c8bd86b8f65d81c0cb8fe0c73cbfd6e05..78014ec56357c0d021ed2934a4ce0a78f6f91fd2 100644 (file)
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -73,7 +73,15 @@
 #define SND_SOC_TPLG_DAPM_DAI_IN       13
 #define SND_SOC_TPLG_DAPM_DAI_OUT      14
 #define SND_SOC_TPLG_DAPM_DAI_LINK     15
-#define SND_SOC_TPLG_DAPM_LAST         SND_SOC_TPLG_DAPM_DAI_LINK
+#define SND_SOC_TPLG_DAPM_BUFFER       16
+#define SND_SOC_TPLG_DAPM_SCHEDULER    17
+#define SND_SOC_TPLG_DAPM_EFFECT       18
+#define SND_SOC_TPLG_DAPM_SIGGEN       19
+#define SND_SOC_TPLG_DAPM_SRC          20
+#define SND_SOC_TPLG_DAPM_ASRC         21
+#define SND_SOC_TPLG_DAPM_ENCODER      22
+#define SND_SOC_TPLG_DAPM_DECODER      23
+#define SND_SOC_TPLG_DAPM_LAST         SND_SOC_TPLG_DAPM_DECODER
 
 /* Header magic number and string sizes */
 #define SND_SOC_TPLG_MAGIC             0x41536F43 /* ASoC */

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 002772e3ba2cb5f193ef35b4b96c8ee6eadc46d1..dd3a391476ae26bb614a17afd9caabfe0a2e6230 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -242,6 +242,14 @@ static const struct soc_tplg_map dapm_map[] = {
        {SND_SOC_TPLG_DAPM_DAI_IN, snd_soc_dapm_dai_in},
        {SND_SOC_TPLG_DAPM_DAI_OUT, snd_soc_dapm_dai_out},
        {SND_SOC_TPLG_DAPM_DAI_LINK, snd_soc_dapm_dai_link},
+       {SND_SOC_TPLG_DAPM_BUFFER, snd_soc_dapm_buffer},
+       {SND_SOC_TPLG_DAPM_SCHEDULER, snd_soc_dapm_scheduler},
+       {SND_SOC_TPLG_DAPM_EFFECT, snd_soc_dapm_effect},
+       {SND_SOC_TPLG_DAPM_SIGGEN, snd_soc_dapm_siggen},
+       {SND_SOC_TPLG_DAPM_SRC, snd_soc_dapm_src},
+       {SND_SOC_TPLG_DAPM_ASRC, snd_soc_dapm_asrc},
+       {SND_SOC_TPLG_DAPM_ENCODER, snd_soc_dapm_encoder},
+       {SND_SOC_TPLG_DAPM_DECODER, snd_soc_dapm_decoder},
 };
 
 static int tplc_chan_get_reg(struct soc_tplg *tplg,