diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 16:51:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 16:51:30 +0100 |
| commit | 2016d5ed401133539779d8a070abbe42fe9cb3da (patch) | |
| tree | 96e1b8b348b2650345057fcaf7324983e6c2559f /include/uapi | |
| parent | 05325120861066e1e3e726eda54e429802725a64 (diff) | |
| parent | 7d3d6e0645dd3689e625161b9e312108e66b2b51 (diff) | |
| download | linux-2016d5ed401133539779d8a070abbe42fe9cb3da.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/snd_sst_tokens.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/uapi/sound/snd_sst_tokens.h b/include/uapi/sound/snd_sst_tokens.h index 93392bedcc58..dedb2056160d 100644 --- a/include/uapi/sound/snd_sst_tokens.h +++ b/include/uapi/sound/snd_sst_tokens.h @@ -161,6 +161,8 @@ * * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module * + * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec + * * module_id and loadable flags dont have tokens as these values will be * read from the DSP FW manifest */ @@ -213,8 +215,10 @@ enum SKL_TKNS { SKL_TKN_U32_LIB_COUNT, SKL_TKN_STR_LIB_NAME, SKL_TKN_U32_PMODE, - SKL_TKL_U32_D0I3_CAPS, - SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS, + SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ + SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, + SKL_TKN_U32_DMA_BUF_SIZE, + SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE, }; #endif |