diff options
| author | Mark Brown <broonie@kernel.org> | 2016-07-25 00:07:22 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-25 00:07:22 +0300 |
| commit | 44d624622e57ad60e652da4d7bde43aadab350bf (patch) | |
| tree | 30a330c8fa9a051f147f82e336823f800e9d4e11 /sound/soc/intel/skylake/skl-topology.h | |
| parent | 0d911262808d07af538c23b1b6d249b3a4a9a431 (diff) | |
| parent | 1b00126cb3de017274e899ac559a744d4e3dbd61 (diff) | |
| download | linux-44d624622e57ad60e652da4d7bde43aadab350bf.tar.xz | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/skylake/skl-topology.h')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h index 28d1d2c68528..22d3ef83817d 100644 --- 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 { @@ -358,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 |