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

[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 de3c401284d9df312b13d8a1549f274a08f5a754..e4b399cd7868fd85a4f79e48c01deb770e32f220 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -274,14 +274,14 @@ struct skl_pipe {
 
 enum skl_module_state {
        SKL_MODULE_UNINIT = 0,
-       SKL_MODULE_INIT_DONE = 1,
-       SKL_MODULE_LOADED = 2,
-       SKL_MODULE_UNLOADED = 3,
-       SKL_MODULE_BIND_DONE = 4
+       SKL_MODULE_LOADED = 1,
+       SKL_MODULE_INIT_DONE = 2,
+       SKL_MODULE_BIND_DONE = 3,
+       SKL_MODULE_UNLOADED = 4,
 };
 
 struct skl_module_cfg {
-       char guid[SKL_UUID_STR_SZ];
+       u8 guid[16];
        struct skl_module_inst_id id;
        u8 domain;
        bool homogenous_inputs;