diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h
index 80684dc616..74f05b838e 100644
--- a/fw/wmi_tlv_defs.h
+++ b/fw/wmi_tlv_defs.h
@@ -955,6 +955,7 @@ typedef enum {
     WMITLV_TAG_STRUC_wmi_pdev_csc_switch_count_status_event_fixed_param,
     WMITLV_TAG_STRUC_wmi_roam_bss_load_config_cmd_fixed_param,
     WMITLV_TAG_STRUC_wmi_roam_blacklist_event_fixed_param,
+    WMITLV_TAG_STRUC_wmi_csc_vdev_list,
 } WMITLV_TAG_ID;
 
 /*
@@ -5110,7 +5111,7 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID);
 
 #define WMITLV_TABLE_WMI_PDEV_CSC_SWITCH_COUNT_STATUS_EVENTID(id,op,buf,len) \
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_csc_switch_count_status_event_fixed_param, wmi_pdev_csc_switch_count_status_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
-    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_ids, WMITLV_SIZE_VAR)
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_csc_vdev_list, vdev_info, WMITLV_SIZE_VAR)
 WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CSC_SWITCH_COUNT_STATUS_EVENTID);
 
 /* cal version response event */
diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index a19ce71742..ffa856a4c3 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -23192,6 +23192,12 @@ typedef struct {
      */
 } wmi_pdev_csa_switch_count_status_event_fixed_param;
 
+typedef struct {
+    A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_csc_vdev_list */
+    A_UINT32 vdev_id;
+    A_UINT32 current_switch_count; /** CSC switch count value in the last transmitted beacon */
+} wmi_csc_vdev_list;
+
 typedef struct {
     /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_csc_switch_count_status_event_fixed_param */
     A_UINT32 tlv_header;
@@ -23204,7 +23210,7 @@ typedef struct {
     A_UINT32 current_switch_count;
 
     /* The TLVs follows this structure:
-     * A_UINT32 vdev_ids[]; // IDs of vdevs whose color-switch countdown expired
+     * struct wmi_csc_vdev_list vdev_info[]; // IDs of vdevs and their current switch countdown values
      */
 } wmi_pdev_csc_switch_count_status_event_fixed_param;
 
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index e7cbe29e18..13974d3dd0 100644
--- a/fw/wmi_version.h
+++ b/fw/wmi_version.h
@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility. */
-#define __WMI_REVISION_ 610
+#define __WMI_REVISION_ 611
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work