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

2021-08-30 12:30:33 +01:00
parent a617f7d45c 3202e2f5fa
commit 38b7673000
171 changed files with 18986 additions and 1283 deletions
--- a/include/uapi/sound/snd_sst_tokens.h
+++ b/include/uapi/sound/snd_sst_tokens.h
@@ -233,6 +233,8 @@
 *
 * %SKL_TKN_U32_ASTATE_CLK_SRC: Clock source for A-State entry
 *
+ * %SKL_TKN_U32_FMT_CFG_IDX:    Format config index
+ *
 * module_id and loadable flags dont have tokens as these values will be
 * read from the DSP FW manifest
 *
@@ -324,7 +326,9 @@ enum SKL_TKNS {
 	SKL_TKN_U32_ASTATE_COUNT,
 	SKL_TKN_U32_ASTATE_KCPS,
 	SKL_TKN_U32_ASTATE_CLK_SRC,
-	SKL_TKN_MAX = SKL_TKN_U32_ASTATE_CLK_SRC,
+
+	SKL_TKN_U32_FMT_CFG_IDX = 96,
+	SKL_TKN_MAX = SKL_TKN_U32_FMT_CFG_IDX,
 };

 #endif