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
233233 *
234234 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry
235235 *
236+ * %SKL_TKN_U32_FMT_CFG_IDX: Format config index
237+ *
236238 * module_id and loadable flags dont have tokens as these values will be
237239 * read from the DSP FW manifest
238240 *
@@ -324,7 +326,9 @@ enum SKL_TKNS { · 85 unmodified lines
324326 SKL_TKN_U32_ASTATE_COUNT,
325327 SKL_TKN_U32_ASTATE_KCPS,
326328 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,
328332 };
329333
330334 #endif