Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / sound / soc / codecs / wm_adsp.h

diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h
index ffd29a4..cb8871a 100644 (file)
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
@@ -25,6 +25,13 @@ struct wm_adsp_region {
        unsigned int base;
 };
 
+struct wm_adsp_alg_region {
+       struct list_head list;
+       unsigned int alg;
+       int type;
+       unsigned int base;
+};
+
 struct wm_adsp {
        const char *part;
        int num;
@@ -33,10 +40,18 @@ struct wm_adsp {
        struct regmap *regmap;
 
        int base;
+       int sysclk_reg;
+       int sysclk_mask;
+       int sysclk_shift;
+
+       struct list_head alg_regions;
 
        const struct wm_adsp_region *mem;
        int num_mems;
 
+       int fw;
+       bool running;
+
        struct regulator *dvfs;
 };
 
@@ -50,6 +65,9 @@ struct wm_adsp {
        .shift = num, .event = wm_adsp2_event, \
        .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD }
 
+extern const struct snd_kcontrol_new wm_adsp_fw_controls[];
+
+int wm_adsp1_init(struct wm_adsp *adsp);
 int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs);
 int wm_adsp1_event(struct snd_soc_dapm_widget *w,
                   struct snd_kcontrol *kcontrol, int event);