summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl-tplg-interface.h
diff options
context:
space:
mode:
authorShreyas NC2016-08-12 08:59:52 +0200
committerMark Brown2016-08-22 19:44:11 +0200
commit33ece7f9c8e8a2abfcca681ec9424b15271f7afb (patch)
treea48301459836b628db31ccc3dfd0b1c67abff883 /sound/soc/intel/skylake/skl-tplg-interface.h
parentASoC: Intel: Skylake: Parse vendor tokens to build module data (diff)
downloadkernel-qcow2-linux-33ece7f9c8e8a2abfcca681ec9424b15271f7afb.tar.gz
kernel-qcow2-linux-33ece7f9c8e8a2abfcca681ec9424b15271f7afb.tar.xz
kernel-qcow2-linux-33ece7f9c8e8a2abfcca681ec9424b15271f7afb.zip
ASoC: Intel: Skylake: Remove dfw config and associated structures
The skl_dfw_config structure is no longer required as the module config is populated by parsing and reading the token values. So, remove the structure. Signed-off-by: Shreyas NC <shreyas.nc@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl-tplg-interface.h')
-rw-r--r--sound/soc/intel/skylake/skl-tplg-interface.h73
1 files changed, 0 insertions, 73 deletions
diff --git a/sound/soc/intel/skylake/skl-tplg-interface.h b/sound/soc/intel/skylake/skl-tplg-interface.h
index 281762eca0ab..e208724f9db3 100644
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
@@ -148,79 +148,6 @@ enum skl_module_param_type {
SKL_PARAM_BIND
};
-struct skl_dfw_module_pin {
- u16 module_id;
- u16 instance_id;
-} __packed;
-
-struct skl_dfw_module_fmt {
- u32 channels;
- u32 freq;
- u32 bit_depth;
- u32 valid_bit_depth;
- u32 ch_cfg;
- u32 interleaving_style;
- u32 sample_type;
- u32 ch_map;
-} __packed;
-
-struct skl_dfw_module_caps {
- u32 set_params:2;
- u32 rsvd:30;
- u32 param_id;
- u32 caps_size;
- u32 caps[HDA_SST_CFG_MAX];
-};
-
-struct skl_dfw_pipe {
- u8 pipe_id;
- u8 pipe_priority;
- u16 conn_type:4;
- u16 rsvd:4;
- u16 memory_pages:8;
-} __packed;
-
-struct skl_dfw_module {
- u8 uuid[16];
-
- u16 module_id;
- u16 instance_id;
- u32 max_mcps;
- u32 mem_pages;
- u32 obs;
- u32 ibs;
- u32 vbus_id;
-
- u32 max_in_queue:8;
- u32 max_out_queue:8;
- u32 time_slot:8;
- u32 core_id:4;
- u32 rsvd1:4;
-
- u32 module_type:8;
- u32 conn_type:4;
- u32 dev_type:4;
- u32 hw_conn_type:4;
- u32 rsvd2:12;
-
- u32 params_fixup:8;
- u32 converter:8;
- u32 input_pin_type:1;
- u32 output_pin_type:1;
- u32 is_dynamic_in_pin:1;
- u32 is_dynamic_out_pin:1;
- u32 is_loadable:1;
- u32 proc_domain:1;
- u32 rsvd3:10;
-
- struct skl_dfw_pipe pipe;
- struct skl_dfw_module_fmt in_fmt[MAX_IN_QUEUE];
- struct skl_dfw_module_fmt out_fmt[MAX_OUT_QUEUE];
- struct skl_dfw_module_pin in_pin[MAX_IN_QUEUE];
- struct skl_dfw_module_pin out_pin[MAX_OUT_QUEUE];
- struct skl_dfw_module_caps caps;
-} __packed;
-
struct skl_dfw_algo_data {
u32 set_params:2;
u32 rsvd:30;