diff --git a/drivers/net/wireless/cnss2/Kconfig b/drivers/net/wireless/cnss2/Kconfig
index 406ef18e62a4..3d1c448edf47 100644
--- a/drivers/net/wireless/cnss2/Kconfig
+++ b/drivers/net/wireless/cnss2/Kconfig
@@ -20,6 +20,7 @@ config CNSS2_DEBUG
 
 config CNSS2_QMI
 	bool "CNSS2 Platform Driver QMI support"
+	select CNSS_QMI_SVC
 	depends on CNSS2
 	help
 	  CNSS2 platform driver uses QMI framework to communicate with WLAN
@@ -85,4 +86,4 @@ config CNSS_QCA6490
 	  This enables the changes from WLAN host driver that are specific to
 	  CNSS QCA6490 chipset.
 	  These changes are needed to support the new hardware architecture
-	  for CNSS QCA6490 chipset.
\ No newline at end of file
+	  for CNSS QCA6490 chipset.
diff --git a/drivers/net/wireless/cnss2/Makefile b/drivers/net/wireless/cnss2/Makefile
index 023dd437adec..225622e76a68 100644
--- a/drivers/net/wireless/cnss2/Makefile
+++ b/drivers/net/wireless/cnss2/Makefile
@@ -2,10 +2,11 @@
 
 obj-$(CONFIG_CNSS2) += cnss2.o
 
+ccflags-y += -I$(srctree)/drivers/net/wireless/cnss_utils/
 cnss2-y := main.o
 cnss2-y += bus.o
 cnss2-y += debug.o
 cnss2-y += pci.o
 cnss2-y += power.o
 cnss2-y += genl.o
-cnss2-$(CONFIG_CNSS2_QMI) += qmi.o wlan_firmware_service_v01.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o device_management_service_v01.o
+cnss2-$(CONFIG_CNSS2_QMI) += qmi.o coexistence_service_v01.o ip_multimedia_subsystem_private_service_v01.o device_management_service_v01.o
diff --git a/drivers/net/wireless/cnss2/wlan_firmware_service_v01.c b/drivers/net/wireless/cnss2/wlan_firmware_service_v01.c
deleted file mode 100644
index 5caf7ffea1eb..000000000000
--- a/drivers/net/wireless/cnss2/wlan_firmware_service_v01.c
+++ /dev/null
@@ -1,4545 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. */
-
-#include "wlan_firmware_service_v01.h"
-
-static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
-					   pipe_num),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_pipedir_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
-					   pipe_dir),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
-					   nentries),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
-					   nbytes_max),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
-					   flags),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
-					   service_id),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_pipedir_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
-					   pipe_dir),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
-					   pipe_num),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_cfg_s_v01,
-					   id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_cfg_s_v01,
-					   offset),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_v2_cfg_s_v01,
-					   addr),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_rri_over_ddr_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rri_over_ddr_cfg_s_v01,
-					   base_addr_low),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rri_over_ddr_cfg_s_v01,
-					   base_addr_high),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_msi_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_msi_cfg_s_v01,
-					   ce_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_msi_cfg_s_v01,
-					   msi_vector),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
-					   region_addr),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
-					   secure_flag),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
-					   offset),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
-					   secure_flag),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_mem_type_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
-					   type),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
-					   mem_cfg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_CFG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
-					   mem_cfg),
-		.ei_array      = wlfw_mem_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
-					   addr),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_mem_type_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
-					   type),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
-					   restore),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_chip_info_s_v01,
-					   chip_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_chip_info_s_v01,
-					   chip_family),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_rf_board_info_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_board_info_s_v01,
-					   board_id),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_soc_info_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_soc_info_s_v01,
-					   soc_id),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_fw_version_info_s_v01,
-					   fw_version),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_MAX_TIMESTAMP_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_fw_version_info_s_v01,
-					   fw_build_timestamp),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-static struct qmi_elem_info wlfw_host_ddr_range_s_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_host_ddr_range_s_v01,
-					   start),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_host_ddr_range_s_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_ready_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_ready_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   initiate_cal_download_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   initiate_cal_download_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   initiate_cal_update_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   initiate_cal_update_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   msa_ready_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   msa_ready_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   pin_connect_result_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   pin_connect_result_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   client_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   client_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   request_mem_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   request_mem_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_mem_ready_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_mem_ready_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_init_done_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   fw_init_done_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   rejuvenate_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   rejuvenate_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   xo_cal_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   xo_cal_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   cal_done_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   cal_done_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_req_mem_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_req_mem_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_save_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_save_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_free_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_trace_free_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   respond_get_info_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   respond_get_info_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   m3_dump_upload_req_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   m3_dump_upload_req_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x21,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   wfc_call_twt_config_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x21,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   wfc_call_twt_config_enable),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x22,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_mem_ready_enable_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x22,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
-					   qdss_mem_ready_enable),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_ind_register_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_ind_register_resp_msg_v01,
-					   fw_status_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_ind_register_resp_msg_v01,
-					   fw_status),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
-					   hang_data_addr_offset_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
-					   hang_data_addr_offset),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
-					   hang_data_length_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
-					   hang_data_length),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   pwr_pin_result_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   pwr_pin_result),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   phy_io_pin_result_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   phy_io_pin_result),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   rf_pin_result_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_pin_connect_result_ind_msg_v01,
-					   rf_pin_result),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_driver_mode_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
-					   mode),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
-					   hw_debug_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
-					   hw_debug),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_wlan_mode_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   host_version_valid),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_MAX_STR_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   host_version),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   tgt_cfg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   tgt_cfg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_CE_V01,
-		.elem_size      = sizeof(struct wlfw_ce_tgt_pipe_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   tgt_cfg),
-		.ei_array      = wlfw_ce_tgt_pipe_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   svc_cfg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   svc_cfg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_SVC_V01,
-		.elem_size      = sizeof(struct wlfw_ce_svc_pipe_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   svc_cfg),
-		.ei_array      = wlfw_ce_svc_pipe_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_SHADOW_REG_V01,
-		.elem_size      = sizeof(struct wlfw_shadow_reg_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg),
-		.ei_array      = wlfw_shadow_reg_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg_v2_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg_v2_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01,
-		.elem_size      = sizeof(struct wlfw_shadow_reg_v2_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   shadow_reg_v2),
-		.ei_array      = wlfw_shadow_reg_v2_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   rri_over_ddr_cfg_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct wlfw_rri_over_ddr_cfg_s_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   rri_over_ddr_cfg),
-		.ei_array      = wlfw_rri_over_ddr_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   msi_cfg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   msi_cfg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_CE_V01,
-		.elem_size      = sizeof(struct wlfw_msi_cfg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
-					   msi_cfg),
-		.ei_array      = wlfw_msi_cfg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_wlan_cfg_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cap_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   chip_info_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct wlfw_rf_chip_info_s_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   chip_info),
-		.ei_array      = wlfw_rf_chip_info_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   board_info_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct wlfw_rf_board_info_s_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   board_info),
-		.ei_array      = wlfw_rf_board_info_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   soc_info_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct wlfw_soc_info_s_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   soc_info),
-		.ei_array      = wlfw_soc_info_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_version_info_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct wlfw_fw_version_info_s_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_version_info),
-		.ei_array      = wlfw_fw_version_info_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_build_id_valid),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_MAX_BUILD_ID_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_build_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   num_macs_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   num_macs),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   voltage_mv_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   voltage_mv),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   time_freq_hz_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   time_freq_hz),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   otp_version_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   otp_version),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   eeprom_caldata_read_timeout_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   eeprom_caldata_read_timeout),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_caps_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
-					   fw_caps),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   valid),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   file_id_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   file_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   end),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   bdf_type_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
-					   bdf_type),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_bdf_download_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_bdf_download_resp_msg_v01,
-					   host_bdf_data_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_bdf_download_resp_msg_v01,
-					   host_bdf_data),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   meta_data_len),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = QMI_WLFW_MAX_NUM_CAL_V01,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   meta_data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   xo_cal_data_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   xo_cal_data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   cal_remove_supported_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
-					   cal_remove_supported),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_report_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_data_location_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_data_location),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   valid),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   file_id_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   file_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   end),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   cal_data_location_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   cal_data_location),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_cal_download_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_initiate_cal_update_ind_msg_v01,
-					   cal_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_initiate_cal_update_ind_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_initiate_cal_update_ind_msg_v01,
-					   cal_data_location_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_initiate_cal_update_ind_msg_v01,
-					   cal_data_location),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_update_req_msg_v01,
-					   cal_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_update_req_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   file_id_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   file_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   end),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   cal_data_location_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
-					   cal_data_location),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_msa_info_req_msg_v01,
-					   msa_addr),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_info_req_msg_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
-					   mem_region_info_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01,
-		.elem_size      = sizeof(struct wlfw_memory_region_info_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
-					   mem_region_info),
-		.ei_array      = wlfw_memory_region_info_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_ready_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ini_req_msg_v01,
-					   enablefwlog_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ini_req_msg_v01,
-					   enablefwlog),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_ini_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
-					   offset),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
-					   mem_type),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_read_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_read_resp_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_read_resp_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_read_resp_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_write_req_msg_v01,
-					   offset),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_write_req_msg_v01,
-					   mem_type),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_write_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_write_req_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_athdiag_write_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_vbatt_req_msg_v01,
-					   voltage_uv),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_vbatt_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_mac_addr_req_msg_v01,
-					   mac_addr_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAC_ADDR_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = STATIC_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_mac_addr_req_msg_v01,
-					   mac_addr),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_mac_addr_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   num_clients_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   num_clients),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   wake_msi_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   wake_msi),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   gpios_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   gpios_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = QMI_WLFW_MAX_NUM_GPIO_V01,
-		.elem_size      = sizeof(u32),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   gpios),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   nm_modem_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   nm_modem),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   bdf_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   bdf_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   bdf_cache_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   bdf_cache_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   m3_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   m3_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   m3_cache_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   m3_cache_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_filesys_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_filesys_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_cache_support_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_cache_support),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_done_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_done),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   mem_bucket_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   mem_bucket),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   mem_cfg_mode_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   mem_cfg_mode),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_duration_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   cal_duration),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   platform_name_valid),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   platform_name),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   ddr_range_valid),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01,
-		.elem_size      = sizeof(struct wlfw_host_ddr_range_s_v01),
-		.array_type       = STATIC_ARRAY,
-		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   ddr_range),
-		.ei_array      = wlfw_host_ddr_range_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   host_build_type_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_host_build_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
-					   host_build_type),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_host_cap_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_request_mem_ind_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_request_mem_ind_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_respond_mem_req_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_resp_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_respond_mem_req_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_resp_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_respond_mem_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   cause_for_rejuvenation_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   cause_for_rejuvenation),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   requesting_sub_system_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   requesting_sub_system),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   line_number_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   line_number),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   function_name_valid),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_FUNCTION_NAME_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
-					   function_name),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_rejuvenate_ack_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_req_msg_v01,
-				  mask_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_req_msg_v01,
-				  mask),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  prev_mask_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  prev_mask),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  curr_mask_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  curr_mask),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_m3_info_req_msg_v01,
-					   addr),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_m3_info_req_msg_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_m3_info_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_xo_cal_ind_msg_v01,
-					   xo_cal_data),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_done_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_req_mem_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_req_mem_ind_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_req_mem_ind_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_mem_info_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mem_info_req_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_resp_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mem_info_req_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_resp_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_mem_info_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_mem_info_resp_msg_v01,
-				  resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_save_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   source),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   mem_seg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_resp_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_resp_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   file_name_valid),
-	},
-	{
-		.data_type      = QMI_STRING,
-		.elem_len       = QMI_WLFW_MAX_STR_LEN_V01 + 1,
-		.elem_size      = sizeof(char),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_save_ind_msg_v01,
-					   file_name),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_data_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_req_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_data_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_data_resp_msg_v01,
-					   end),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  end),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_config_download_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_resp_msg_v01,
-				  resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_mode_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_qdss_trace_mode_req_msg_v01,
-				  mode_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_qdss_trace_mode_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_req_msg_v01,
-					   mode),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_req_msg_v01,
-					   option_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_req_msg_v01,
-					   option),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_req_msg_v01,
-					   hw_trc_disable_override_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_qmi_param_value_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_req_msg_v01,
-					   hw_trc_disable_override),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_mode_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_mode_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_trace_free_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_free_ind_msg_v01,
-					   mem_seg_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_free_ind_msg_v01,
-					   mem_seg_len),
-	},
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = QMI_WLFW_MAX_NUM_MEM_SEG_V01,
-		.elem_size      = sizeof(struct wlfw_mem_seg_resp_s_v01),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_qdss_trace_free_ind_msg_v01,
-					   mem_seg),
-		.ei_array      = wlfw_mem_seg_resp_s_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_shutdown_req_msg_v01,
-					   shutdown_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_shutdown_req_msg_v01,
-					   shutdown),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_shutdown_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_shutdown_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_antenna_switch_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_antenna_switch_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_antenna_switch_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_antenna_switch_resp_msg_v01,
-					   antenna_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_antenna_switch_resp_msg_v01,
-					   antenna),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_antenna_grant_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_antenna_grant_req_msg_v01,
-					   grant_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_antenna_grant_req_msg_v01,
-					   grant),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_antenna_grant_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_antenna_grant_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wfc_call_status_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   wfc_call_status_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_WFC_CALL_STATUS_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   wfc_call_status),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   wfc_call_active_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   wfc_call_active),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   all_wfc_calls_held_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   all_wfc_calls_held),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   is_wfc_emergency_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   is_wfc_emergency),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   twt_ims_start_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   twt_ims_start),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   twt_ims_int_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   twt_ims_int),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   media_quality_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_wfc_media_quality_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_req_msg_v01,
-					   media_quality),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wfc_call_status_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_wfc_call_status_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
-					   type),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_get_info_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_respond_get_info_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   type_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   type),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   is_last_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   is_last),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   seq_no_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct
-					   wlfw_respond_get_info_ind_msg_v01,
-					   seq_no),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_device_info_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
-					   bar_addr_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
-					   bar_addr),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
-					   bar_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
-					   bar_size),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_m3_dump_upload_req_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_m3_dump_upload_req_ind_msg_v01,
-					   pdev_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_m3_dump_upload_req_ind_msg_v01,
-					   addr),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x03,
-		.offset         = offsetof(struct
-					   wlfw_m3_dump_upload_req_ind_msg_v01,
-					   size),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_m3_dump_upload_done_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_m3_dump_upload_done_req_msg_v01,
-					   pdev_id),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_m3_dump_upload_done_req_msg_v01,
-					   status),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_m3_dump_upload_done_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					wlfw_m3_dump_upload_done_resp_msg_v01,
-					resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_soc_wake_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-					   wlfw_soc_wake_req_msg_v01,
-					   wake_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_soc_wake_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_soc_wake_req_msg_v01,
-					   wake),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_soc_wake_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_soc_wake_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_exit_power_save_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_exit_power_save_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_exit_power_save_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type      = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_start_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_8_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u64),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_start),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_int_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_int),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_upo_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_upo),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_sp_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_sp),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_dl_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_2_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_dl),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_config_changed_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_config_changed),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_pcie_gen_speed_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct
-					   wlfw_pcie_gen_switch_req_msg_v01,
-					   pcie_speed),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_STRUCT,
-		.elem_len       = 1,
-		.elem_size      = sizeof(struct qmi_response_type_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x02,
-		.offset         = offsetof(struct
-					   wlfw_pcie_gen_switch_resp_msg_v01,
-					   resp),
-		.ei_array      = qmi_response_type_v01_ei,
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
diff --git a/drivers/net/wireless/cnss2/wlan_firmware_service_v01.h b/drivers/net/wireless/cnss2/wlan_firmware_service_v01.h
deleted file mode 100644
index 76cf12933cfc..000000000000
--- a/drivers/net/wireless/cnss2/wlan_firmware_service_v01.h
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. */
-
-#ifndef WLAN_FIRMWARE_SERVICE_V01_H
-#define WLAN_FIRMWARE_SERVICE_V01_H
-
-#include <linux/soc/qcom/qmi.h>
-
-#define WLFW_SERVICE_ID_V01 0x45
-#define WLFW_SERVICE_VERS_V01 0x01
-
-#define QMI_WLFW_WFC_CALL_STATUS_REQ_V01 0x0049
-#define QMI_WLFW_DEVICE_INFO_RESP_V01 0x004C
-#define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025
-#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037
-#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01 0x0044
-#define QMI_WLFW_GET_INFO_REQ_V01 0x004A
-#define QMI_WLFW_INITIATE_CAL_UPDATE_IND_V01 0x002A
-#define QMI_WLFW_CAL_DONE_IND_V01 0x003E
-#define QMI_WLFW_M3_DUMP_UPLOAD_REQ_IND_V01 0x004D
-#define QMI_WLFW_WFC_CALL_STATUS_RESP_V01 0x0049
-#define QMI_WLFW_HOST_CAP_REQ_V01 0x0034
-#define QMI_WLFW_DYNAMIC_FEATURE_MASK_RESP_V01 0x003B
-#define QMI_WLFW_M3_INFO_REQ_V01 0x003C
-#define QMI_WLFW_CAP_REQ_V01 0x0024
-#define QMI_WLFW_FW_INIT_DONE_IND_V01 0x0038
-#define QMI_WLFW_ANTENNA_GRANT_RESP_V01 0x0048
-#define QMI_WLFW_CAL_REPORT_REQ_V01 0x0026
-#define QMI_WLFW_RESPOND_GET_INFO_IND_V01 0x004B
-#define QMI_WLFW_M3_INFO_RESP_V01 0x003C
-#define QMI_WLFW_CAL_UPDATE_RESP_V01 0x0029
-#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_RESP_V01 0x004E
-#define QMI_WLFW_CAL_DOWNLOAD_RESP_V01 0x0027
-#define QMI_WLFW_XO_CAL_IND_V01 0x003D
-#define QMI_WLFW_INI_RESP_V01 0x002F
-#define QMI_WLFW_CAL_REPORT_RESP_V01 0x0026
-#define QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01 0x0040
-#define QMI_WLFW_ANTENNA_SWITCH_REQ_V01 0x0047
-#define QMI_WLFW_QDSS_TRACE_REQ_MEM_IND_V01 0x003F
-#define QMI_WLFW_SHUTDOWN_RESP_V01 0x0043
-#define QMI_WLFW_MAC_ADDR_RESP_V01 0x0033
-#define QMI_WLFW_INITIATE_CAL_DOWNLOAD_IND_V01 0x0028
-#define QMI_WLFW_HOST_CAP_RESP_V01 0x0034
-#define QMI_WLFW_MSA_READY_IND_V01 0x002B
-#define QMI_WLFW_ATHDIAG_WRITE_RESP_V01 0x0031
-#define QMI_WLFW_EXIT_POWER_SAVE_REQ_V01 0x0050
-#define QMI_WLFW_WLAN_MODE_REQ_V01 0x0022
-#define QMI_WLFW_IND_REGISTER_REQ_V01 0x0020
-#define QMI_WLFW_WLAN_CFG_RESP_V01 0x0023
-#define QMI_WLFW_QDSS_TRACE_MODE_REQ_V01 0x0045
-#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035
-#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_V01 0x0044
-#define QMI_WLFW_SOC_WAKE_RESP_V01 0x004F
-#define QMI_WLFW_REJUVENATE_IND_V01 0x0039
-#define QMI_WLFW_DYNAMIC_FEATURE_MASK_REQ_V01 0x003B
-#define QMI_WLFW_ATHDIAG_WRITE_REQ_V01 0x0031
-#define QMI_WLFW_WLAN_MODE_RESP_V01 0x0022
-#define QMI_WLFW_RESPOND_MEM_REQ_V01 0x0036
-#define QMI_WLFW_GET_INFO_RESP_V01 0x004A
-#define QMI_WLFW_QDSS_TRACE_MODE_RESP_V01 0x0045
-#define QMI_WLFW_PIN_CONNECT_RESULT_IND_V01 0x002C
-#define QMI_WLFW_FW_READY_IND_V01 0x0021
-#define QMI_WLFW_QDSS_TRACE_SAVE_IND_V01 0x0041
-#define QMI_WLFW_QDSS_TRACE_MEM_INFO_RESP_V01 0x0040
-#define QMI_WLFW_ANTENNA_GRANT_REQ_V01 0x0048
-#define QMI_WLFW_MSA_READY_RESP_V01 0x002E
-#define QMI_WLFW_QDSS_TRACE_DATA_REQ_V01 0x0042
-#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029
-#define QMI_WLFW_INI_REQ_V01 0x002F
-#define QMI_WLFW_BDF_DOWNLOAD_RESP_V01 0x0025
-#define QMI_WLFW_REJUVENATE_ACK_RESP_V01 0x003A
-#define QMI_WLFW_MSA_INFO_RESP_V01 0x002D
-#define QMI_WLFW_MSA_READY_REQ_V01 0x002E
-#define QMI_WLFW_QDSS_TRACE_DATA_RESP_V01 0x0042
-#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01 0x004E
-#define QMI_WLFW_CAP_RESP_V01 0x0024
-#define QMI_WLFW_SOC_WAKE_REQ_V01 0x004F
-#define QMI_WLFW_REJUVENATE_ACK_REQ_V01 0x003A
-#define QMI_WLFW_ATHDIAG_READ_RESP_V01 0x0030
-#define QMI_WLFW_SHUTDOWN_REQ_V01 0x0043
-#define QMI_WLFW_VBATT_REQ_V01 0x0032
-#define QMI_WLFW_ANTENNA_SWITCH_RESP_V01 0x0047
-#define QMI_WLFW_DEVICE_INFO_REQ_V01 0x004C
-#define QMI_WLFW_MAC_ADDR_REQ_V01 0x0033
-#define QMI_WLFW_EXIT_POWER_SAVE_RESP_V01 0x0050
-#define QMI_WLFW_RESPOND_MEM_RESP_V01 0x0036
-#define QMI_WLFW_WFC_CALL_TWT_CONFIG_IND_V01 0x0051
-#define QMI_WLFW_VBATT_RESP_V01 0x0032
-#define QMI_WLFW_MSA_INFO_REQ_V01 0x002D
-#define QMI_WLFW_QDSS_TRACE_FREE_IND_V01 0x0046
-#define QMI_WLFW_CAL_DOWNLOAD_REQ_V01 0x0027
-#define QMI_WLFW_ATHDIAG_READ_REQ_V01 0x0030
-#define QMI_WLFW_WLAN_CFG_REQ_V01 0x0023
-#define QMI_WLFW_IND_REGISTER_RESP_V01 0x0020
-#define QMI_WLFW_PCIE_GEN_SWITCH_REQ_V01 0x0053
-#define QMI_WLFW_PCIE_GEN_SWITCH_RESP_V01 0x0053
-#define QMI_WLFW_QDSS_MEM_READY_IND_V01 0x0052
-
-#define QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01 2
-#define QMI_WLFW_MAX_NUM_MEM_SEG_V01 32
-#define QMI_WLFW_MAX_NUM_CAL_V01 5
-#define QMI_WLFW_MAX_DATA_SIZE_V01 6144
-#define QMI_WLFW_FUNCTION_NAME_LEN_V01 128
-#define QMI_WLFW_MAX_NUM_CE_V01 12
-#define QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01 3
-#define QMI_WLFW_MAX_TIMESTAMP_LEN_V01 32
-#define QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01 6144
-#define QMI_WLFW_MAX_WFC_CALL_STATUS_DATA_SIZE_V01 256
-#define QMI_WLFW_MAX_NUM_GPIO_V01 32
-#define QMI_WLFW_MAX_BUILD_ID_LEN_V01 128
-#define QMI_WLFW_MAX_NUM_MEM_CFG_V01 2
-#define QMI_WLFW_MAX_STR_LEN_V01 16
-#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24
-#define QMI_WLFW_MAC_ADDR_SIZE_V01 6
-#define QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01 36
-#define QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 64
-#define QMI_WLFW_MAX_NUM_SVC_V01 24
-
-enum wlfw_driver_mode_enum_v01 {
-	WLFW_DRIVER_MODE_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_MISSION_V01 = 0,
-	QMI_WLFW_FTM_V01 = 1,
-	QMI_WLFW_EPPING_V01 = 2,
-	QMI_WLFW_WALTEST_V01 = 3,
-	QMI_WLFW_OFF_V01 = 4,
-	QMI_WLFW_CCPM_V01 = 5,
-	QMI_WLFW_QVIT_V01 = 6,
-	QMI_WLFW_CALIBRATION_V01 = 7,
-	QMI_WLFW_FTM_CALIBRATION_V01 = 10,
-	WLFW_DRIVER_MODE_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_cal_temp_id_enum_v01 {
-	WLFW_CAL_TEMP_ID_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_CAL_TEMP_IDX_0_V01 = 0,
-	QMI_WLFW_CAL_TEMP_IDX_1_V01 = 1,
-	QMI_WLFW_CAL_TEMP_IDX_2_V01 = 2,
-	QMI_WLFW_CAL_TEMP_IDX_3_V01 = 3,
-	QMI_WLFW_CAL_TEMP_IDX_4_V01 = 4,
-	WLFW_CAL_TEMP_ID_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_pipedir_enum_v01 {
-	WLFW_PIPEDIR_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_PIPEDIR_NONE_V01 = 0,
-	QMI_WLFW_PIPEDIR_IN_V01 = 1,
-	QMI_WLFW_PIPEDIR_OUT_V01 = 2,
-	QMI_WLFW_PIPEDIR_INOUT_V01 = 3,
-	WLFW_PIPEDIR_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_mem_type_enum_v01 {
-	WLFW_MEM_TYPE_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_MEM_TYPE_MSA_V01 = 0,
-	QMI_WLFW_MEM_TYPE_DDR_V01 = 1,
-	QMI_WLFW_MEM_BDF_V01 = 2,
-	QMI_WLFW_MEM_M3_V01 = 3,
-	QMI_WLFW_MEM_CAL_V01 = 4,
-	QMI_WLFW_MEM_DPD_V01 = 5,
-	QMI_WLFW_MEM_QDSS_V01 = 6,
-	QMI_WLFW_MEM_HANG_DATA_V01 = 7,
-	WLFW_MEM_TYPE_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_qdss_trace_mode_enum_v01 {
-	WLFW_QDSS_TRACE_MODE_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_QDSS_TRACE_OFF_V01 = 0,
-	QMI_WLFW_QDSS_TRACE_ON_V01 = 1,
-	WLFW_QDSS_TRACE_MODE_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_wfc_media_quality_v01 {
-	WLFW_WFC_MEDIA_QUALITY_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_WFC_MEDIA_QUAL_NOT_AVAILABLE_V01 = 0,
-	QMI_WLFW_WFC_MEDIA_QUAL_BAD_V01 = 1,
-	QMI_WLFW_WFC_MEDIA_QUAL_GOOD_V01 = 2,
-	QMI_WLFW_WFC_MEDIA_QUAL_EXCELLENT_V01 = 3,
-	WLFW_WFC_MEDIA_QUALITY_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_soc_wake_enum_v01 {
-	WLFW_SOC_WAKE_ENUM_MIN_VAL_V01 = INT_MIN,
-	QMI_WLFW_WAKE_REQUEST_V01 = 0,
-	QMI_WLFW_WAKE_RELEASE_V01 = 1,
-	WLFW_SOC_WAKE_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_host_build_type_v01 {
-	WLFW_HOST_BUILD_TYPE_MIN_VAL_V01 = INT_MIN,
-	QMI_HOST_BUILD_TYPE_UNSPECIFIED_V01 = 0,
-	QMI_HOST_BUILD_TYPE_PRIMARY_V01 = 1,
-	QMI_HOST_BUILD_TYPE_SECONDARY_V01 = 2,
-	WLFW_HOST_BUILD_TYPE_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_qmi_param_value_v01 {
-	WLFW_QMI_PARAM_VALUE_MIN_VAL_V01 = INT_MIN,
-	QMI_PARAM_INVALID_V01 = 0,
-	QMI_PARAM_ENABLE_V01 = 1,
-	QMI_PARAM_DISABLE_V01 = 2,
-	WLFW_QMI_PARAM_VALUE_MAX_VAL_V01 = INT_MAX,
-};
-
-enum wlfw_pcie_gen_speed_v01 {
-	WLFW_PCIE_GEN_SPEED_MIN_VAL_V01 = INT_MIN,
-	QMI_PCIE_GEN_SPEED_INVALID_V01 = 0,
-	QMI_PCIE_GEN_SPEED_1_V01 = 1,
-	QMI_PCIE_GEN_SPEED_2_V01 = 2,
-	QMI_PCIE_GEN_SPEED_3_V01 = 3,
-	WLFW_PCIE_GEN_SPEED_MAX_VAL_V01 = INT_MAX,
-};
-
-#define QMI_WLFW_CE_ATTR_FLAGS_V01 ((u32)0x00)
-#define QMI_WLFW_CE_ATTR_NO_SNOOP_V01 ((u32)0x01)
-#define QMI_WLFW_CE_ATTR_BYTE_SWAP_DATA_V01 ((u32)0x02)
-#define QMI_WLFW_CE_ATTR_SWIZZLE_DESCRIPTORS_V01 ((u32)0x04)
-#define QMI_WLFW_CE_ATTR_DISABLE_INTR_V01 ((u32)0x08)
-#define QMI_WLFW_CE_ATTR_ENABLE_POLL_V01 ((u32)0x10)
-
-#define QMI_WLFW_ALREADY_REGISTERED_V01 ((u64)0x01ULL)
-#define QMI_WLFW_FW_READY_V01 ((u64)0x02ULL)
-#define QMI_WLFW_MSA_READY_V01 ((u64)0x04ULL)
-#define QMI_WLFW_FW_MEM_READY_V01 ((u64)0x08ULL)
-#define QMI_WLFW_FW_INIT_DONE_V01 ((u64)0x10ULL)
-
-#define QMI_WLFW_FW_REJUVENATE_V01 ((u64)0x01ULL)
-
-#define QMI_WLFW_HW_XPA_V01 ((u64)0x01ULL)
-#define QMI_WLFW_CBC_FILE_DOWNLOAD_V01 ((u64)0x02ULL)
-
-#define QMI_WLFW_HOST_PCIE_GEN_SWITCH_V01 ((u64)0x01ULL)
-
-struct wlfw_ce_tgt_pipe_cfg_s_v01 {
-	u32 pipe_num;
-	enum wlfw_pipedir_enum_v01 pipe_dir;
-	u32 nentries;
-	u32 nbytes_max;
-	u32 flags;
-};
-
-struct wlfw_ce_svc_pipe_cfg_s_v01 {
-	u32 service_id;
-	enum wlfw_pipedir_enum_v01 pipe_dir;
-	u32 pipe_num;
-};
-
-struct wlfw_shadow_reg_cfg_s_v01 {
-	u16 id;
-	u16 offset;
-};
-
-struct wlfw_shadow_reg_v2_cfg_s_v01 {
-	u32 addr;
-};
-
-struct wlfw_rri_over_ddr_cfg_s_v01 {
-	u32 base_addr_low;
-	u32 base_addr_high;
-};
-
-struct wlfw_msi_cfg_s_v01 {
-	u16 ce_id;
-	u16 msi_vector;
-};
-
-struct wlfw_memory_region_info_s_v01 {
-	u64 region_addr;
-	u32 size;
-	u8 secure_flag;
-};
-
-struct wlfw_mem_cfg_s_v01 {
-	u64 offset;
-	u32 size;
-	u8 secure_flag;
-};
-
-struct wlfw_mem_seg_s_v01 {
-	u32 size;
-	enum wlfw_mem_type_enum_v01 type;
-	u32 mem_cfg_len;
-	struct wlfw_mem_cfg_s_v01 mem_cfg[QMI_WLFW_MAX_NUM_MEM_CFG_V01];
-};
-
-struct wlfw_mem_seg_resp_s_v01 {
-	u64 addr;
-	u32 size;
-	enum wlfw_mem_type_enum_v01 type;
-	u8 restore;
-};
-
-struct wlfw_rf_chip_info_s_v01 {
-	u32 chip_id;
-	u32 chip_family;
-};
-
-struct wlfw_rf_board_info_s_v01 {
-	u32 board_id;
-};
-
-struct wlfw_soc_info_s_v01 {
-	u32 soc_id;
-};
-
-struct wlfw_fw_version_info_s_v01 {
-	u32 fw_version;
-	char fw_build_timestamp[QMI_WLFW_MAX_TIMESTAMP_LEN_V01 + 1];
-};
-
-struct wlfw_host_ddr_range_s_v01 {
-	u64 start;
-	u64 size;
-};
-
-struct wlfw_ind_register_req_msg_v01 {
-	u8 fw_ready_enable_valid;
-	u8 fw_ready_enable;
-	u8 initiate_cal_download_enable_valid;
-	u8 initiate_cal_download_enable;
-	u8 initiate_cal_update_enable_valid;
-	u8 initiate_cal_update_enable;
-	u8 msa_ready_enable_valid;
-	u8 msa_ready_enable;
-	u8 pin_connect_result_enable_valid;
-	u8 pin_connect_result_enable;
-	u8 client_id_valid;
-	u32 client_id;
-	u8 request_mem_enable_valid;
-	u8 request_mem_enable;
-	u8 fw_mem_ready_enable_valid;
-	u8 fw_mem_ready_enable;
-	u8 fw_init_done_enable_valid;
-	u8 fw_init_done_enable;
-	u8 rejuvenate_enable_valid;
-	u32 rejuvenate_enable;
-	u8 xo_cal_enable_valid;
-	u8 xo_cal_enable;
-	u8 cal_done_enable_valid;
-	u8 cal_done_enable;
-	u8 qdss_trace_req_mem_enable_valid;
-	u8 qdss_trace_req_mem_enable;
-	u8 qdss_trace_save_enable_valid;
-	u8 qdss_trace_save_enable;
-	u8 qdss_trace_free_enable_valid;
-	u8 qdss_trace_free_enable;
-	u8 respond_get_info_enable_valid;
-	u8 respond_get_info_enable;
-	u8 m3_dump_upload_req_enable_valid;
-	u8 m3_dump_upload_req_enable;
-	u8 wfc_call_twt_config_enable_valid;
-	u8 wfc_call_twt_config_enable;
-	u8 qdss_mem_ready_enable_valid;
-	u8 qdss_mem_ready_enable;
-};
-
-#define WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN 82
-extern struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[];
-
-struct wlfw_ind_register_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 fw_status_valid;
-	u64 fw_status;
-};
-
-#define WLFW_IND_REGISTER_RESP_MSG_V01_MAX_MSG_LEN 18
-extern struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[];
-
-struct wlfw_fw_ready_ind_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_FW_READY_IND_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[];
-
-struct wlfw_msa_ready_ind_msg_v01 {
-	u8 hang_data_addr_offset_valid;
-	u32 hang_data_addr_offset;
-	u8 hang_data_length_valid;
-	u16 hang_data_length;
-};
-
-#define WLFW_MSA_READY_IND_MSG_V01_MAX_MSG_LEN 12
-extern struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[];
-
-struct wlfw_pin_connect_result_ind_msg_v01 {
-	u8 pwr_pin_result_valid;
-	u32 pwr_pin_result;
-	u8 phy_io_pin_result_valid;
-	u32 phy_io_pin_result;
-	u8 rf_pin_result_valid;
-	u32 rf_pin_result;
-};
-
-#define WLFW_PIN_CONNECT_RESULT_IND_MSG_V01_MAX_MSG_LEN 21
-extern struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[];
-
-struct wlfw_wlan_mode_req_msg_v01 {
-	enum wlfw_driver_mode_enum_v01 mode;
-	u8 hw_debug_valid;
-	u8 hw_debug;
-};
-
-#define WLFW_WLAN_MODE_REQ_MSG_V01_MAX_MSG_LEN 11
-extern struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[];
-
-struct wlfw_wlan_mode_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_WLAN_MODE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[];
-
-struct wlfw_wlan_cfg_req_msg_v01 {
-	u8 host_version_valid;
-	char host_version[QMI_WLFW_MAX_STR_LEN_V01 + 1];
-	u8 tgt_cfg_valid;
-	u32 tgt_cfg_len;
-	struct wlfw_ce_tgt_pipe_cfg_s_v01 tgt_cfg[QMI_WLFW_MAX_NUM_CE_V01];
-	u8 svc_cfg_valid;
-	u32 svc_cfg_len;
-	struct wlfw_ce_svc_pipe_cfg_s_v01 svc_cfg[QMI_WLFW_MAX_NUM_SVC_V01];
-	u8 shadow_reg_valid;
-	u32 shadow_reg_len;
-	struct wlfw_shadow_reg_cfg_s_v01
-		shadow_reg[QMI_WLFW_MAX_NUM_SHADOW_REG_V01];
-	u8 shadow_reg_v2_valid;
-	u32 shadow_reg_v2_len;
-	struct wlfw_shadow_reg_v2_cfg_s_v01
-		shadow_reg_v2[QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01];
-	u8 rri_over_ddr_cfg_valid;
-	struct wlfw_rri_over_ddr_cfg_s_v01 rri_over_ddr_cfg;
-	u8 msi_cfg_valid;
-	u32 msi_cfg_len;
-	struct wlfw_msi_cfg_s_v01 msi_cfg[QMI_WLFW_MAX_NUM_CE_V01];
-};
-
-#define WLFW_WLAN_CFG_REQ_MSG_V01_MAX_MSG_LEN 866
-extern struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[];
-
-struct wlfw_wlan_cfg_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_WLAN_CFG_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[];
-
-struct wlfw_cap_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_CAP_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_cap_req_msg_v01_ei[];
-
-struct wlfw_cap_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 chip_info_valid;
-	struct wlfw_rf_chip_info_s_v01 chip_info;
-	u8 board_info_valid;
-	struct wlfw_rf_board_info_s_v01 board_info;
-	u8 soc_info_valid;
-	struct wlfw_soc_info_s_v01 soc_info;
-	u8 fw_version_info_valid;
-	struct wlfw_fw_version_info_s_v01 fw_version_info;
-	u8 fw_build_id_valid;
-	char fw_build_id[QMI_WLFW_MAX_BUILD_ID_LEN_V01 + 1];
-	u8 num_macs_valid;
-	u8 num_macs;
-	u8 voltage_mv_valid;
-	u32 voltage_mv;
-	u8 time_freq_hz_valid;
-	u32 time_freq_hz;
-	u8 otp_version_valid;
-	u32 otp_version;
-	u8 eeprom_caldata_read_timeout_valid;
-	u32 eeprom_caldata_read_timeout;
-	u8 fw_caps_valid;
-	u64 fw_caps;
-};
-
-#define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 246
-extern struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[];
-
-struct wlfw_bdf_download_req_msg_v01 {
-	u8 valid;
-	u8 file_id_valid;
-	enum wlfw_cal_temp_id_enum_v01 file_id;
-	u8 total_size_valid;
-	u32 total_size;
-	u8 seg_id_valid;
-	u32 seg_id;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 end_valid;
-	u8 end;
-	u8 bdf_type_valid;
-	u8 bdf_type;
-};
-
-#define WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6182
-extern struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[];
-
-struct wlfw_bdf_download_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 host_bdf_data_valid;
-	u64 host_bdf_data;
-};
-
-#define WLFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 18
-extern struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[];
-
-struct wlfw_cal_report_req_msg_v01 {
-	u32 meta_data_len;
-	enum wlfw_cal_temp_id_enum_v01 meta_data[QMI_WLFW_MAX_NUM_CAL_V01];
-	u8 xo_cal_data_valid;
-	u8 xo_cal_data;
-	u8 cal_remove_supported_valid;
-	u8 cal_remove_supported;
-};
-
-#define WLFW_CAL_REPORT_REQ_MSG_V01_MAX_MSG_LEN 32
-extern struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[];
-
-struct wlfw_cal_report_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_CAL_REPORT_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[];
-
-struct wlfw_initiate_cal_download_ind_msg_v01 {
-	enum wlfw_cal_temp_id_enum_v01 cal_id;
-	u8 total_size_valid;
-	u32 total_size;
-	u8 cal_data_location_valid;
-	u32 cal_data_location;
-};
-
-#define WLFW_INITIATE_CAL_DOWNLOAD_IND_MSG_V01_MAX_MSG_LEN 21
-extern struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[];
-
-struct wlfw_cal_download_req_msg_v01 {
-	u8 valid;
-	u8 file_id_valid;
-	enum wlfw_cal_temp_id_enum_v01 file_id;
-	u8 total_size_valid;
-	u32 total_size;
-	u8 seg_id_valid;
-	u32 seg_id;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 end_valid;
-	u8 end;
-	u8 cal_data_location_valid;
-	u32 cal_data_location;
-};
-
-#define WLFW_CAL_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6185
-extern struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[];
-
-struct wlfw_cal_download_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_CAL_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[];
-
-struct wlfw_initiate_cal_update_ind_msg_v01 {
-	enum wlfw_cal_temp_id_enum_v01 cal_id;
-	u32 total_size;
-	u8 cal_data_location_valid;
-	u32 cal_data_location;
-};
-
-#define WLFW_INITIATE_CAL_UPDATE_IND_MSG_V01_MAX_MSG_LEN 21
-extern struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[];
-
-struct wlfw_cal_update_req_msg_v01 {
-	enum wlfw_cal_temp_id_enum_v01 cal_id;
-	u32 seg_id;
-};
-
-#define WLFW_CAL_UPDATE_REQ_MSG_V01_MAX_MSG_LEN 14
-extern struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[];
-
-struct wlfw_cal_update_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 file_id_valid;
-	enum wlfw_cal_temp_id_enum_v01 file_id;
-	u8 total_size_valid;
-	u32 total_size;
-	u8 seg_id_valid;
-	u32 seg_id;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 end_valid;
-	u8 end;
-	u8 cal_data_location_valid;
-	u32 cal_data_location;
-};
-
-#define WLFW_CAL_UPDATE_RESP_MSG_V01_MAX_MSG_LEN 6188
-extern struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[];
-
-struct wlfw_msa_info_req_msg_v01 {
-	u64 msa_addr;
-	u32 size;
-};
-
-#define WLFW_MSA_INFO_REQ_MSG_V01_MAX_MSG_LEN 18
-extern struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[];
-
-struct wlfw_msa_info_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u32 mem_region_info_len;
-	struct wlfw_memory_region_info_s_v01
-		mem_region_info[QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01];
-};
-
-#define WLFW_MSA_INFO_RESP_MSG_V01_MAX_MSG_LEN 37
-extern struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[];
-
-struct wlfw_msa_ready_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_MSA_READY_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[];
-
-struct wlfw_msa_ready_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_MSA_READY_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[];
-
-struct wlfw_ini_req_msg_v01 {
-	u8 enablefwlog_valid;
-	u8 enablefwlog;
-};
-
-#define WLFW_INI_REQ_MSG_V01_MAX_MSG_LEN 4
-extern struct qmi_elem_info wlfw_ini_req_msg_v01_ei[];
-
-struct wlfw_ini_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_INI_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[];
-
-struct wlfw_athdiag_read_req_msg_v01 {
-	u32 offset;
-	u32 mem_type;
-	u32 data_len;
-};
-
-#define WLFW_ATHDIAG_READ_REQ_MSG_V01_MAX_MSG_LEN 21
-extern struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[];
-
-struct wlfw_athdiag_read_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01];
-};
-
-#define WLFW_ATHDIAG_READ_RESP_MSG_V01_MAX_MSG_LEN 6156
-extern struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[];
-
-struct wlfw_athdiag_write_req_msg_v01 {
-	u32 offset;
-	u32 mem_type;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01];
-};
-
-#define WLFW_ATHDIAG_WRITE_REQ_MSG_V01_MAX_MSG_LEN 6163
-extern struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[];
-
-struct wlfw_athdiag_write_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_ATHDIAG_WRITE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[];
-
-struct wlfw_vbatt_req_msg_v01 {
-	u64 voltage_uv;
-};
-
-#define WLFW_VBATT_REQ_MSG_V01_MAX_MSG_LEN 11
-extern struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[];
-
-struct wlfw_vbatt_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_VBATT_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[];
-
-struct wlfw_mac_addr_req_msg_v01 {
-	u8 mac_addr_valid;
-	u8 mac_addr[QMI_WLFW_MAC_ADDR_SIZE_V01];
-};
-
-#define WLFW_MAC_ADDR_REQ_MSG_V01_MAX_MSG_LEN 9
-extern struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[];
-
-struct wlfw_mac_addr_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_MAC_ADDR_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[];
-
-struct wlfw_host_cap_req_msg_v01 {
-	u8 num_clients_valid;
-	u32 num_clients;
-	u8 wake_msi_valid;
-	u32 wake_msi;
-	u8 gpios_valid;
-	u32 gpios_len;
-	u32 gpios[QMI_WLFW_MAX_NUM_GPIO_V01];
-	u8 nm_modem_valid;
-	u8 nm_modem;
-	u8 bdf_support_valid;
-	u8 bdf_support;
-	u8 bdf_cache_support_valid;
-	u8 bdf_cache_support;
-	u8 m3_support_valid;
-	u8 m3_support;
-	u8 m3_cache_support_valid;
-	u8 m3_cache_support;
-	u8 cal_filesys_support_valid;
-	u8 cal_filesys_support;
-	u8 cal_cache_support_valid;
-	u8 cal_cache_support;
-	u8 cal_done_valid;
-	u8 cal_done;
-	u8 mem_bucket_valid;
-	u32 mem_bucket;
-	u8 mem_cfg_mode_valid;
-	u8 mem_cfg_mode;
-	u8 cal_duration_valid;
-	u16 cal_duration;
-	u8 platform_name_valid;
-	char platform_name[QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 + 1];
-	u8 ddr_range_valid;
-	struct wlfw_host_ddr_range_s_v01
-		ddr_range[QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01];
-	u8 host_build_type_valid;
-	enum wlfw_host_build_type_v01 host_build_type;
-};
-
-#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 319
-extern struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[];
-
-struct wlfw_host_cap_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_HOST_CAP_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[];
-
-struct wlfw_request_mem_ind_msg_v01 {
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-};
-
-#define WLFW_REQUEST_MEM_IND_MSG_V01_MAX_MSG_LEN 1124
-extern struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[];
-
-struct wlfw_respond_mem_req_msg_v01 {
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_resp_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-};
-
-#define WLFW_RESPOND_MEM_REQ_MSG_V01_MAX_MSG_LEN 548
-extern struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[];
-
-struct wlfw_respond_mem_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_RESPOND_MEM_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[];
-
-struct wlfw_fw_mem_ready_ind_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_FW_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[];
-
-struct wlfw_fw_init_done_ind_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_FW_INIT_DONE_IND_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[];
-
-struct wlfw_rejuvenate_ind_msg_v01 {
-	u8 cause_for_rejuvenation_valid;
-	u8 cause_for_rejuvenation;
-	u8 requesting_sub_system_valid;
-	u8 requesting_sub_system;
-	u8 line_number_valid;
-	u16 line_number;
-	u8 function_name_valid;
-	char function_name[QMI_WLFW_FUNCTION_NAME_LEN_V01 + 1];
-};
-
-#define WLFW_REJUVENATE_IND_MSG_V01_MAX_MSG_LEN 144
-extern struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[];
-
-struct wlfw_rejuvenate_ack_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_REJUVENATE_ACK_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[];
-
-struct wlfw_rejuvenate_ack_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_REJUVENATE_ACK_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[];
-
-struct wlfw_dynamic_feature_mask_req_msg_v01 {
-	u8 mask_valid;
-	u64 mask;
-};
-
-#define WLFW_DYNAMIC_FEATURE_MASK_REQ_MSG_V01_MAX_MSG_LEN 11
-extern struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[];
-
-struct wlfw_dynamic_feature_mask_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 prev_mask_valid;
-	u64 prev_mask;
-	u8 curr_mask_valid;
-	u64 curr_mask;
-};
-
-#define WLFW_DYNAMIC_FEATURE_MASK_RESP_MSG_V01_MAX_MSG_LEN 29
-extern struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[];
-
-struct wlfw_m3_info_req_msg_v01 {
-	u64 addr;
-	u32 size;
-};
-
-#define WLFW_M3_INFO_REQ_MSG_V01_MAX_MSG_LEN 18
-extern struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[];
-
-struct wlfw_m3_info_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_M3_INFO_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[];
-
-struct wlfw_xo_cal_ind_msg_v01 {
-	u8 xo_cal_data;
-};
-
-#define WLFW_XO_CAL_IND_MSG_V01_MAX_MSG_LEN 4
-extern struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[];
-
-struct wlfw_cal_done_ind_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_CAL_DONE_IND_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_cal_done_ind_msg_v01_ei[];
-
-struct wlfw_qdss_trace_req_mem_ind_msg_v01 {
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-};
-
-#define WLFW_QDSS_TRACE_REQ_MEM_IND_MSG_V01_MAX_MSG_LEN 1124
-extern struct qmi_elem_info wlfw_qdss_trace_req_mem_ind_msg_v01_ei[];
-
-struct wlfw_qdss_trace_mem_info_req_msg_v01 {
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_resp_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-};
-
-#define WLFW_QDSS_TRACE_MEM_INFO_REQ_MSG_V01_MAX_MSG_LEN 548
-extern struct qmi_elem_info wlfw_qdss_trace_mem_info_req_msg_v01_ei[];
-
-struct wlfw_qdss_trace_mem_info_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_QDSS_TRACE_MEM_INFO_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_qdss_trace_mem_info_resp_msg_v01_ei[];
-
-struct wlfw_qdss_trace_save_ind_msg_v01 {
-	u32 source;
-	u32 total_size;
-	u8 mem_seg_valid;
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_resp_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-	u8 file_name_valid;
-	char file_name[QMI_WLFW_MAX_STR_LEN_V01 + 1];
-};
-
-#define WLFW_QDSS_TRACE_SAVE_IND_MSG_V01_MAX_MSG_LEN 581
-extern struct qmi_elem_info wlfw_qdss_trace_save_ind_msg_v01_ei[];
-
-struct wlfw_qdss_trace_data_req_msg_v01 {
-	u32 seg_id;
-};
-
-#define WLFW_QDSS_TRACE_DATA_REQ_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_qdss_trace_data_req_msg_v01_ei[];
-
-struct wlfw_qdss_trace_data_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 total_size_valid;
-	u32 total_size;
-	u8 seg_id_valid;
-	u32 seg_id;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 end_valid;
-	u8 end;
-};
-
-#define WLFW_QDSS_TRACE_DATA_RESP_MSG_V01_MAX_MSG_LEN 6174
-extern struct qmi_elem_info wlfw_qdss_trace_data_resp_msg_v01_ei[];
-
-struct wlfw_qdss_trace_config_download_req_msg_v01 {
-	u8 total_size_valid;
-	u32 total_size;
-	u8 seg_id_valid;
-	u32 seg_id;
-	u8 data_valid;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 end_valid;
-	u8 end;
-};
-
-#define WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6167
-extern struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[];
-
-struct wlfw_qdss_trace_config_download_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_qdss_trace_config_download_resp_msg_v01_ei[];
-
-struct wlfw_qdss_trace_mode_req_msg_v01 {
-	u8 mode_valid;
-	enum wlfw_qdss_trace_mode_enum_v01 mode;
-	u8 option_valid;
-	u64 option;
-	u8 hw_trc_disable_override_valid;
-	enum wlfw_qmi_param_value_v01 hw_trc_disable_override;
-};
-
-#define WLFW_QDSS_TRACE_MODE_REQ_MSG_V01_MAX_MSG_LEN 25
-extern struct qmi_elem_info wlfw_qdss_trace_mode_req_msg_v01_ei[];
-
-struct wlfw_qdss_trace_mode_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_QDSS_TRACE_MODE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_qdss_trace_mode_resp_msg_v01_ei[];
-
-struct wlfw_qdss_trace_free_ind_msg_v01 {
-	u8 mem_seg_valid;
-	u32 mem_seg_len;
-	struct wlfw_mem_seg_resp_s_v01 mem_seg[QMI_WLFW_MAX_NUM_MEM_SEG_V01];
-};
-
-#define WLFW_QDSS_TRACE_FREE_IND_MSG_V01_MAX_MSG_LEN 548
-extern struct qmi_elem_info wlfw_qdss_trace_free_ind_msg_v01_ei[];
-
-struct wlfw_shutdown_req_msg_v01 {
-	u8 shutdown_valid;
-	u8 shutdown;
-};
-
-#define WLFW_SHUTDOWN_REQ_MSG_V01_MAX_MSG_LEN 4
-extern struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[];
-
-struct wlfw_shutdown_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_SHUTDOWN_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_shutdown_resp_msg_v01_ei[];
-
-struct wlfw_antenna_switch_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_ANTENNA_SWITCH_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_antenna_switch_req_msg_v01_ei[];
-
-struct wlfw_antenna_switch_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 antenna_valid;
-	u64 antenna;
-};
-
-#define WLFW_ANTENNA_SWITCH_RESP_MSG_V01_MAX_MSG_LEN 18
-extern struct qmi_elem_info wlfw_antenna_switch_resp_msg_v01_ei[];
-
-struct wlfw_antenna_grant_req_msg_v01 {
-	u8 grant_valid;
-	u64 grant;
-};
-
-#define WLFW_ANTENNA_GRANT_REQ_MSG_V01_MAX_MSG_LEN 11
-extern struct qmi_elem_info wlfw_antenna_grant_req_msg_v01_ei[];
-
-struct wlfw_antenna_grant_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_ANTENNA_GRANT_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_antenna_grant_resp_msg_v01_ei[];
-
-struct wlfw_wfc_call_status_req_msg_v01 {
-	u32 wfc_call_status_len;
-	u8 wfc_call_status[QMI_WLFW_MAX_WFC_CALL_STATUS_DATA_SIZE_V01];
-	u8 wfc_call_active_valid;
-	u8 wfc_call_active;
-	u8 all_wfc_calls_held_valid;
-	u8 all_wfc_calls_held;
-	u8 is_wfc_emergency_valid;
-	u8 is_wfc_emergency;
-	u8 twt_ims_start_valid;
-	u64 twt_ims_start;
-	u8 twt_ims_int_valid;
-	u16 twt_ims_int;
-	u8 media_quality_valid;
-	enum wlfw_wfc_media_quality_v01 media_quality;
-};
-
-#define WLFW_WFC_CALL_STATUS_REQ_MSG_V01_MAX_MSG_LEN 296
-extern struct qmi_elem_info wlfw_wfc_call_status_req_msg_v01_ei[];
-
-struct wlfw_wfc_call_status_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_WFC_CALL_STATUS_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_wfc_call_status_resp_msg_v01_ei[];
-
-struct wlfw_get_info_req_msg_v01 {
-	u8 type;
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-};
-
-#define WLFW_GET_INFO_REQ_MSG_V01_MAX_MSG_LEN 6153
-extern struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[];
-
-struct wlfw_get_info_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_GET_INFO_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_get_info_resp_msg_v01_ei[];
-
-struct wlfw_respond_get_info_ind_msg_v01 {
-	u32 data_len;
-	u8 data[QMI_WLFW_MAX_DATA_SIZE_V01];
-	u8 type_valid;
-	u8 type;
-	u8 is_last_valid;
-	u8 is_last;
-	u8 seq_no_valid;
-	u32 seq_no;
-};
-
-#define WLFW_RESPOND_GET_INFO_IND_MSG_V01_MAX_MSG_LEN 6164
-extern struct qmi_elem_info wlfw_respond_get_info_ind_msg_v01_ei[];
-
-struct wlfw_device_info_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_DEVICE_INFO_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_device_info_req_msg_v01_ei[];
-
-struct wlfw_device_info_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-	u8 bar_addr_valid;
-	u64 bar_addr;
-	u8 bar_size_valid;
-	u32 bar_size;
-};
-
-#define WLFW_DEVICE_INFO_RESP_MSG_V01_MAX_MSG_LEN 25
-extern struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[];
-
-struct wlfw_m3_dump_upload_req_ind_msg_v01 {
-	u32 pdev_id;
-	u64 addr;
-	u64 size;
-};
-
-#define WLFW_M3_DUMP_UPLOAD_REQ_IND_MSG_V01_MAX_MSG_LEN 29
-extern struct qmi_elem_info wlfw_m3_dump_upload_req_ind_msg_v01_ei[];
-
-struct wlfw_m3_dump_upload_done_req_msg_v01 {
-	u32 pdev_id;
-	u32 status;
-};
-
-#define WLFW_M3_DUMP_UPLOAD_DONE_REQ_MSG_V01_MAX_MSG_LEN 14
-extern struct qmi_elem_info wlfw_m3_dump_upload_done_req_msg_v01_ei[];
-
-struct wlfw_m3_dump_upload_done_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_M3_DUMP_UPLOAD_DONE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_m3_dump_upload_done_resp_msg_v01_ei[];
-
-struct wlfw_soc_wake_req_msg_v01 {
-	u8 wake_valid;
-	enum wlfw_soc_wake_enum_v01 wake;
-};
-
-#define WLFW_SOC_WAKE_REQ_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_soc_wake_req_msg_v01_ei[];
-
-struct wlfw_soc_wake_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_SOC_WAKE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_soc_wake_resp_msg_v01_ei[];
-
-struct wlfw_exit_power_save_req_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_EXIT_POWER_SAVE_REQ_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_exit_power_save_req_msg_v01_ei[];
-
-struct wlfw_exit_power_save_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_EXIT_POWER_SAVE_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_exit_power_save_resp_msg_v01_ei[];
-
-struct wlfw_wfc_call_twt_config_ind_msg_v01 {
-	u8 twt_sta_start_valid;
-	u64 twt_sta_start;
-	u8 twt_sta_int_valid;
-	u16 twt_sta_int;
-	u8 twt_sta_upo_valid;
-	u16 twt_sta_upo;
-	u8 twt_sta_sp_valid;
-	u16 twt_sta_sp;
-	u8 twt_sta_dl_valid;
-	u16 twt_sta_dl;
-	u8 twt_sta_config_changed_valid;
-	u8 twt_sta_config_changed;
-};
-
-#define WLFW_WFC_CALL_TWT_CONFIG_IND_MSG_V01_MAX_MSG_LEN 35
-extern struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[];
-
-struct wlfw_qdss_mem_ready_ind_msg_v01 {
-	char placeholder;
-};
-
-#define WLFW_QDSS_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0
-extern struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[];
-
-struct wlfw_pcie_gen_switch_req_msg_v01 {
-	enum wlfw_pcie_gen_speed_v01 pcie_speed;
-};
-
-#define WLFW_PCIE_GEN_SWITCH_REQ_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[];
-
-struct wlfw_pcie_gen_switch_resp_msg_v01 {
-	struct qmi_response_type_v01 resp;
-};
-
-#define WLFW_PCIE_GEN_SWITCH_RESP_MSG_V01_MAX_MSG_LEN 7
-extern struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[];
-
-#endif
diff --git a/drivers/net/wireless/cnss_utils/Kconfig b/drivers/net/wireless/cnss_utils/Kconfig
index ed1662cd4896..62b7129bbe17 100644
--- a/drivers/net/wireless/cnss_utils/Kconfig
+++ b/drivers/net/wireless/cnss_utils/Kconfig
@@ -5,4 +5,12 @@ config CNSS_UTILS
 	help
 	  Add CNSS utilities support for the WLAN driver module.
 	  This feature enables wlan driver to use CNSS utilities APIs to set
-	  and get wlan related information.
\ No newline at end of file
+	  and get wlan related information.
+
+config CNSS_QMI_SVC
+	tristate "CNSS QMI SVC support"
+	help
+	  Add CNSS QMI SVC support for the WLAN driver module.
+	  This feature enable wlan driver to use CNSS QMI service APIs to set
+	  and get wlan related information.
+
diff --git a/drivers/net/wireless/cnss_utils/Makefile b/drivers/net/wireless/cnss_utils/Makefile
index aa007fd50508..1b7088904d2e 100644
--- a/drivers/net/wireless/cnss_utils/Makefile
+++ b/drivers/net/wireless/cnss_utils/Makefile
@@ -1,3 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 obj-$(CONFIG_CNSS_UTILS) += cnss_utils.o
+obj-$(CONFIG_CNSS_QMI_SVC) += wlan_firmware_service_v01.o
diff --git a/drivers/soc/qcom/icnss2/wlan_firmware_service_v01.c b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c
similarity index 79%
rename from drivers/soc/qcom/icnss2/wlan_firmware_service_v01.c
rename to drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c
index bda8d11c05c6..b5d348cad289 100644
--- a/drivers/soc/qcom/icnss2/wlan_firmware_service_v01.c
+++ b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. */
+/* Copyright (c) 2020, The Linux Foundation. All rights reserved. */
 
 #include "wlan_firmware_service_v01.h"
 
@@ -10,7 +10,8 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_tgt_pipe_cfg_s_v01,
 					   pipe_num),
 	},
 	{
@@ -19,7 +20,8 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_pipedir_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_tgt_pipe_cfg_s_v01,
 					   pipe_dir),
 	},
 	{
@@ -28,7 +30,8 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_tgt_pipe_cfg_s_v01,
 					   nentries),
 	},
 	{
@@ -37,7 +40,8 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_tgt_pipe_cfg_s_v01,
 					   nbytes_max),
 	},
 	{
@@ -46,7 +50,8 @@ static struct qmi_elem_info wlfw_ce_tgt_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_tgt_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_tgt_pipe_cfg_s_v01,
 					   flags),
 	},
 	{
@@ -63,7 +68,8 @@ static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_svc_pipe_cfg_s_v01,
 					   service_id),
 	},
 	{
@@ -72,7 +78,8 @@ static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_pipedir_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_svc_pipe_cfg_s_v01,
 					   pipe_dir),
 	},
 	{
@@ -81,7 +88,8 @@ static struct qmi_elem_info wlfw_ce_svc_pipe_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_ce_svc_pipe_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_ce_svc_pipe_cfg_s_v01,
 					   pipe_num),
 	},
 	{
@@ -98,7 +106,8 @@ static struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_shadow_reg_cfg_s_v01,
 					   id),
 	},
 	{
@@ -107,7 +116,8 @@ static struct qmi_elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_shadow_reg_cfg_s_v01,
 					   offset),
 	},
 	{
@@ -124,7 +134,8 @@ static struct qmi_elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_shadow_reg_v2_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_shadow_reg_v2_cfg_s_v01,
 					   addr),
 	},
 	{
@@ -141,7 +152,8 @@ static struct qmi_elem_info wlfw_rri_over_ddr_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rri_over_ddr_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_rri_over_ddr_cfg_s_v01,
 					   base_addr_low),
 	},
 	{
@@ -150,7 +162,8 @@ static struct qmi_elem_info wlfw_rri_over_ddr_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rri_over_ddr_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_rri_over_ddr_cfg_s_v01,
 					   base_addr_high),
 	},
 	{
@@ -167,7 +180,8 @@ static struct qmi_elem_info wlfw_msi_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_msi_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_msi_cfg_s_v01,
 					   ce_id),
 	},
 	{
@@ -176,7 +190,8 @@ static struct qmi_elem_info wlfw_msi_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_msi_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_msi_cfg_s_v01,
 					   msi_vector),
 	},
 	{
@@ -193,7 +208,8 @@ static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_memory_region_info_s_v01,
 					   region_addr),
 	},
 	{
@@ -202,7 +218,8 @@ static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_memory_region_info_s_v01,
 					   size),
 	},
 	{
@@ -211,7 +228,8 @@ static struct qmi_elem_info wlfw_memory_region_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_memory_region_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_memory_region_info_s_v01,
 					   secure_flag),
 	},
 	{
@@ -228,7 +246,8 @@ static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_cfg_s_v01,
 					   offset),
 	},
 	{
@@ -237,7 +256,8 @@ static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_cfg_s_v01,
 					   size),
 	},
 	{
@@ -246,7 +266,8 @@ static struct qmi_elem_info wlfw_mem_cfg_s_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_cfg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_cfg_s_v01,
 					   secure_flag),
 	},
 	{
@@ -263,7 +284,8 @@ static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_s_v01,
 					   size),
 	},
 	{
@@ -272,7 +294,8 @@ static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_mem_type_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_s_v01,
 					   type),
 	},
 	{
@@ -281,7 +304,8 @@ static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_s_v01,
 					   mem_cfg_len),
 	},
 	{
@@ -290,7 +314,8 @@ static struct qmi_elem_info wlfw_mem_seg_s_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_mem_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_s_v01,
 					   mem_cfg),
 		.ei_array      = wlfw_mem_cfg_s_v01_ei,
 	},
@@ -308,7 +333,8 @@ static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_resp_s_v01,
 					   addr),
 	},
 	{
@@ -317,7 +343,8 @@ static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_resp_s_v01,
 					   size),
 	},
 	{
@@ -326,7 +353,8 @@ static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_mem_type_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_resp_s_v01,
 					   type),
 	},
 	{
@@ -335,7 +363,8 @@ static struct qmi_elem_info wlfw_mem_seg_resp_s_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_mem_seg_resp_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_mem_seg_resp_s_v01,
 					   restore),
 	},
 	{
@@ -352,7 +381,8 @@ static struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_chip_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_rf_chip_info_s_v01,
 					   chip_id),
 	},
 	{
@@ -361,7 +391,8 @@ static struct qmi_elem_info wlfw_rf_chip_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_chip_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_rf_chip_info_s_v01,
 					   chip_family),
 	},
 	{
@@ -378,7 +409,8 @@ static struct qmi_elem_info wlfw_rf_board_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_rf_board_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_rf_board_info_s_v01,
 					   board_id),
 	},
 	{
@@ -395,7 +427,8 @@ static struct qmi_elem_info wlfw_soc_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_soc_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_soc_info_s_v01,
 					   soc_id),
 	},
 	{
@@ -412,7 +445,8 @@ static struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_fw_version_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_fw_version_info_s_v01,
 					   fw_version),
 	},
 	{
@@ -421,7 +455,8 @@ static struct qmi_elem_info wlfw_fw_version_info_s_v01_ei[] = {
 		.elem_size      = sizeof(char),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_fw_version_info_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_fw_version_info_s_v01,
 					   fw_build_timestamp),
 	},
 	{
@@ -438,7 +473,8 @@ static struct qmi_elem_info wlfw_host_ddr_range_s_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_host_ddr_range_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_ddr_range_s_v01,
 					   start),
 	},
 	{
@@ -447,7 +483,8 @@ static struct qmi_elem_info wlfw_host_ddr_range_s_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0,
-		.offset         = offsetof(struct wlfw_host_ddr_range_s_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_ddr_range_s_v01,
 					   size),
 	},
 	{
@@ -464,7 +501,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_ready_enable_valid),
 	},
 	{
@@ -473,7 +511,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_ready_enable),
 	},
 	{
@@ -482,7 +521,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   initiate_cal_download_enable_valid),
 	},
 	{
@@ -491,7 +531,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   initiate_cal_download_enable),
 	},
 	{
@@ -500,7 +541,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   initiate_cal_update_enable_valid),
 	},
 	{
@@ -509,7 +551,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   initiate_cal_update_enable),
 	},
 	{
@@ -518,7 +561,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   msa_ready_enable_valid),
 	},
 	{
@@ -527,7 +571,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   msa_ready_enable),
 	},
 	{
@@ -536,7 +581,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   pin_connect_result_enable_valid),
 	},
 	{
@@ -545,7 +591,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   pin_connect_result_enable),
 	},
 	{
@@ -554,7 +601,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   client_id_valid),
 	},
 	{
@@ -563,7 +611,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   client_id),
 	},
 	{
@@ -572,7 +621,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   request_mem_enable_valid),
 	},
 	{
@@ -581,7 +631,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   request_mem_enable),
 	},
 	{
@@ -590,7 +641,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_mem_ready_enable_valid),
 	},
 	{
@@ -599,7 +651,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_mem_ready_enable),
 	},
 	{
@@ -608,7 +661,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_init_done_enable_valid),
 	},
 	{
@@ -617,7 +671,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   fw_init_done_enable),
 	},
 	{
@@ -626,7 +681,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   rejuvenate_enable_valid),
 	},
 	{
@@ -635,7 +691,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   rejuvenate_enable),
 	},
 	{
@@ -644,7 +701,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   xo_cal_enable_valid),
 	},
 	{
@@ -653,7 +711,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   xo_cal_enable),
 	},
 	{
@@ -662,7 +721,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   cal_done_enable_valid),
 	},
 	{
@@ -671,7 +731,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   cal_done_enable),
 	},
 	{
@@ -680,7 +741,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_req_mem_enable_valid),
 	},
 	{
@@ -689,7 +751,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_req_mem_enable),
 	},
 	{
@@ -698,7 +761,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_save_enable_valid),
 	},
 	{
@@ -707,7 +771,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_save_enable),
 	},
 	{
@@ -716,7 +781,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_free_enable_valid),
 	},
 	{
@@ -725,7 +791,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_trace_free_enable),
 	},
 	{
@@ -734,7 +801,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   respond_get_info_enable_valid),
 	},
 	{
@@ -743,7 +811,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   respond_get_info_enable),
 	},
 	{
@@ -752,7 +821,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   m3_dump_upload_req_enable_valid),
 	},
 	{
@@ -761,7 +831,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   m3_dump_upload_req_enable),
 	},
 	{
@@ -770,7 +841,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x21,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   wfc_call_twt_config_enable_valid),
 	},
 	{
@@ -779,7 +851,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x21,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   wfc_call_twt_config_enable),
 	},
 	{
@@ -788,7 +861,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x22,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_mem_ready_enable_valid),
 	},
 	{
@@ -797,7 +871,8 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x22,
-		.offset         = offsetof(struct wlfw_ind_register_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ind_register_req_msg_v01,
 					   qdss_mem_ready_enable),
 	},
 	{
@@ -806,6 +881,7 @@ struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_ind_register_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {
 	{
@@ -845,6 +921,7 @@ struct qmi_elem_info wlfw_ind_register_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_ind_register_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[] = {
 	{
@@ -853,6 +930,7 @@ struct qmi_elem_info wlfw_fw_ready_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_fw_ready_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 	{
@@ -861,7 +939,8 @@ struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_ready_ind_msg_v01,
 					   hang_data_addr_offset_valid),
 	},
 	{
@@ -870,7 +949,8 @@ struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_ready_ind_msg_v01,
 					   hang_data_addr_offset),
 	},
 	{
@@ -879,7 +959,8 @@ struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_ready_ind_msg_v01,
 					   hang_data_length_valid),
 	},
 	{
@@ -888,7 +969,8 @@ struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_msa_ready_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_ready_ind_msg_v01,
 					   hang_data_length),
 	},
 	{
@@ -897,6 +979,7 @@ struct qmi_elem_info wlfw_msa_ready_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_msa_ready_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {
 	{
@@ -965,6 +1048,7 @@ struct qmi_elem_info wlfw_pin_connect_result_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_pin_connect_result_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
 	{
@@ -973,7 +1057,8 @@ struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_driver_mode_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_mode_req_msg_v01,
 					   mode),
 	},
 	{
@@ -982,7 +1067,8 @@ struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_mode_req_msg_v01,
 					   hw_debug_valid),
 	},
 	{
@@ -991,7 +1077,8 @@ struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_mode_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_mode_req_msg_v01,
 					   hw_debug),
 	},
 	{
@@ -1000,6 +1087,7 @@ struct qmi_elem_info wlfw_wlan_mode_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wlan_mode_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {
 	{
@@ -1008,7 +1096,8 @@ struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_wlan_mode_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_mode_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -1018,6 +1107,7 @@ struct qmi_elem_info wlfw_wlan_mode_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wlan_mode_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 	{
@@ -1026,7 +1116,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   host_version_valid),
 	},
 	{
@@ -1035,7 +1126,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(char),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   host_version),
 	},
 	{
@@ -1044,7 +1136,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   tgt_cfg_valid),
 	},
 	{
@@ -1053,7 +1146,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   tgt_cfg_len),
 	},
 	{
@@ -1062,7 +1156,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_ce_tgt_pipe_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   tgt_cfg),
 		.ei_array      = wlfw_ce_tgt_pipe_cfg_s_v01_ei,
 	},
@@ -1072,7 +1167,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   svc_cfg_valid),
 	},
 	{
@@ -1081,7 +1177,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   svc_cfg_len),
 	},
 	{
@@ -1090,7 +1187,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_ce_svc_pipe_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   svc_cfg),
 		.ei_array      = wlfw_ce_svc_pipe_cfg_s_v01_ei,
 	},
@@ -1100,7 +1198,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg_valid),
 	},
 	{
@@ -1109,7 +1208,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg_len),
 	},
 	{
@@ -1118,7 +1218,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_shadow_reg_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg),
 		.ei_array      = wlfw_shadow_reg_cfg_s_v01_ei,
 	},
@@ -1128,7 +1229,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg_v2_valid),
 	},
 	{
@@ -1137,7 +1239,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg_v2_len),
 	},
 	{
@@ -1146,7 +1249,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_shadow_reg_v2_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   shadow_reg_v2),
 		.ei_array      = wlfw_shadow_reg_v2_cfg_s_v01_ei,
 	},
@@ -1156,7 +1260,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   rri_over_ddr_cfg_valid),
 	},
 	{
@@ -1165,7 +1270,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_rri_over_ddr_cfg_s_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   rri_over_ddr_cfg),
 		.ei_array      = wlfw_rri_over_ddr_cfg_s_v01_ei,
 	},
@@ -1175,7 +1281,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   msi_cfg_valid),
 	},
 	{
@@ -1184,7 +1291,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   msi_cfg_len),
 	},
 	{
@@ -1193,7 +1301,8 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_msi_cfg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_req_msg_v01,
 					   msi_cfg),
 		.ei_array      = wlfw_msi_cfg_s_v01_ei,
 	},
@@ -1203,6 +1312,7 @@ struct qmi_elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wlan_cfg_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {
 	{
@@ -1211,7 +1321,8 @@ struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_wlan_cfg_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_wlan_cfg_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -1221,6 +1332,7 @@ struct qmi_elem_info wlfw_wlan_cfg_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wlan_cfg_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cap_req_msg_v01_ei[] = {
 	{
@@ -1229,6 +1341,7 @@ struct qmi_elem_info wlfw_cap_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cap_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 	{
@@ -1237,7 +1350,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -1247,7 +1361,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   chip_info_valid),
 	},
 	{
@@ -1256,7 +1371,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_rf_chip_info_s_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   chip_info),
 		.ei_array      = wlfw_rf_chip_info_s_v01_ei,
 	},
@@ -1266,7 +1382,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   board_info_valid),
 	},
 	{
@@ -1275,7 +1392,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_rf_board_info_s_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   board_info),
 		.ei_array      = wlfw_rf_board_info_s_v01_ei,
 	},
@@ -1285,7 +1403,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   soc_info_valid),
 	},
 	{
@@ -1294,7 +1413,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_soc_info_s_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   soc_info),
 		.ei_array      = wlfw_soc_info_s_v01_ei,
 	},
@@ -1304,7 +1424,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_version_info_valid),
 	},
 	{
@@ -1313,7 +1434,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_fw_version_info_s_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_version_info),
 		.ei_array      = wlfw_fw_version_info_s_v01_ei,
 	},
@@ -1323,7 +1445,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_build_id_valid),
 	},
 	{
@@ -1332,7 +1455,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(char),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_build_id),
 	},
 	{
@@ -1341,7 +1465,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   num_macs_valid),
 	},
 	{
@@ -1350,7 +1475,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   num_macs),
 	},
 	{
@@ -1359,7 +1485,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   voltage_mv_valid),
 	},
 	{
@@ -1368,7 +1495,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   voltage_mv),
 	},
 	{
@@ -1377,7 +1505,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   time_freq_hz_valid),
 	},
 	{
@@ -1386,7 +1515,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   time_freq_hz),
 	},
 	{
@@ -1395,7 +1525,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   otp_version_valid),
 	},
 	{
@@ -1404,7 +1535,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   otp_version),
 	},
 	{
@@ -1413,7 +1545,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   eeprom_caldata_read_timeout_valid),
 	},
 	{
@@ -1422,7 +1555,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   eeprom_caldata_read_timeout),
 	},
 	{
@@ -1431,7 +1565,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_caps_valid),
 	},
 	{
@@ -1440,7 +1575,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   fw_caps),
 	},
 	{
@@ -1449,7 +1585,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   rd_card_chain_cap_valid),
 	},
 	{
@@ -1458,7 +1595,8 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_rd_card_chain_cap_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cap_resp_msg_v01,
 					   rd_card_chain_cap),
 	},
 	{
@@ -1467,6 +1605,7 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cap_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 	{
@@ -1475,7 +1614,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   valid),
 	},
 	{
@@ -1484,7 +1624,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   file_id_valid),
 	},
 	{
@@ -1493,7 +1634,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   file_id),
 	},
 	{
@@ -1502,7 +1644,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   total_size_valid),
 	},
 	{
@@ -1511,7 +1654,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   total_size),
 	},
 	{
@@ -1520,7 +1664,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   seg_id_valid),
 	},
 	{
@@ -1529,7 +1674,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   seg_id),
 	},
 	{
@@ -1538,7 +1684,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   data_valid),
 	},
 	{
@@ -1547,7 +1694,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   data_len),
 	},
 	{
@@ -1556,7 +1704,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   data),
 	},
 	{
@@ -1565,7 +1714,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   end_valid),
 	},
 	{
@@ -1574,7 +1724,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   end),
 	},
 	{
@@ -1583,7 +1734,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   bdf_type_valid),
 	},
 	{
@@ -1592,7 +1744,8 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_bdf_download_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_bdf_download_req_msg_v01,
 					   bdf_type),
 	},
 	{
@@ -1601,6 +1754,7 @@ struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_bdf_download_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {
 	{
@@ -1640,6 +1794,7 @@ struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_bdf_download_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 	{
@@ -1648,7 +1803,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   meta_data_len),
 	},
 	{
@@ -1657,7 +1813,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   meta_data),
 	},
 	{
@@ -1666,7 +1823,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   xo_cal_data_valid),
 	},
 	{
@@ -1675,7 +1833,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   xo_cal_data),
 	},
 	{
@@ -1684,7 +1843,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   cal_remove_supported_valid),
 	},
 	{
@@ -1693,7 +1853,8 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_report_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_req_msg_v01,
 					   cal_remove_supported),
 	},
 	{
@@ -1702,6 +1863,7 @@ struct qmi_elem_info wlfw_cal_report_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_report_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {
 	{
@@ -1710,7 +1872,8 @@ struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_report_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_report_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -1720,6 +1883,7 @@ struct qmi_elem_info wlfw_cal_report_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_report_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {
 	{
@@ -1729,8 +1893,8 @@ struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
 		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_id),
+					   wlfw_initiate_cal_download_ind_msg_v01,
+					   cal_id),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -1739,81 +1903,7 @@ struct qmi_elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  total_size_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  total_size),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_data_location_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct
-				  wlfw_initiate_cal_download_ind_msg_v01,
-				  cal_data_location),
-	},
-	{
-		.data_type      = QMI_EOTI,
-		.array_type       = NO_ARRAY,
-		.tlv_type       = QMI_COMMON_TLV_TYPE,
-	},
-};
-
-struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   valid),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   file_id_valid),
-	},
-	{
-		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
-		.elem_len       = 1,
-		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   file_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
+					   wlfw_initiate_cal_download_ind_msg_v01,
 					   total_size_valid),
 	},
 	{
@@ -1821,8 +1911,9 @@ struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
 		.elem_len       = 1,
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
+		.tlv_type       = 0x10,
+		.offset         = offsetof(struct
+					   wlfw_initiate_cal_download_ind_msg_v01,
 					   total_size),
 	},
 	{
@@ -1830,71 +1921,9 @@ struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
 		.elem_len       = 1,
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   seg_id_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_4_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u32),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   seg_id),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data_valid),
-	},
-	{
-		.data_type      = QMI_DATA_LEN,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u16),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data_len),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
-		.elem_size      = sizeof(u8),
-		.array_type       = VAR_LEN_ARRAY,
-		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   data),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   end_valid),
-	},
-	{
-		.data_type      = QMI_UNSIGNED_1_BYTE,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
-					   end),
-	},
-	{
-		.data_type      = QMI_OPT_FLAG,
-		.elem_len       = 1,
-		.elem_size      = sizeof(u8),
-		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
+		.tlv_type       = 0x11,
+		.offset         = offsetof(struct
+					   wlfw_initiate_cal_download_ind_msg_v01,
 					   cal_data_location_valid),
 	},
 	{
@@ -1902,8 +1931,9 @@ struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
 		.elem_len       = 1,
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
-		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_download_req_msg_v01,
+		.tlv_type       = 0x11,
+		.offset         = offsetof(struct
+					   wlfw_initiate_cal_download_ind_msg_v01,
 					   cal_data_location),
 	},
 	{
@@ -1912,6 +1942,156 @@ struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_initiate_cal_download_ind_msg_v01_ei);
+
+struct qmi_elem_info wlfw_cal_download_req_msg_v01_ei[] = {
+	{
+		.data_type      = QMI_UNSIGNED_1_BYTE,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x01,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   valid),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x10,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   file_id_valid),
+	},
+	{
+		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
+		.elem_len       = 1,
+		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x10,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   file_id),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x11,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   total_size_valid),
+	},
+	{
+		.data_type      = QMI_UNSIGNED_4_BYTE,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u32),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x11,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   total_size),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x12,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   seg_id_valid),
+	},
+	{
+		.data_type      = QMI_UNSIGNED_4_BYTE,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u32),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x12,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   seg_id),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x13,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   data_valid),
+	},
+	{
+		.data_type      = QMI_DATA_LEN,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u16),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x13,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   data_len),
+	},
+	{
+		.data_type      = QMI_UNSIGNED_1_BYTE,
+		.elem_len       = QMI_WLFW_MAX_DATA_SIZE_V01,
+		.elem_size      = sizeof(u8),
+		.array_type       = VAR_LEN_ARRAY,
+		.tlv_type       = 0x13,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   data),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x14,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   end_valid),
+	},
+	{
+		.data_type      = QMI_UNSIGNED_1_BYTE,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x14,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   end),
+	},
+	{
+		.data_type      = QMI_OPT_FLAG,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u8),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x15,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   cal_data_location_valid),
+	},
+	{
+		.data_type      = QMI_UNSIGNED_4_BYTE,
+		.elem_len       = 1,
+		.elem_size      = sizeof(u32),
+		.array_type       = NO_ARRAY,
+		.tlv_type       = 0x15,
+		.offset         = offsetof(struct
+					   wlfw_cal_download_req_msg_v01,
+					   cal_data_location),
+	},
+	{
+		.data_type      = QMI_EOTI,
+		.array_type       = NO_ARRAY,
+		.tlv_type       = QMI_COMMON_TLV_TYPE,
+	},
+};
+EXPORT_SYMBOL(wlfw_cal_download_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {
 	{
@@ -1931,6 +2111,7 @@ struct qmi_elem_info wlfw_cal_download_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_download_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {
 	{
@@ -1979,6 +2160,7 @@ struct qmi_elem_info wlfw_initiate_cal_update_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_initiate_cal_update_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {
 	{
@@ -1987,7 +2169,8 @@ struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_cal_update_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_req_msg_v01,
 					   cal_id),
 	},
 	{
@@ -1996,7 +2179,8 @@ struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_update_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_req_msg_v01,
 					   seg_id),
 	},
 	{
@@ -2005,6 +2189,7 @@ struct qmi_elem_info wlfw_cal_update_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_update_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 	{
@@ -2013,7 +2198,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2023,7 +2209,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   file_id_valid),
 	},
 	{
@@ -2032,7 +2219,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_cal_temp_id_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   file_id),
 	},
 	{
@@ -2041,7 +2229,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   total_size_valid),
 	},
 	{
@@ -2050,7 +2239,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   total_size),
 	},
 	{
@@ -2059,7 +2249,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   seg_id_valid),
 	},
 	{
@@ -2068,7 +2259,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   seg_id),
 	},
 	{
@@ -2077,7 +2269,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   data_valid),
 	},
 	{
@@ -2086,7 +2279,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   data_len),
 	},
 	{
@@ -2095,7 +2289,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   data),
 	},
 	{
@@ -2104,7 +2299,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   end_valid),
 	},
 	{
@@ -2113,7 +2309,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   end),
 	},
 	{
@@ -2122,7 +2319,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   cal_data_location_valid),
 	},
 	{
@@ -2131,7 +2329,8 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_cal_update_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_cal_update_resp_msg_v01,
 					   cal_data_location),
 	},
 	{
@@ -2140,6 +2339,7 @@ struct qmi_elem_info wlfw_cal_update_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_update_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {
 	{
@@ -2148,7 +2348,8 @@ struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_msa_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_info_req_msg_v01,
 					   msa_addr),
 	},
 	{
@@ -2157,7 +2358,8 @@ struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_info_req_msg_v01,
 					   size),
 	},
 	{
@@ -2166,6 +2368,7 @@ struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_msa_info_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
 	{
@@ -2174,7 +2377,8 @@ struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_info_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2184,7 +2388,8 @@ struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_info_resp_msg_v01,
 					   mem_region_info_len),
 	},
 	{
@@ -2193,7 +2398,8 @@ struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_memory_region_info_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_msa_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_info_resp_msg_v01,
 					   mem_region_info),
 		.ei_array      = wlfw_memory_region_info_s_v01_ei,
 	},
@@ -2203,6 +2409,7 @@ struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_msa_info_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[] = {
 	{
@@ -2211,6 +2418,7 @@ struct qmi_elem_info wlfw_msa_ready_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_msa_ready_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {
 	{
@@ -2219,7 +2427,8 @@ struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_msa_ready_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_msa_ready_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2229,6 +2438,7 @@ struct qmi_elem_info wlfw_msa_ready_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_msa_ready_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {
 	{
@@ -2237,7 +2447,8 @@ struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ini_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ini_req_msg_v01,
 					   enablefwlog_valid),
 	},
 	{
@@ -2246,7 +2457,8 @@ struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_ini_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ini_req_msg_v01,
 					   enablefwlog),
 	},
 	{
@@ -2255,6 +2467,7 @@ struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_ini_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {
 	{
@@ -2263,7 +2476,8 @@ struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_ini_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_ini_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2273,6 +2487,7 @@ struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_ini_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
 	{
@@ -2281,7 +2496,8 @@ struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_athdiag_read_req_msg_v01,
 					   offset),
 	},
 	{
@@ -2290,7 +2506,8 @@ struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_athdiag_read_req_msg_v01,
 					   mem_type),
 	},
 	{
@@ -2299,7 +2516,8 @@ struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x03,
-		.offset         = offsetof(struct wlfw_athdiag_read_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_athdiag_read_req_msg_v01,
 					   data_len),
 	},
 	{
@@ -2308,6 +2526,7 @@ struct qmi_elem_info wlfw_athdiag_read_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_athdiag_read_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {
 	{
@@ -2357,6 +2576,7 @@ struct qmi_elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_athdiag_read_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {
 	{
@@ -2405,6 +2625,7 @@ struct qmi_elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_athdiag_write_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {
 	{
@@ -2424,6 +2645,7 @@ struct qmi_elem_info wlfw_athdiag_write_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_athdiag_write_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {
 	{
@@ -2432,7 +2654,8 @@ struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_vbatt_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_vbatt_req_msg_v01,
 					   voltage_uv),
 	},
 	{
@@ -2441,6 +2664,7 @@ struct qmi_elem_info wlfw_vbatt_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_vbatt_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {
 	{
@@ -2449,7 +2673,8 @@ struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_vbatt_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_vbatt_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2459,6 +2684,7 @@ struct qmi_elem_info wlfw_vbatt_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_vbatt_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {
 	{
@@ -2467,7 +2693,8 @@ struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_mac_addr_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_mac_addr_req_msg_v01,
 					   mac_addr_valid),
 	},
 	{
@@ -2476,7 +2703,8 @@ struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = STATIC_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_mac_addr_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_mac_addr_req_msg_v01,
 					   mac_addr),
 	},
 	{
@@ -2485,6 +2713,7 @@ struct qmi_elem_info wlfw_mac_addr_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_mac_addr_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {
 	{
@@ -2493,7 +2722,8 @@ struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_mac_addr_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_mac_addr_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2503,6 +2733,7 @@ struct qmi_elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_mac_addr_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 	{
@@ -2511,7 +2742,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   num_clients_valid),
 	},
 	{
@@ -2520,7 +2752,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   num_clients),
 	},
 	{
@@ -2529,7 +2762,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   wake_msi_valid),
 	},
 	{
@@ -2538,7 +2772,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   wake_msi),
 	},
 	{
@@ -2547,7 +2782,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   gpios_valid),
 	},
 	{
@@ -2556,7 +2792,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   gpios_len),
 	},
 	{
@@ -2565,7 +2802,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   gpios),
 	},
 	{
@@ -2574,7 +2812,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   nm_modem_valid),
 	},
 	{
@@ -2583,7 +2822,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   nm_modem),
 	},
 	{
@@ -2592,7 +2832,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   bdf_support_valid),
 	},
 	{
@@ -2601,7 +2842,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   bdf_support),
 	},
 	{
@@ -2610,7 +2852,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   bdf_cache_support_valid),
 	},
 	{
@@ -2619,7 +2862,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   bdf_cache_support),
 	},
 	{
@@ -2628,7 +2872,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   m3_support_valid),
 	},
 	{
@@ -2637,7 +2882,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x16,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   m3_support),
 	},
 	{
@@ -2646,7 +2892,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   m3_cache_support_valid),
 	},
 	{
@@ -2655,7 +2902,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x17,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   m3_cache_support),
 	},
 	{
@@ -2664,7 +2912,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_filesys_support_valid),
 	},
 	{
@@ -2673,7 +2922,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x18,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_filesys_support),
 	},
 	{
@@ -2682,7 +2932,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_cache_support_valid),
 	},
 	{
@@ -2691,7 +2942,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x19,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_cache_support),
 	},
 	{
@@ -2700,7 +2952,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_done_valid),
 	},
 	{
@@ -2709,7 +2962,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1A,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_done),
 	},
 	{
@@ -2718,7 +2972,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   mem_bucket_valid),
 	},
 	{
@@ -2727,7 +2982,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1B,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   mem_bucket),
 	},
 	{
@@ -2736,7 +2992,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   mem_cfg_mode_valid),
 	},
 	{
@@ -2745,7 +3002,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1C,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   mem_cfg_mode),
 	},
 	{
@@ -2754,7 +3012,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_duration_valid),
 	},
 	{
@@ -2763,7 +3022,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1D,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   cal_duration),
 	},
 	{
@@ -2772,7 +3032,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   platform_name_valid),
 	},
 	{
@@ -2781,7 +3042,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(char),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1E,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   platform_name),
 	},
 	{
@@ -2790,7 +3052,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   ddr_range_valid),
 	},
 	{
@@ -2799,7 +3062,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_host_ddr_range_s_v01),
 		.array_type       = STATIC_ARRAY,
 		.tlv_type       = 0x1F,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   ddr_range),
 		.ei_array      = wlfw_host_ddr_range_s_v01_ei,
 	},
@@ -2809,7 +3073,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   host_build_type_valid),
 	},
 	{
@@ -2818,7 +3083,8 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_host_build_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x20,
-		.offset         = offsetof(struct wlfw_host_cap_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_req_msg_v01,
 					   host_build_type),
 	},
 	{
@@ -2827,6 +3093,7 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_host_cap_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {
 	{
@@ -2835,7 +3102,8 @@ struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_host_cap_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_host_cap_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2845,6 +3113,7 @@ struct qmi_elem_info wlfw_host_cap_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_host_cap_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
 	{
@@ -2853,7 +3122,8 @@ struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_request_mem_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_request_mem_ind_msg_v01,
 					   mem_seg_len),
 	},
 	{
@@ -2862,7 +3132,8 @@ struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_mem_seg_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_request_mem_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_request_mem_ind_msg_v01,
 					   mem_seg),
 		.ei_array      = wlfw_mem_seg_s_v01_ei,
 	},
@@ -2872,6 +3143,7 @@ struct qmi_elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_request_mem_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
 	{
@@ -2880,7 +3152,8 @@ struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_respond_mem_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_respond_mem_req_msg_v01,
 					   mem_seg_len),
 	},
 	{
@@ -2889,7 +3162,8 @@ struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct wlfw_mem_seg_resp_s_v01),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_respond_mem_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_respond_mem_req_msg_v01,
 					   mem_seg),
 		.ei_array      = wlfw_mem_seg_resp_s_v01_ei,
 	},
@@ -2899,6 +3173,7 @@ struct qmi_elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_respond_mem_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {
 	{
@@ -2907,7 +3182,8 @@ struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_respond_mem_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_respond_mem_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -2917,6 +3193,7 @@ struct qmi_elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_respond_mem_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[] = {
 	{
@@ -2925,6 +3202,7 @@ struct qmi_elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_fw_mem_ready_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[] = {
 	{
@@ -2933,6 +3211,7 @@ struct qmi_elem_info wlfw_fw_init_done_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_fw_init_done_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 	{
@@ -2941,7 +3220,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   cause_for_rejuvenation_valid),
 	},
 	{
@@ -2950,7 +3230,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   cause_for_rejuvenation),
 	},
 	{
@@ -2959,7 +3240,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   requesting_sub_system_valid),
 	},
 	{
@@ -2968,7 +3250,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   requesting_sub_system),
 	},
 	{
@@ -2977,7 +3260,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   line_number_valid),
 	},
 	{
@@ -2986,7 +3270,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   line_number),
 	},
 	{
@@ -2995,7 +3280,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   function_name_valid),
 	},
 	{
@@ -3004,7 +3290,8 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(char),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_rejuvenate_ind_msg_v01,
 					   function_name),
 	},
 	{
@@ -3013,6 +3300,7 @@ struct qmi_elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_rejuvenate_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {
 	{
@@ -3021,6 +3309,7 @@ struct qmi_elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_rejuvenate_ack_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {
 	{
@@ -3040,6 +3329,7 @@ struct qmi_elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_rejuvenate_ack_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
 	{
@@ -3049,8 +3339,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_req_msg_v01,
-				  mask_valid),
+					   wlfw_dynamic_feature_mask_req_msg_v01,
+					   mask_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_8_BYTE,
@@ -3059,8 +3349,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_req_msg_v01,
-				  mask),
+					   wlfw_dynamic_feature_mask_req_msg_v01,
+					   mask),
 	},
 	{
 		.data_type      = QMI_EOTI,
@@ -3068,6 +3358,7 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_dynamic_feature_mask_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 	{
@@ -3077,8 +3368,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  resp),
+					   wlfw_dynamic_feature_mask_resp_msg_v01,
+					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
 	{
@@ -3088,8 +3379,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  prev_mask_valid),
+					   wlfw_dynamic_feature_mask_resp_msg_v01,
+					   prev_mask_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_8_BYTE,
@@ -3098,8 +3389,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  prev_mask),
+					   wlfw_dynamic_feature_mask_resp_msg_v01,
+					   prev_mask),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -3108,8 +3399,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  curr_mask_valid),
+					   wlfw_dynamic_feature_mask_resp_msg_v01,
+					   curr_mask_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_8_BYTE,
@@ -3118,8 +3409,8 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
 		.offset         = offsetof(struct
-				  wlfw_dynamic_feature_mask_resp_msg_v01,
-				  curr_mask),
+					   wlfw_dynamic_feature_mask_resp_msg_v01,
+					   curr_mask),
 	},
 	{
 		.data_type      = QMI_EOTI,
@@ -3127,6 +3418,7 @@ struct qmi_elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_dynamic_feature_mask_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {
 	{
@@ -3135,7 +3427,8 @@ struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_m3_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_m3_info_req_msg_v01,
 					   addr),
 	},
 	{
@@ -3144,7 +3437,8 @@ struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_m3_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_m3_info_req_msg_v01,
 					   size),
 	},
 	{
@@ -3153,6 +3447,7 @@ struct qmi_elem_info wlfw_m3_info_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_m3_info_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {
 	{
@@ -3161,7 +3456,8 @@ struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_m3_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_m3_info_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -3171,6 +3467,7 @@ struct qmi_elem_info wlfw_m3_info_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_m3_info_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {
 	{
@@ -3179,7 +3476,8 @@ struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_xo_cal_ind_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_xo_cal_ind_msg_v01,
 					   xo_cal_data),
 	},
 	{
@@ -3188,6 +3486,7 @@ struct qmi_elem_info wlfw_xo_cal_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_xo_cal_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_cal_done_ind_msg_v01_ei[] = {
 	{
@@ -3196,6 +3495,7 @@ struct qmi_elem_info wlfw_cal_done_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_cal_done_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_req_mem_ind_msg_v01_ei[] = {
 	{
@@ -3225,6 +3525,7 @@ struct qmi_elem_info wlfw_qdss_trace_req_mem_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_req_mem_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_mem_info_req_msg_v01_ei[] = {
 	{
@@ -3254,6 +3555,7 @@ struct qmi_elem_info wlfw_qdss_trace_mem_info_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_mem_info_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_mem_info_resp_msg_v01_ei[] = {
 	{
@@ -3263,8 +3565,8 @@ struct qmi_elem_info wlfw_qdss_trace_mem_info_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_mem_info_resp_msg_v01,
-				  resp),
+					   wlfw_qdss_trace_mem_info_resp_msg_v01,
+					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
 	{
@@ -3273,6 +3575,7 @@ struct qmi_elem_info wlfw_qdss_trace_mem_info_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_mem_info_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_save_ind_msg_v01_ei[] = {
 	{
@@ -3352,6 +3655,7 @@ struct qmi_elem_info wlfw_qdss_trace_save_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_save_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_data_req_msg_v01_ei[] = {
 	{
@@ -3370,6 +3674,7 @@ struct qmi_elem_info wlfw_qdss_trace_data_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_data_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_data_resp_msg_v01_ei[] = {
 	{
@@ -3479,6 +3784,7 @@ struct qmi_elem_info wlfw_qdss_trace_data_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_data_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 	{
@@ -3488,8 +3794,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  total_size_valid),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   total_size_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_4_BYTE,
@@ -3498,8 +3804,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  total_size),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   total_size),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -3508,8 +3814,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  seg_id_valid),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   seg_id_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_4_BYTE,
@@ -3518,8 +3824,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  seg_id),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   seg_id),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -3528,8 +3834,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data_valid),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   data_valid),
 	},
 	{
 		.data_type      = QMI_DATA_LEN,
@@ -3538,8 +3844,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data_len),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   data_len),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_1_BYTE,
@@ -3548,8 +3854,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x12,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  data),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   data),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -3558,8 +3864,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  end_valid),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   end_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_1_BYTE,
@@ -3568,8 +3874,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_req_msg_v01,
-				  end),
+					   wlfw_qdss_trace_config_download_req_msg_v01,
+					   end),
 	},
 	{
 		.data_type      = QMI_EOTI,
@@ -3577,6 +3883,7 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_config_download_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_config_download_resp_msg_v01_ei[] = {
 	{
@@ -3586,8 +3893,8 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_config_download_resp_msg_v01,
-				  resp),
+					   wlfw_qdss_trace_config_download_resp_msg_v01,
+					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
 	{
@@ -3596,6 +3903,7 @@ struct qmi_elem_info wlfw_qdss_trace_config_download_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_config_download_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_mode_req_msg_v01_ei[] = {
 	{
@@ -3605,8 +3913,8 @@ struct qmi_elem_info wlfw_qdss_trace_mode_req_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
 		.offset         = offsetof(struct
-				  wlfw_qdss_trace_mode_req_msg_v01,
-				  mode_valid),
+					   wlfw_qdss_trace_mode_req_msg_v01,
+					   mode_valid),
 	},
 	{
 		.data_type      = QMI_SIGNED_4_BYTE_ENUM,
@@ -3664,6 +3972,7 @@ struct qmi_elem_info wlfw_qdss_trace_mode_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_mode_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_mode_resp_msg_v01_ei[] = {
 	{
@@ -3683,6 +3992,7 @@ struct qmi_elem_info wlfw_qdss_trace_mode_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_mode_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_trace_free_ind_msg_v01_ei[] = {
 	{
@@ -3722,6 +4032,7 @@ struct qmi_elem_info wlfw_qdss_trace_free_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_trace_free_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[] = {
 	{
@@ -3730,7 +4041,8 @@ struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_shutdown_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_shutdown_req_msg_v01,
 					   shutdown_valid),
 	},
 	{
@@ -3739,7 +4051,8 @@ struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_shutdown_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_shutdown_req_msg_v01,
 					   shutdown),
 	},
 	{
@@ -3748,6 +4061,7 @@ struct qmi_elem_info wlfw_shutdown_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_shutdown_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_shutdown_resp_msg_v01_ei[] = {
 	{
@@ -3756,7 +4070,8 @@ struct qmi_elem_info wlfw_shutdown_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_shutdown_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_shutdown_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -3766,6 +4081,7 @@ struct qmi_elem_info wlfw_shutdown_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_shutdown_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_antenna_switch_req_msg_v01_ei[] = {
 	{
@@ -3774,6 +4090,7 @@ struct qmi_elem_info wlfw_antenna_switch_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_antenna_switch_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_antenna_switch_resp_msg_v01_ei[] = {
 	{
@@ -3813,6 +4130,7 @@ struct qmi_elem_info wlfw_antenna_switch_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_antenna_switch_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_antenna_grant_req_msg_v01_ei[] = {
 	{
@@ -3841,6 +4159,7 @@ struct qmi_elem_info wlfw_antenna_grant_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_antenna_grant_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_antenna_grant_resp_msg_v01_ei[] = {
 	{
@@ -3860,6 +4179,7 @@ struct qmi_elem_info wlfw_antenna_grant_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_antenna_grant_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wfc_call_status_req_msg_v01_ei[] = {
 	{
@@ -4008,6 +4328,7 @@ struct qmi_elem_info wlfw_wfc_call_status_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wfc_call_status_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wfc_call_status_resp_msg_v01_ei[] = {
 	{
@@ -4027,6 +4348,7 @@ struct qmi_elem_info wlfw_wfc_call_status_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wfc_call_status_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
 	{
@@ -4035,7 +4357,8 @@ struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x01,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_get_info_req_msg_v01,
 					   type),
 	},
 	{
@@ -4044,7 +4367,8 @@ struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_get_info_req_msg_v01,
 					   data_len),
 	},
 	{
@@ -4053,7 +4377,8 @@ struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = VAR_LEN_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_get_info_req_msg_v01,
 					   data),
 	},
 	{
@@ -4062,6 +4387,7 @@ struct qmi_elem_info wlfw_get_info_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_get_info_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_get_info_resp_msg_v01_ei[] = {
 	{
@@ -4070,7 +4396,8 @@ struct qmi_elem_info wlfw_get_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_get_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_get_info_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -4080,6 +4407,7 @@ struct qmi_elem_info wlfw_get_info_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_get_info_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_respond_get_info_ind_msg_v01_ei[] = {
 	{
@@ -4168,6 +4496,7 @@ struct qmi_elem_info wlfw_respond_get_info_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_respond_get_info_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_device_info_req_msg_v01_ei[] = {
 	{
@@ -4176,6 +4505,7 @@ struct qmi_elem_info wlfw_device_info_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_device_info_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 	{
@@ -4184,7 +4514,8 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_device_info_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -4194,7 +4525,8 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_device_info_resp_msg_v01,
 					   bar_addr_valid),
 	},
 	{
@@ -4203,7 +4535,8 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_device_info_resp_msg_v01,
 					   bar_addr),
 	},
 	{
@@ -4212,7 +4545,8 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_device_info_resp_msg_v01,
 					   bar_size_valid),
 	},
 	{
@@ -4221,7 +4555,8 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(u32),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         = offsetof(struct wlfw_device_info_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_device_info_resp_msg_v01,
 					   bar_size),
 	},
 	{
@@ -4230,6 +4565,7 @@ struct qmi_elem_info wlfw_device_info_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_device_info_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_m3_dump_upload_req_ind_msg_v01_ei[] = {
 	{
@@ -4268,6 +4604,7 @@ struct qmi_elem_info wlfw_m3_dump_upload_req_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_m3_dump_upload_req_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_m3_dump_upload_done_req_msg_v01_ei[] = {
 	{
@@ -4296,6 +4633,7 @@ struct qmi_elem_info wlfw_m3_dump_upload_done_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_m3_dump_upload_done_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_m3_dump_upload_done_resp_msg_v01_ei[] = {
 	{
@@ -4305,8 +4643,8 @@ struct qmi_elem_info wlfw_m3_dump_upload_done_resp_msg_v01_ei[] = {
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
 		.offset         = offsetof(struct
-					wlfw_m3_dump_upload_done_resp_msg_v01,
-					resp),
+					   wlfw_m3_dump_upload_done_resp_msg_v01,
+					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
 	{
@@ -4315,6 +4653,7 @@ struct qmi_elem_info wlfw_m3_dump_upload_done_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_m3_dump_upload_done_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_soc_wake_req_msg_v01_ei[] = {
 	{
@@ -4333,7 +4672,8 @@ struct qmi_elem_info wlfw_soc_wake_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_soc_wake_enum_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_soc_wake_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_soc_wake_req_msg_v01,
 					   wake),
 	},
 	{
@@ -4342,6 +4682,7 @@ struct qmi_elem_info wlfw_soc_wake_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_soc_wake_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_soc_wake_resp_msg_v01_ei[] = {
 	{
@@ -4350,7 +4691,8 @@ struct qmi_elem_info wlfw_soc_wake_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_soc_wake_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_soc_wake_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -4360,6 +4702,7 @@ struct qmi_elem_info wlfw_soc_wake_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_soc_wake_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_power_save_req_msg_v01_ei[] = {
 	{
@@ -4368,7 +4711,8 @@ struct qmi_elem_info wlfw_power_save_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_power_save_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_power_save_req_msg_v01,
 					   power_save_mode_valid),
 	},
 	{
@@ -4377,7 +4721,8 @@ struct qmi_elem_info wlfw_power_save_req_msg_v01_ei[] = {
 		.elem_size      = sizeof(enum wlfw_power_save_mode_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         = offsetof(struct wlfw_power_save_req_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_power_save_req_msg_v01,
 					   power_save_mode),
 	},
 	{
@@ -4386,6 +4731,7 @@ struct qmi_elem_info wlfw_power_save_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_power_save_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_power_save_resp_msg_v01_ei[] = {
 	{
@@ -4394,7 +4740,8 @@ struct qmi_elem_info wlfw_power_save_resp_msg_v01_ei[] = {
 		.elem_size      = sizeof(struct qmi_response_type_v01),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x02,
-		.offset         = offsetof(struct wlfw_power_save_resp_msg_v01,
+		.offset         = offsetof(struct
+					   wlfw_power_save_resp_msg_v01,
 					   resp),
 		.ei_array      = qmi_response_type_v01_ei,
 	},
@@ -4404,6 +4751,7 @@ struct qmi_elem_info wlfw_power_save_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_power_save_resp_msg_v01_ei);
 
 struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 	{
@@ -4412,9 +4760,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_start_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_start_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_8_BYTE,
@@ -4422,9 +4770,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u64),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x10,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_start),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_start),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -4432,9 +4780,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_int_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_int_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_2_BYTE,
@@ -4442,9 +4790,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x11,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_int),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_int),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -4452,9 +4800,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_upo_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_upo_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_2_BYTE,
@@ -4462,9 +4810,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x12,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_upo),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_upo),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -4472,9 +4820,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_sp_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_sp_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_2_BYTE,
@@ -4482,9 +4830,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x13,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_sp),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_sp),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -4492,9 +4840,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_dl_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_dl_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_2_BYTE,
@@ -4502,9 +4850,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u16),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x14,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_dl),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_dl),
 	},
 	{
 		.data_type      = QMI_OPT_FLAG,
@@ -4512,9 +4860,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_config_changed_valid),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_config_changed_valid),
 	},
 	{
 		.data_type      = QMI_UNSIGNED_1_BYTE,
@@ -4522,9 +4870,9 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.elem_size      = sizeof(u8),
 		.array_type       = NO_ARRAY,
 		.tlv_type       = 0x15,
-		.offset         =
-		offsetof(struct wlfw_wfc_call_twt_config_ind_msg_v01,
-			 twt_sta_config_changed),
+		.offset         = offsetof(struct
+					   wlfw_wfc_call_twt_config_ind_msg_v01,
+					   twt_sta_config_changed),
 	},
 	{
 		.data_type      = QMI_EOTI,
@@ -4532,6 +4880,7 @@ struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_wfc_call_twt_config_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[] = {
 	{
@@ -4540,6 +4889,7 @@ struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_qdss_mem_ready_ind_msg_v01_ei);
 
 struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[] = {
 	{
@@ -4558,6 +4908,7 @@ struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_pcie_gen_switch_req_msg_v01_ei);
 
 struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[] = {
 	{
@@ -4577,4 +4928,5 @@ struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[] = {
 		.tlv_type       = QMI_COMMON_TLV_TYPE,
 	},
 };
+EXPORT_SYMBOL(wlfw_pcie_gen_switch_resp_msg_v01_ei);
 
diff --git a/drivers/soc/qcom/icnss2/wlan_firmware_service_v01.h b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h
similarity index 98%
rename from drivers/soc/qcom/icnss2/wlan_firmware_service_v01.h
rename to drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h
index aac8403d11c3..cdd81b429a97 100644
--- a/drivers/soc/qcom/icnss2/wlan_firmware_service_v01.h
+++ b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. */
+/* Copyright (c) 2020, The Linux Foundation. All rights reserved. */
 
 #ifndef WLAN_FIRMWARE_SERVICE_V01_H
 #define WLAN_FIRMWARE_SERVICE_V01_H
@@ -88,10 +88,6 @@
 #define QMI_WLFW_XO_CAL_IND_V01 0x003D
 #define QMI_WLFW_SHUTDOWN_RESP_V01 0x0043
 #define QMI_WLFW_ATHDIAG_READ_REQ_V01 0x0030
-#define QMI_WLFW_WLAN_CFG_REQ_V01 0x0023
-#define QMI_WLFW_IND_REGISTER_RESP_V01 0x0020
-#define QMI_WLFW_PCIE_GEN_SWITCH_REQ_V01 0x0053
-#define QMI_WLFW_PCIE_GEN_SWITCH_RESP_V01 0x0053
 #define QMI_WLFW_WFC_CALL_TWT_CONFIG_IND_V01 0x0051
 #define QMI_WLFW_WLAN_MODE_RESP_V01 0x0022
 #define QMI_WLFW_WFC_CALL_STATUS_REQ_V01 0x0049
@@ -371,7 +367,6 @@ struct wlfw_ind_register_req_msg_v01 {
 	u8 qdss_mem_ready_enable_valid;
 	u8 qdss_mem_ready_enable;
 };
-
 #define WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN 82
 extern struct qmi_elem_info wlfw_ind_register_req_msg_v01_ei[];
 
@@ -434,12 +429,10 @@ struct wlfw_wlan_cfg_req_msg_v01 {
 	struct wlfw_ce_svc_pipe_cfg_s_v01 svc_cfg[QMI_WLFW_MAX_NUM_SVC_V01];
 	u8 shadow_reg_valid;
 	u32 shadow_reg_len;
-	struct wlfw_shadow_reg_cfg_s_v01
-		shadow_reg[QMI_WLFW_MAX_NUM_SHADOW_REG_V01];
+	struct wlfw_shadow_reg_cfg_s_v01 shadow_reg[QMI_WLFW_MAX_NUM_SHADOW_REG_V01];
 	u8 shadow_reg_v2_valid;
 	u32 shadow_reg_v2_len;
-	struct wlfw_shadow_reg_v2_cfg_s_v01
-		shadow_reg_v2[QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01];
+	struct wlfw_shadow_reg_v2_cfg_s_v01 shadow_reg_v2[QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01];
 	u8 rri_over_ddr_cfg_valid;
 	struct wlfw_rri_over_ddr_cfg_s_v01 rri_over_ddr_cfg;
 	u8 msi_cfg_valid;
@@ -488,7 +481,6 @@ struct wlfw_cap_resp_msg_v01 {
 	u8 rd_card_chain_cap_valid;
 	enum wlfw_rd_card_chain_cap_v01 rd_card_chain_cap;
 };
-
 #define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 253
 extern struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[];
 
@@ -516,7 +508,6 @@ struct wlfw_bdf_download_resp_msg_v01 {
 	u8 host_bdf_data_valid;
 	u64 host_bdf_data;
 };
-
 #define WLFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 18
 extern struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[];
 
@@ -617,8 +608,7 @@ extern struct qmi_elem_info wlfw_msa_info_req_msg_v01_ei[];
 struct wlfw_msa_info_resp_msg_v01 {
 	struct qmi_response_type_v01 resp;
 	u32 mem_region_info_len;
-	struct wlfw_memory_region_info_s_v01
-		mem_region_info[QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01];
+	struct wlfw_memory_region_info_s_v01 mem_region_info[QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01];
 };
 #define WLFW_MSA_INFO_RESP_MSG_V01_MAX_MSG_LEN 37
 extern struct qmi_elem_info wlfw_msa_info_resp_msg_v01_ei[];
@@ -738,8 +728,7 @@ struct wlfw_host_cap_req_msg_v01 {
 	u8 platform_name_valid;
 	char platform_name[QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 + 1];
 	u8 ddr_range_valid;
-	struct wlfw_host_ddr_range_s_v01
-		ddr_range[QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01];
+	struct wlfw_host_ddr_range_s_v01 ddr_range[QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01];
 	u8 host_build_type_valid;
 	enum wlfw_host_build_type_v01 host_build_type;
 };
@@ -1095,14 +1084,12 @@ struct wlfw_power_save_req_msg_v01 {
 	u8 power_save_mode_valid;
 	enum wlfw_power_save_mode_v01 power_save_mode;
 };
-
 #define WLFW_POWER_SAVE_REQ_MSG_V01_MAX_MSG_LEN 7
 extern struct qmi_elem_info wlfw_power_save_req_msg_v01_ei[];
 
 struct wlfw_power_save_resp_msg_v01 {
 	struct qmi_response_type_v01 resp;
 };
-
 #define WLFW_POWER_SAVE_RESP_MSG_V01_MAX_MSG_LEN 7
 extern struct qmi_elem_info wlfw_power_save_resp_msg_v01_ei[];
 
@@ -1120,28 +1107,24 @@ struct wlfw_wfc_call_twt_config_ind_msg_v01 {
 	u8 twt_sta_config_changed_valid;
 	u8 twt_sta_config_changed;
 };
-
 #define WLFW_WFC_CALL_TWT_CONFIG_IND_MSG_V01_MAX_MSG_LEN 35
 extern struct qmi_elem_info wlfw_wfc_call_twt_config_ind_msg_v01_ei[];
 
 struct wlfw_qdss_mem_ready_ind_msg_v01 {
 	char placeholder;
 };
-
 #define WLFW_QDSS_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0
 extern struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[];
 
 struct wlfw_pcie_gen_switch_req_msg_v01 {
 	enum wlfw_pcie_gen_speed_v01 pcie_speed;
 };
-
 #define WLFW_PCIE_GEN_SWITCH_REQ_MSG_V01_MAX_MSG_LEN 7
 extern struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[];
 
 struct wlfw_pcie_gen_switch_resp_msg_v01 {
 	struct qmi_response_type_v01 resp;
 };
-
 #define WLFW_PCIE_GEN_SWITCH_RESP_MSG_V01_MAX_MSG_LEN 7
 extern struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[];
 
diff --git a/drivers/soc/qcom/icnss2/Kconfig b/drivers/soc/qcom/icnss2/Kconfig
index 7e1e469dd133..829db44f2cd8 100644
--- a/drivers/soc/qcom/icnss2/Kconfig
+++ b/drivers/soc/qcom/icnss2/Kconfig
@@ -20,6 +20,7 @@ config ICNSS2_DEBUG
 config ICNSS2_QMI
 	bool "ICNSS2 Platform Driver QMI support"
 	depends on ICNSS2
+	select CNSS_QMI_SVC
 	help
 	  Say 'Y' here to enable ICNSS QMI support. ICNSS driver will use
 	  QMI framework to communicate with WLAN FW. It will send coldboot
diff --git a/drivers/soc/qcom/icnss2/Makefile b/drivers/soc/qcom/icnss2/Makefile
index f0ac96742b03..735d85556b44 100644
--- a/drivers/soc/qcom/icnss2/Makefile
+++ b/drivers/soc/qcom/icnss2/Makefile
@@ -2,8 +2,9 @@
 
 obj-$(CONFIG_ICNSS2) += icnss2.o
 
+ccflags-y += -I$(srctree)/drivers/net/wireless/cnss_utils/
 icnss2-y := main.o
 icnss2-y += debug.o
 icnss2-y += power.o
 icnss2-y += genl.o
-icnss2-$(CONFIG_ICNSS2_QMI) += qmi.o wlan_firmware_service_v01.o
+icnss2-$(CONFIG_ICNSS2_QMI) += qmi.o