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

[sfrench/cifs-2.6.git] / sound / soc / intel / skylake / skl-topology.h

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index 2717db92036b4cc58ac7148904b41d00d16d4805..b6496513fe555d476c6796f9cc5e40f2e29f4caf 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -34,7 +34,7 @@
 #define MAX_FIXED_DMIC_PARAMS_SIZE 727
 
 /* Maximum number of coefficients up down mixer module */
-#define UP_DOWN_MIXER_MAX_COEFF                6
+#define UP_DOWN_MIXER_MAX_COEFF                8
 
 #define MODULE_MAX_IN_PINS     8
 #define MODULE_MAX_OUT_PINS    8
@@ -161,6 +161,7 @@ struct skl_up_down_mixer_cfg {
        u32 coeff_sel;
        /* Pass the user coeff in this array */
        s32 coeff[UP_DOWN_MIXER_MAX_COEFF];
+       u32 ch_map;
 } __packed;
 
 struct skl_algo_cfg {
@@ -455,8 +456,8 @@ static inline struct skl *get_skl_ctx(struct device *dev)
 
 int skl_tplg_be_update_params(struct snd_soc_dai *dai,
        struct skl_pipe_params *params);
-int skl_dsp_set_dma_control(struct skl_sst *ctx,
-               struct skl_module_cfg *mconfig);
+int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps,
+                       u32 caps_size, u32 node_id);
 void skl_tplg_set_be_dmic_config(struct snd_soc_dai *dai,
        struct skl_pipe_params *params, int stream);
 int skl_tplg_init(struct snd_soc_platform *platform,
@@ -501,4 +502,7 @@ int skl_pcm_host_dma_prepare(struct device *dev,
                        struct skl_pipe_params *params);
 int skl_pcm_link_dma_prepare(struct device *dev,
                        struct skl_pipe_params *params);
+
+int skl_dai_load(struct snd_soc_component *cmp,
+                struct snd_soc_dai_driver *pcm_dai);
 #endif