History

Merge remote-tracking branch 'asoc/topic/intel' into asoc-next

Mark Brown committed 9 years ago

Commit 2016d5e2 parents 0532512 7d3d6e038 files · +2806 −264Browse files

Showing the changes to include/uapi (1 of 38 files). Show all

Unified · Split

include/uapi/sound/snd_sst_tokens.h+6−2
@@ -161,6 +161,8 @@ · 160 unmodified lines
161 *161 *
162 * %SKL_TKL_U32_D0I3_CAPS: Specifies the D0i3 capability for module162 * %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 be166 * module_id and loadable flags dont have tokens as these values will be
165 * read from the DSP FW manifest167 * read from the DSP FW manifest
166 */168 */
@@ -213,8 +215,10 @@ enum SKL_TKNS { · 46 unmodified lines
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#endif224#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t