diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 11:51:30 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 11:51:30 -0400 |
| commit | 2016d5ed401133539779d8a070abbe42fe9cb3da (patch) | |
| tree | 96e1b8b348b2650345057fcaf7324983e6c2559f /include/uapi | |
| parent | 05325120861066e1e3e726eda54e429802725a64 (diff) | |
| parent | 7d3d6e0645dd3689e625161b9e312108e66b2b51 (diff) | |
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 @@ | |||
| 161 | * | 161 | * |
| 162 | * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module | 162 | * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module |
| 163 | * | 163 | * |
| 164 | * %SKL_TKN_U32_DMA_BUF_SIZE: DMA buffer size in millisec | ||
| 165 | * | ||
| 164 | * module_id and loadable flags dont have tokens as these values will be | 166 | * module_id and loadable flags dont have tokens as these values will be |
| 165 | * read from the DSP FW manifest | 167 | * read from the DSP FW manifest |
| 166 | */ | 168 | */ |
| @@ -213,8 +215,10 @@ enum SKL_TKNS { | |||
| 213 | SKL_TKN_U32_LIB_COUNT, | 215 | SKL_TKN_U32_LIB_COUNT, |
| 214 | SKL_TKN_STR_LIB_NAME, | 216 | SKL_TKN_STR_LIB_NAME, |
| 215 | SKL_TKN_U32_PMODE, | 217 | SKL_TKN_U32_PMODE, |
| 216 | SKL_TKL_U32_D0I3_CAPS, | 218 | SKL_TKL_U32_D0I3_CAPS, /* Typo added at v4.10 */ |
| 217 | SKL_TKN_MAX = SKL_TKL_U32_D0I3_CAPS, | 219 | SKL_TKN_U32_D0I3_CAPS = SKL_TKL_U32_D0I3_CAPS, |
| 220 | SKL_TKN_U32_DMA_BUF_SIZE, | ||
| 221 | SKL_TKN_MAX = SKL_TKN_U32_DMA_BUF_SIZE, | ||
| 218 | }; | 222 | }; |
| 219 | 223 | ||
| 220 | #endif | 224 | #endif |
