diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h
index 622025d38c47..617af7603a58 100644
--- a/fw/wmi_unified.h
+++ b/fw/wmi_unified.h
@@ -83,6 +83,7 @@ extern "C" {
 #define MAX_TX_RATE_VALUES      10 /*Max Tx Rates*/
 #define MAX_RSSI_VALUES         10 /*Max Rssi values*/
 #define WMI_MAX_CHAINS 8
+#define WMI_MAX_CHAINS_FOR_AOA_RCC 2
 
 #define MAX_AOA_PHASEDELTA      31  /* 62 gain values */
 
@@ -31863,6 +31864,17 @@ typedef struct {
     A_UINT32 pdev_id; /* PDEV Id set by the command */
     A_UINT32 freq; /* Current channel in MHz */
 
+    /*
+     * Chain Info
+     * LSB 16 bits - Max chain supported,
+     * MSB 16 bits - Chain pair which has phase values:
+     *        0x0003 - chain 0 and 1
+     *        0x000c - chain 2 and 3
+     *        0x0030 - chain 4 and 5
+     *        0x00c0 - chain 6 and 7
+     */
+    A_UINT32 chainInfo;
+
     /*
      * Phase Delta values:
      * Two phase delta values are packed into each A_UINT32 word
@@ -31873,14 +31885,14 @@ typedef struct {
      * gain 1's phase delta occupies bits 31:16 of phasedelta[chain][0],
      * gain 2's phase delta occupies bits 15:0 of phasedelta[chain][1], etc.
      */
-    A_UINT32 phasedelta[WMI_MAX_CHAINS][MAX_AOA_PHASEDELTA];
+    A_UINT32 phasedelta[WMI_MAX_CHAINS_FOR_AOA_RCC][MAX_AOA_PHASEDELTA];
 
     /*
      * IBF cal values:
      * Used for final AoA calculation
      * [AoAPhase =  ( PhaseDeltaValue + IBFcalValue )   %   1024]
      */
-    A_UINT32 perChainIbfCalVal[WMI_MAX_CHAINS];
+    A_UINT32 perChainIbfCalVal[WMI_MAX_CHAINS_FOR_AOA_RCC];
 } wmi_pdev_aoa_phasedelta_evt_fixed_param;
 
 /* WMI_HALPHY_CAL_LIST:
diff --git a/fw/wmi_version.h b/fw/wmi_version.h
index 44936a6ae5e1..853465c4bbaa 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_ 1029
+#define __WMI_REVISION_ 1030
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work