Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / intel / skylake / skl-sst-ipc.h

diff --git a/sound/soc/intel/skylake/skl-sst-ipc.h b/sound/soc/intel/skylake/skl-sst-ipc.h
index 0a0d09cde99dc61cdbc1ba8fa770be3b049b51c1..0334ed4af0312a89eef15a09f05a67c88465272b 100644 (file)
--- a/sound/soc/intel/skylake/skl-sst-ipc.h
+++ b/sound/soc/intel/skylake/skl-sst-ipc.h
@@ -66,7 +66,7 @@ struct skl_sst {
 
        /* callback for miscbdge */
        void (*enable_miscbdcge)(struct device *dev, bool enable);
-       /*Is CGCTL.MISCBDCGE disabled*/
+       /* Is CGCTL.MISCBDCGE disabled */
        bool miscbdcg_disabled;
 
        /* Populate module information */
@@ -80,6 +80,9 @@ struct skl_sst {
 
        /* multi-core */
        struct skl_dsp_cores cores;
+
+       /* tplg manifest */
+       struct skl_dfw_manifest manifest;
 };
 
 struct skl_ipc_init_instance_msg {
@@ -88,6 +91,7 @@ struct skl_ipc_init_instance_msg {
        u16 param_data_size;
        u8 ppl_instance_id;
        u8 core_id;
+       u8 domain;
 };
 
 struct skl_ipc_bind_unbind_msg {
@@ -148,6 +152,9 @@ int skl_ipc_set_large_config(struct sst_generic_ipc *ipc,
 int skl_ipc_get_large_config(struct sst_generic_ipc *ipc,
                struct skl_ipc_large_config_msg *msg, u32 *param);
 
+int skl_sst_ipc_load_library(struct sst_generic_ipc *ipc,
+                       u8 dma_id, u8 table_id);
+
 void skl_ipc_int_enable(struct sst_dsp *dsp);
 void skl_ipc_op_int_enable(struct sst_dsp *ctx);
 void skl_ipc_op_int_disable(struct sst_dsp *ctx);