History

Merge remote-tracking branch 'asoc/for-5.15' into asoc-linus

Mark Brown committed 5 years ago

Commit 38b76732 parents a617f7d 3202e2f171 files · +18985 −1282Browse files

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

Unified · Split

include/uapi/sound/snd_sst_tokens.h+5−1
@@ -233,6 +233,8 @@ · 232 unmodified lines
233 *233 *
234 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry234 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry
235 *235 *
236 * %SKL_TKN_U32_FMT_CFG_IDX: Format config index
237 *
236 * module_id and loadable flags dont have tokens as these values will be238 * module_id and loadable flags dont have tokens as these values will be
237 * read from the DSP FW manifest239 * read from the DSP FW manifest
238 *240 *
@@ -324,7 +326,9 @@ enum SKL_TKNS { · 85 unmodified lines
324 SKL_TKN_U32_ASTATE_COUNT,326 SKL_TKN_U32_ASTATE_COUNT,
325 SKL_TKN_U32_ASTATE_KCPS,327 SKL_TKN_U32_ASTATE_KCPS,
326 SKL_TKN_U32_ASTATE_CLK_SRC,328 SKL_TKN_U32_ASTATE_CLK_SRC,
327 SKL_TKN_MAX = SKL_TKN_U32_ASTATE_CLK_SRC,329
330 SKL_TKN_U32_FMT_CFG_IDX = 96,
331 SKL_TKN_MAX = SKL_TKN_U32_FMT_CFG_IDX,
328};332};
329 333
330#endif334#endif