ASoC: Intel: Skylake: Add driver structures to be filled from topology manifest

The topology manifest would include module common data including resource
and interface table. The resource table consists of resources required by
the dsp module such as buffer size, cycles per second, number of
input/output pins. And, the interface table consists of pcm parameters per
module which can be referenced later.

So define the structures accordingly to represent topology manifest data in
the driver.

Signed-off-by: Shreyas NC <shreyas.nc@intel.com>
Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/skylake/skl-topology.h b/sound/soc/intel/skylake/skl-topology.h
index c25e8868b84e670cb765f815d2b69f409c245c22..93b2ba8c40f7f4e637add9a7311742f94bd2fb5e 100644 (file)
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
@@ -44,6 +44,13 @@
 #define SKL_DEFAULT_MIC_SEL_GAIN       0x3FF
 #define SKL_MIC_SEL_SWITCH     0x3
 
+#define SKL_OUTPUT_PIN         0
+#define SKL_INPUT_PIN          1
+#define SKL_MAX_PATH_CONFIGS   8
+#define SKL_MAX_MODULES_IN_PIPE        8
+#define SKL_MAX_MODULE_FORMATS         32
+#define SKL_MAX_MODULE_RESOURCES       32
+
 enum skl_channel_index {
        SKL_CHANNEL_LEFT = 0,
        SKL_CHANNEL_RIGHT = 1,
@@ -292,6 +299,51 @@ enum d0i3_capability {
        SKL_D0I3_NON_STREAMING = 2,
 };
 
+struct skl_module_pin_fmt {
+       u8 id;
+       struct skl_module_fmt fmt;
+};
+
+struct skl_module_iface {
+       u8 fmt_idx;
+       u8 nr_in_fmt;
+       u8 nr_out_fmt;
+       struct skl_module_pin_fmt inputs[MAX_IN_QUEUE];
+       struct skl_module_pin_fmt outputs[MAX_OUT_QUEUE];
+};
+
+struct skl_module_pin_resources {
+       u8 pin_index;
+       u32 buf_size;
+};
+
+struct skl_module_res {
+       u8 id;
+       u32 is_pages;
+       u32 cps;
+       u32 ibs;
+       u32 obs;
+       u32 dma_buffer_size;
+       u32 cpc;
+       u8 nr_input_pins;
+       u8 nr_output_pins;
+       struct skl_module_pin_resources input[MAX_IN_QUEUE];
+       struct skl_module_pin_resources output[MAX_OUT_QUEUE];
+};
+
+struct skl_module {
+       uuid_le uuid;
+       u8 loadable;
+       u8 input_pin_type;
+       u8 output_pin_type;
+       u8 max_input_pins;
+       u8 max_output_pins;
+       u8 nr_resources;
+       u8 nr_interfaces;
+       struct skl_module_res resources[SKL_MAX_MODULE_RESOURCES];
+       struct skl_module_iface formats[SKL_MAX_MODULE_FORMATS];
+};
+
 struct skl_module_cfg {
        u8 guid[16];
        struct skl_module_inst_id id;

diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 20017ee4685c2eb90c693c1cf7223cbb8e9ba411..8d9d6899f761b2a55991ebea505a0e9f9a964fd8 100644 (file)
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -71,6 +71,8 @@ struct skl {
        struct work_struct probe_work;
 
        struct skl_debug *debugfs;
+       u8 nr_modules;
+       struct skl_module **modules;
 };
 
 #define skl_to_ebus(s) (&(s)->ebus)