Merge tag 'sound-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-block.git] / include / uapi / sound / skl-tplg-interface.h

diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index 4bf9c4f9add8ae204757089cbd73d75f7e1c1dae..940c4269322bdf6f3832916da87aa69a375b345b 100644 (file)
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -165,78 +165,4 @@ enum skl_tuple_type {
        SKL_TYPE_DATA
 };
 
-/* v4 configuration data */
-
-struct skl_dfw_v4_module_pin {
-       __u16 module_id;
-       __u16 instance_id;
-} __packed;
-
-struct skl_dfw_v4_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_v4_module_caps {
-       __u32 set_params:2;
-       __u32 rsvd:30;
-       __u32 param_id;
-       __u32 caps_size;
-       __u32 caps[HDA_SST_CFG_MAX];
-} __packed;
-
-struct skl_dfw_v4_pipe {
-       __u8 pipe_id;
-       __u8 pipe_priority;
-       __u16 conn_type:4;
-       __u16 rsvd:4;
-       __u16 memory_pages:8;
-} __packed;
-
-struct skl_dfw_v4_module {
-       char uuid[SKL_UUID_STR_SZ];
-
-       __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 rsvd3:11;
-
-       struct skl_dfw_v4_pipe pipe;
-       struct skl_dfw_v4_module_fmt in_fmt[MAX_IN_QUEUE];
-       struct skl_dfw_v4_module_fmt out_fmt[MAX_OUT_QUEUE];
-       struct skl_dfw_v4_module_pin in_pin[MAX_IN_QUEUE];
-       struct skl_dfw_v4_module_pin out_pin[MAX_OUT_QUEUE];
-       struct skl_dfw_v4_module_caps caps;
-} __packed;
-
 #endif