summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorJames Schulman <james.schulman@cirrus.com>2020-07-23 12:03:21 +0100
committerMark Brown <broonie@kernel.org>2020-07-23 19:52:23 +0100
commit779bedff9bfaf34cae6bfcbdd98d972149f687e5 (patch)
treeb9bea93e0a635b0d15e5e441416fff05125a3041 /sound/soc
parent1ce8f643ed875d754ff09bf2096dfac3b905ab80 (diff)
ASoC: wm_adsp: Support new metadata block ID's
Coefficient files now support additional metadata blocks, these contain machine parsable text strings describing the parameters contained in the coefficient file. Signed-off-by: James Schulman <james.schulman@cirrus.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20200723110321.16382-1-ckeepax@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/wm_adsp.c1
-rw-r--r--sound/soc/codecs/wmfw.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 88c397c700ee..410cca57da52 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -2621,6 +2621,7 @@ static int wm_adsp_load_coeff(struct wm_adsp *dsp)
switch (type) {
case (WMFW_NAME_TEXT << 8):
case (WMFW_INFO_TEXT << 8):
+ case (WMFW_METADATA << 8):
break;
case (WMFW_ABSOLUTE << 8):
/*
diff --git a/sound/soc/codecs/wmfw.h b/sound/soc/codecs/wmfw.h
index 4278aa6aeb01..7423272c30e9 100644
--- a/sound/soc/codecs/wmfw.h
+++ b/sound/soc/codecs/wmfw.h
@@ -180,6 +180,7 @@ struct wmfw_coeff_item {
#define WMFW_ABSOLUTE 0xf0
#define WMFW_ALGORITHM_DATA 0xf2
+#define WMFW_METADATA 0xfc
#define WMFW_NAME_TEXT 0xfe
#define WMFW_INFO_TEXT 0xff