diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 18:15:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 18:15:03 +0300 |
| commit | 9a532f0554ca8558e844a96b9df82cef747b437d (patch) | |
| tree | 5da2f08140d2087e915fd38ddf7dcc0bc4377517 /include/uapi | |
| parent | 10e5b9c291b3bbcccb90fd28418676b5370ed53d (diff) | |
| parent | 8a70b4544ef4f094cc2c52734e097cc358f56603 (diff) | |
| download | linux-9a532f0554ca8558e844a96b9df82cef747b437d.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/asoc.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 6702533c8bd8..78014ec56357 100644 --- 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 */ |