Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[deliverable/linux.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 e4b399cd7868fd85a4f79e48c01deb770e32f220..22d3ef83817dfdfa762c65d08bba11b4628dc74f 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -244,7 +244,8 @@ enum skl_pipe_state {
        SKL_PIPE_INVALID = 0,
        SKL_PIPE_CREATED = 1,
        SKL_PIPE_PAUSED = 2,
-       SKL_PIPE_STARTED = 3
+       SKL_PIPE_STARTED = 3,
+       SKL_PIPE_RESET = 4
 };
 
 struct skl_pipe_module {
@@ -270,6 +271,7 @@ struct skl_pipe {
        struct skl_pipe_params *p_params;
        enum skl_pipe_state state;
        struct list_head w_list;
+       bool passthru;
 };
 
 enum skl_module_state {
@@ -319,6 +321,7 @@ struct skl_algo_data {
        u32 param_id;
        u32 set_params;
        u32 max;
+       u32 size;
        char *params;
 };
 
@@ -357,6 +360,8 @@ int skl_delete_pipe(struct skl_sst *ctx, struct skl_pipe *pipe);
 
 int skl_stop_pipe(struct skl_sst *ctx, struct skl_pipe *pipe);
 
+int skl_reset_pipe(struct skl_sst *ctx, struct skl_pipe *pipe);
+
 int skl_init_module(struct skl_sst *ctx, struct skl_module_cfg *module_config);
 
 int skl_bind_modules(struct skl_sst *ctx, struct skl_module_cfg