Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next

e768f4e1 · Mark Brown · 0ee6f750 · 0c2e3f34 · e768f4e1 · e768f4e1
Commit e768f4e1 authored Jun 17, 2013 by Mark Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 455 additions and 7 deletions

sound/soc/codecs/wm_adsp.c sound/soc/codecs/wm_adsp.c +452 -7

sound/soc/codecs/wm_adsp.h sound/soc/codecs/wm_adsp.h +3 -0

No files found.
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -30,6 +30,7 @@ struct wm_adsp_alg_region {
 	unsigned int alg;
 	int type;
 	unsigned int base;
+	size_t len;
 };

 struct wm_adsp {
@@ -55,6 +56,8 @@ struct wm_adsp {
 	bool running;

 	struct regulator *dvfs;
+
+	struct wm_coeff *wm_coeff;
 };

 #define WM_ADSP1(wname, num) \