summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wmfw.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-16 16:59:04 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-18 15:02:17 +0900
commitc712326d6c1e74678791d5864cd2ed283e1cc572 (patch)
treefc14fbd3bac8e1219941b4c0d77d59338bdc3941 /sound/soc/codecs/wmfw.h
parent5e7a7a221fbae313a8635411b557e736ba044c98 (diff)
downloadlinux-c712326d6c1e74678791d5864cd2ed283e1cc572.tar.bz2
ASoC: wm_adsp: Implement support for coefficeint file format 1
Implement support for a new revision of the coefficeint file format for ADSP cores. Since coefficient file format 0 has not been widely deployed and is very unlikely to ever be used with this driver code support for it has been removed. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wmfw.h')
-rw-r--r--sound/soc/codecs/wmfw.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/soc/codecs/wmfw.h b/sound/soc/codecs/wmfw.h
index 5632ded67fdd..ef163360a745 100644
--- a/sound/soc/codecs/wmfw.h
+++ b/sound/soc/codecs/wmfw.h
@@ -93,15 +93,20 @@ struct wmfw_adsp2_alg_hdr {
struct wmfw_coeff_hdr {
u8 magic[4];
__le32 len;
- __le32 ver;
+ union {
+ __be32 rev;
+ __le32 ver;
+ };
+ union {
+ __be32 core;
+ __le32 core_ver;
+ };
u8 data[];
} __packed;
struct wmfw_coeff_item {
- union {
- __be32 type;
- __le32 offset;
- };
+ __le16 offset;
+ __le16 type;
__le32 id;
__le32 ver;
__le32 sr;