[Feature][T8TSK-212][Modem]Update MTK modem version to MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240624.20240624,Updated RF version L805A/l1-0624

MTK modem version: MOLY01359861_AUTO00312773(For_MOBILETEK35_IVT_T800_MOLY.NR15.R3.MD700.MP.V75.P12).tar.gz
RF  modem version: L805A/l1_240624.rar

Change-Id: I3e3589acc9cb855613a0e1722901b25710cca675
diff --git a/MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240604.20240618.tar.gz b/MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240604.20240618.tar.gz
new file mode 100644
index 0000000..217f7ae
--- /dev/null
+++ b/MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240604.20240618.tar.gz
Binary files differ
diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
index 4c7a78c..cc31a82 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
@@ -1,7 +1,7 @@
 /*******************************************************************************

 * @file       CAT_Codegen_DataMapping.txt

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      information about mapping between compressed index and user index

 *

 * @details      Use Ctrl + F to search @PA#, @ETM#

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.c
index 8d0dd33..3be0888 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_device.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end device

 *

 * @details

@@ -73,13 +73,13 @@
    [2 ] = { .addr = 0x17    , .data = 0x0000  }, 

 };

 

-/* Device 13: FX6880_LNA_MIPI_CS */

+/* Device 12: FX6880_LNA_MIPI_CS */

 static const MML1_CDF_FE_MIPI_CW_T mml1_custom_device_ctrig_list_2_info_set3[1] = 

 {

    [0 ] = { .addr = 0x1B    , .data = 0x0000  }, 

 };

 

-/* Device 14: FX6730_LFEM_MIPI_CS */

+/* Device 13: FX6730_LFEM_MIPI_CS */

 static const MML1_CDF_FE_MIPI_CW_T mml1_custom_device_ctrig_list_3_info_set3[1] = 

 {

    [0 ] = { .addr = 0x09    , .data = 0x0000  }, 

@@ -148,7 +148,7 @@
    [1 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

-/* PMZB200UNE_SP1T_BPI */

+/* NZ5761S_ASM_BPI */

 static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_7_block_info_set3[] = 

 {

    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

@@ -160,14 +160,8 @@
    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

-/* NZ5761S_ASM_BPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_9_block_info_set3[] = 

-{

-   [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

-};

-

 /* FX6880_PAMID_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_10_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_9_block_info_set3[] = 

 {

    [0 ] = {  .pa_block_info        = { .category = MML1_CDF_COMMON_DEVICE_PA_CATEGORY_NORMAL_PA  }  },

    [1 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

@@ -175,26 +169,26 @@
 };

 

 /* MT6308H_VPA_MIPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_11_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_10_block_info_set3[] = 

 {

    [0 ] = {  .etm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ETM_CATEGORY_NORMAL_ETM  }  },

 };

 

 /* PMZB200UNE_SP1T_BPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_12_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_11_block_info_set3[] = 

 {

    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

 /* FX6880_LNA_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_13_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_12_block_info_set3[] = 

 {

    [0 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

    [1 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

 };

 

 /* FX6730_LFEM_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_14_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_13_block_info_set3[] = 

 {

    [0 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

    [1 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

@@ -352,19 +346,19 @@
       .p_block_info  = mml1_custom_device_list_6_block_info_set3,

    },

 

-   /* Device 7: PMZB200UNE_SP1T_BPI */

+   /* Device 7: NZ5761S_ASM_BPI */

    [7] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id          = 7,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

       .proto_info.bpi_info = {

-         .bpi_0_mask                   = 0x0080,

-         .bpi_1_mask                   = 0x0000,

+         .bpi_0_mask                   = 0x0020,

+         .bpi_1_mask                   = 0x0040,

          .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

+         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_BBIC,

       },

       .p_block_info  = mml1_custom_device_list_7_block_info_set3,

    },

@@ -381,33 +375,16 @@
          .bpi_0_mask                   = 0x0020,

          .bpi_1_mask                   = 0x0040,

          .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

+         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_BBIC,

       },

       .p_block_info  = mml1_custom_device_list_8_block_info_set3,

    },

 

-   /* Device 9: NZ5761S_ASM_BPI */

+   /* Device 9: FX6880_PAMID_MIPI_CS */

    [9] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id          = 9,

-      .device_block_num     = 1,

-      .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

-      .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

-      .proto_info.bpi_info = {

-         .bpi_0_mask                   = 0x0020,

-         .bpi_1_mask                   = 0x0040,

-         .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

-      },

-      .p_block_info  = mml1_custom_device_list_9_block_info_set3,

-   },

-

-   /* Device 10: FX6880_PAMID_MIPI_CS */

-   [10] = {

-      .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id          = 10,

+      .instance_id          = 9,

       .device_block_num     = 3,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -422,14 +399,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 0 },

       },

-      .p_block_info  = mml1_custom_device_list_10_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_9_block_info_set3,

    },

 

-   /* Device 11: MT6308H_VPA_MIPI */

-   [11] = {

+   /* Device 10: MT6308H_VPA_MIPI */

+   [10] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id          = 11,

+      .instance_id          = 10,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -444,14 +421,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 0 },

       },

-      .p_block_info  = mml1_custom_device_list_11_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_10_block_info_set3,

    },

 

-   /* Device 12: PMZB200UNE_SP1T_BPI */

-   [12] = {

+   /* Device 11: PMZB200UNE_SP1T_BPI */

+   [11] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

-      .instance_id          = 12,

+      .instance_id          = 11,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

@@ -461,14 +438,14 @@
          .bpi_2_mask                   = 0x0000,

          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

       },

-      .p_block_info  = mml1_custom_device_list_12_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_11_block_info_set3,

    },

 

-   /* Device 13: FX6880_LNA_MIPI_CS */

-   [13] = {

+   /* Device 12: FX6880_LNA_MIPI_CS */

+   [12] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id          = 13,

+      .instance_id          = 12,

       .device_block_num     = 2,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -483,14 +460,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 1 , mml1_custom_device_ctrig_list_2_info_set3 },

       },

-      .p_block_info  = mml1_custom_device_list_13_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_12_block_info_set3,

    },

 

-   /* Device 14: FX6730_LFEM_MIPI_CS */

-   [14] = {

+   /* Device 13: FX6730_LFEM_MIPI_CS */

+   [13] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id          = 14,

+      .instance_id          = 13,

       .device_block_num     = 4,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -505,7 +482,7 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 1 , mml1_custom_device_ctrig_list_3_info_set3 },

       },

-      .p_block_info  = mml1_custom_device_list_14_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_13_block_info_set3,

    },

 

 }; /* mml1_custom_device_list_set3 */

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.h
index 5442101..aceb4ab 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_device.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_device.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end device

 *

 * @details

@@ -65,7 +65,7 @@
 *******************************************************************************/

 

 /* ==== Devices ==== */

-#define MML1_CUSTOM_DEVICES_MAX_NUM_Set3              15

+#define MML1_CUSTOM_DEVICES_MAX_NUM_Set3              14

 

 /*******************************************************************************

 *  Global Functions Prototype (Interface)

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.c
index dab0c37..03c49ed 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_dpd_capability.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end DPD mode capability

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.h
index b1310ad..9ff8541 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_dpd_capability.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_dpd_capability.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 DPD capability

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.c
index 36b60e0..644e6f2 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_elna.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall eLNA database

 *

 * @details

@@ -72,10 +72,10 @@
       {   MML1_CDF_FE_ELNA_IDX7,                    4,                    3,                    3 },

       {   MML1_CDF_FE_ELNA_IDX8,                    4,                    0,                    3 },

       {   MML1_CDF_FE_ELNA_IDX9,                    4,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX10,                   13,                    0,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX11,                   13,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX12,                   14,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX13,                   14,                    0,                    3 }

+      {  MML1_CDF_FE_ELNA_IDX10,                   12,                    0,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX11,                   12,                    1,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX12,                   13,                    1,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX13,                   13,                    0,                    3 }

    }

 }; /* mml1_cdf_sku_mgr_elna_mapping_tbl_set3 */

 

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.h
index 02c6d51..a176c37 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_elna.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_elna.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end elna

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.c
index 04b269f..71a5bee 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_et_capability.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end ET mode capability

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.h
index 3281221..5168e39 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_et_capability.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_et_capability.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 ET capability

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.c
index 8755ebe..a24782e 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall ETM TPC setting usage, related to linkage.

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.h
index 4063aee..a369563 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end etm

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm_blk_db.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
index 12d0c52..cfc02f9 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm_blk_db.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall ETM block data base usage

 *

 * @details

@@ -167,7 +167,7 @@
 

 /* ======== Set3 ETM Block Order List

  * [0]   InstanceId   5: MT6308H_VPA_MIPI               block   0

- * [1]   InstanceId  11: MT6308H_VPA_MIPI               block   0

+ * [1]   InstanceId  10: MT6308H_VPA_MIPI               block   0

  * ======== */

 

 /* ETM 0: InstanceId   5, MT6308H_VPA_MIPI              , block   0 */

@@ -184,7 +184,7 @@
    MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,        /* transport port */

 };

 

-/* ETM 1: InstanceId  11, MT6308H_VPA_MIPI              , block   0 */

+/* ETM 1: InstanceId  10, MT6308H_VPA_MIPI              , block   0 */

 static const MML1_CDF_FE_ETM_INFOR_T mml1_custom_fe_etm_info_etm1_Set3 =

 {

    4,                                                 /* MIPI port number */

@@ -203,7 +203,7 @@
 static const MML1_CDF_SKU_MGR_INTF_FE_ETM_BIAS_BLK_PARAM_T mml1_custom_fe_etm_bias_blk_param_Set3[] =

 {

    { &mml1_custom_fe_etm_info_etm0_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   },  /* ETM0  : Instance 5    MT6308H_VPA_MIPI               block 0   */

-   { &mml1_custom_fe_etm_info_etm1_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   }   /* ETM1  : Instance 11   MT6308H_VPA_MIPI               block 0   */

+   { &mml1_custom_fe_etm_info_etm1_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   }   /* ETM1  : Instance 10   MT6308H_VPA_MIPI               block 0   */

 };

 

 /* ==== Set3 ETM Block DB ==== */

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.c
index 958e857..eb7f554 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall PA Bias setting usage, related to linkage.

 *

 * @details

@@ -397,6 +397,8 @@
 /* ==== Set3 Sub-Band Info 21

 * User(s):

 *   [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0_TX_MIMO_0 :: BW_20M

+*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

+*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting21_Set3[] =

 {

@@ -414,11 +416,11 @@
 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting22_Set3[] =

 {

-   { 703000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 715000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 720000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 728000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 733000, MML1_FE_PA_BIAS_DB_DATA15 }

+   { 711000, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 719000, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 725400, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 737500, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 748000, MML1_FE_PA_BIAS_DB_DATA15 }

 };

 

 /* ==== Set3 Sub-Band Info 23

@@ -505,20 +507,6 @@
    { 3800000, MML1_FE_PA_BIAS_DB_DATA0 }

 };

 

-/* ==== Set3 Sub-Band Info 25

-* User(s):

-*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

-*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

-*  ==== */

-static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting25_Set3[] =

-{

-   { 887000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 894000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 901000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 908000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 915000, MML1_FE_PA_BIAS_DB_DATA15 }

-};

-

 /* ==== PA Bias Info Settings ==== */

 

 /* ==== Set3 Bias Info 0

@@ -972,6 +960,8 @@
 /* ==== Set3 Bias Info 22

 * User(s):

 *   [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0

+*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0

+*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0

 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_INFO_T mml1_custom_fe_pa_bias_info_setting22_Set3 =

 {

@@ -1101,24 +1091,6 @@
    }

 };

 

-/* ==== Set3 Bias Info 27

-* User(s):

-*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0

-*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0

-*  ==== */

-static const MML1_CDF_FE_PA_BIAS_INFO_T mml1_custom_fe_pa_bias_info_setting27_Set3 =

-{

-   2,    /* PA Index */

-   1,    /* Number of BW */

-   5,    /* Number of sub-bands */

-   {

-      {

-         20000,   /* BW_20M */

-         mml1_custom_fe_pa_bias_db_setting25_Set3

-      },

-   }

-};

-

 /* ==== TX 1X1 PA Bias Setting Table ==== */

 

 static const MML1_CDF_FE_PA_BIAS_INFO_T* mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3[] =

@@ -1149,8 +1121,7 @@
    &mml1_custom_fe_pa_bias_info_setting23_Set3,

    &mml1_custom_fe_pa_bias_info_setting24_Set3,

    &mml1_custom_fe_pa_bias_info_setting25_Set3,

-   &mml1_custom_fe_pa_bias_info_setting26_Set3,

-   &mml1_custom_fe_pa_bias_info_setting27_Set3

+   &mml1_custom_fe_pa_bias_info_setting26_Set3

 }; /* mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3 */

 

 /* ==== TX 1X1 RAT-based Remapping Tables ==== */

@@ -1224,12 +1195,14 @@
    MML1_FE_PA_BIAS_DB_SETTING8,   /* [  3] [B] Set3_LTE_SB_RX-B7(2)-TX-B7(1)_LTE_B7_0 */

                                   /* [  3] [B] Set3_NR_SB_RX-N7(2)-TX-N7(1)_NR_B7_0 */

    MML1_FE_PA_BIAS_DB_SETTING22,  /* [  4] [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0 */

+                                  /* [  4] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0 */

+                                  /* [  4] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0 */

    MML1_FE_PA_BIAS_DB_SETTING23,  /* [  5] [B] Set3_NR_SB_RX-N28(2)-TX-N28(1)_NR_B28_0 */

    MML1_FE_PA_BIAS_DB_SETTING24,  /* [  6] [D] Set3_NR_SB_RX-N41(2)-TX-N41(1)_NR_B41_0 */

                                   /* [  6] [B] Set3_NR_SB_RX-N41(4)-TX-N41(1)_NR_B41_0 */

    MML1_FE_PA_BIAS_DB_SETTING25,  /* [  7] [D] Set3_NR_SB_RX-N77(2)-TX-N77(1)_NR_B77_0 */

                                   /* [  7] [B] Set3_NR_SB_RX-N77(4)-TX-N77(1)_NR_B77_0 */

-   MML1_FE_PA_BIAS_DB_SETTING26,  /* [  8] [D] Set3_NR_SB_RX-N78(2)-TX-N78(1)_NR_B78_0 */

+   MML1_FE_PA_BIAS_DB_SETTING26   /* [  8] [D] Set3_NR_SB_RX-N78(2)-TX-N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_NR_SB_RX-N78(4)-TX-N78(1)_NR_B78_0 */

                                   /* [  8] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(0)N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(0)N78(1)_NR_B78_0 */

@@ -1247,8 +1220,6 @@
                                   /* [  8] [B] Set3_ENDC_2CA_RX-B8(2)N78(4)-TX-B8(1)N78(1)_NR_B78_0 */

                                   /* [  8] [D] Set3_ENDC_2CA_RX-B40(2)N78(2)-TX-B40(1)N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_ENDC_2CA_RX-B40(2)N78(4)-TX-B40(1)N78(1)_NR_B78_0 */

-   MML1_FE_PA_BIAS_DB_SETTING27   /* [  9] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0 */

-                                  /* [  9] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0 */

 };

 

 /* ==== Overall TX 1X1 Remapping Table ==== */

@@ -1260,7 +1231,7 @@
    {   3, mml1_custom_fe_pa_bias_wcdma_remapping_tbl_Set3 },

    {   0, NULL },

    {  14, mml1_custom_fe_pa_bias_lte_remapping_tbl_Set3 },

-   {  10, mml1_custom_fe_pa_bias_nr_remapping_tbl_Set3 }

+   {   9, mml1_custom_fe_pa_bias_nr_remapping_tbl_Set3 }

 };

 

 /* ==== Overall TX 2X2 Table ==== */

@@ -1269,7 +1240,7 @@
 

 static const MML1_CDF_SKU_MGR_INTF_FE_PA_BIAS_PARAM_T mml1_custom_fe_pa_bias_setting_init_tbl_Set3 =

 {

-   mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3, 28,

+   mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3, 27,

    NULL, 0,

    mml1_custom_fe_pa_bias_rat_remapping_tbl_Set3

 };

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.h
index 4e4db35..c61d5c7 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end pa bias

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
index b6fc19b..56b79f5 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias_blk_db.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall PA bias block data

 *

 * @details

@@ -179,16 +179,16 @@
    {

       /* DATA 0,       DATA 1,       DATA 2,       DATA 3,       DATA 4      */

       /*{addr, data}, {addr, data}, {addr, data}, {addr, data}, {addr, data} */

-      {{{0x00, 0x16}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

-      {{{0x00, 0x14}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

-      {{{0x00, 0x14}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

-      {{{0x00, 0x14}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

-      {{{0x00, 0x14}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

-      {{{0x00, 0x14}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

-      {{{0x00, 0x14}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

+      {{{0x00, 0x0E}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

+      {{{0x00, 0x0C}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

+      {{{0x00, 0x0C}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

+      {{{0x00, 0x0C}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

+      {{{0x00, 0x0C}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

+      {{{0x00, 0x0C}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

+      {{{0x00, 0x0C}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

       {{{0x00, 0x00}, {0x01, 0x00}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G10  */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G0   */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G1   */

@@ -209,16 +209,16 @@
    {

       /* DATA 0,       DATA 1,       DATA 2,       DATA 3,       DATA 4      */

       /*{addr, data}, {addr, data}, {addr, data}, {addr, data}, {addr, data} */

-      {{{0x00, 0x26}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

-      {{{0x00, 0x24}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

-      {{{0x00, 0x24}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

-      {{{0x00, 0x24}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

-      {{{0x00, 0x24}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

-      {{{0x00, 0x24}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

-      {{{0x00, 0x24}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

+      {{{0x00, 0x2E}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

+      {{{0x00, 0x2C}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

+      {{{0x00, 0x2C}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

+      {{{0x00, 0x2C}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

+      {{{0x00, 0x2C}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

+      {{{0x00, 0x2C}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

+      {{{0x00, 0x2C}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

       {{{0x00, 0x00}, {0x01, 0x00}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G10  */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G0   */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G1   */

@@ -681,7 +681,7 @@
  * [0]   InstanceId   1: FX5596Y_TXM_MIPI               block   2

  * [1]   InstanceId   1: FX5596Y_TXM_MIPI               block   0

  * [2]   InstanceId   6: NZ5627K_MMMB_PA_MIPI           block   0

- * [3]   InstanceId  10: FX6880_PAMID_MIPI_CS           block   0

+ * [3]   InstanceId   9: FX6880_PAMID_MIPI_CS           block   0

  * ======== */

 

 /* PA 0: InstanceId   1, FX5596Y_TXM_MIPI              , block   2 */

@@ -717,7 +717,7 @@
    MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC         /* MIPI port source */

 };

 

-/* PA 3: InstanceId  10, FX6880_PAMID_MIPI_CS          , block   0 */

+/* PA 3: InstanceId   9, FX6880_PAMID_MIPI_CS          , block   0 */

 static const MML1_CDF_FE_PA_INFOR_T mml1_custom_fe_pa_info_pa3_Set3 =

 {

    4,                                                 /* MIPI port number */

@@ -734,7 +734,7 @@
    { &mml1_custom_fe_pa_info_pa0_Set3,    mml1_custom_fe_pa_bias_db_FX5596Y_TXM_MIPI_2_Set3,           1   },  /* PA0  : Instance 1    FX5596Y_TXM_MIPI               block 2   */

    { &mml1_custom_fe_pa_info_pa1_Set3,    mml1_custom_fe_pa_bias_db_FX5596Y_TXM_MIPI_0_Set3,           1   },  /* PA1  : Instance 1    FX5596Y_TXM_MIPI               block 0   */

    { &mml1_custom_fe_pa_info_pa2_Set3,    mml1_custom_fe_pa_bias_db_NZ5627K_MMMB_PA_MIPI_0_Set3,       17  },  /* PA2  : Instance 6    NZ5627K_MMMB_PA_MIPI           block 0   */

-   { &mml1_custom_fe_pa_info_pa3_Set3,    mml1_custom_fe_pa_bias_db_FX6880_PAMID_MIPI_CS_0_Set3,       1   }   /* PA3  : Instance 10   FX6880_PAMID_MIPI_CS           block 0   */

+   { &mml1_custom_fe_pa_info_pa3_Set3,    mml1_custom_fe_pa_bias_db_FX6880_PAMID_MIPI_CS_0_Set3,       1   }   /* PA3  : Instance 9    FX6880_PAMID_MIPI_CS           block 0   */

 };

 

 /* ==== Set3 PA Block DB ==== */

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.c
index f9f1623..ba1672c 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_route.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end route usage

 *

 * @details

@@ -1158,24 +1158,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_14_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_14_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -1192,7 +1174,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_14_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_14_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -1208,22 +1190,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_14_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_14_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_14_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_14_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_14_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_14_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_14_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_14_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_15_RX

 * Users:

@@ -1297,13 +1272,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_15_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_15_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_15_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_15_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_15_rx_node_list_set3 };

 

@@ -1439,24 +1414,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_17_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_17_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -1473,7 +1430,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_17_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_17_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -1489,22 +1446,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_17_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_17_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_17_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_17_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_17_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_17_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_17_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_17_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_18_RX

 * Users:

@@ -1578,13 +1528,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_18_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_18_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_18_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_18_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_18_rx_node_list_set3 };

 

@@ -2325,25 +2275,7 @@
       },

    },

 };

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_28_rx_node_3_block_static_params_set3[1] = 

-{

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_28_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_28_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -2359,22 +2291,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_28_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_28_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_28_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_28_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_28_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_28_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_28_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_28_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_29_RX

 * Users:

@@ -2445,13 +2370,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_29_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_29_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_29_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_29_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_29_rx_node_list_set3 };

 

@@ -3011,24 +2936,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_36_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_36_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 2 */

    [0] = { 

       .block_idx        = 0,

@@ -3045,7 +2952,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_36_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_36_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -3061,22 +2968,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_36_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_36_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_36_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_36_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_36_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_36_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_36_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_36_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_37_RX

 * Users:

@@ -3149,13 +3049,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_37_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_37_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_37_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_37_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_37_rx_node_list_set3 };

 

@@ -3672,27 +3572,27 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x01, .rf_port_ant_path = 0x01, .rf_port_band_group = 0x02, .validity = { [0] = 0x07, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_43_tx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 11 MT6308H_VPA_MIPI */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 10 MT6308H_VPA_MIPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id = 11,

+      .instance_id = 10,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_43_tx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 11 MT6308H_VPA_MIPI

-   /* Device FE: ID 12 PMZB200UNE_SP1T_BPI */

+   }, // Device FE: ID 10 MT6308H_VPA_MIPI

+   /* Device FE: ID 11 PMZB200UNE_SP1T_BPI */

    [3] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

-      .instance_id = 12,

+      .instance_id = 11,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_43_tx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 12 PMZB200UNE_SP1T_BPI

+   }, // Device FE: ID 11 PMZB200UNE_SP1T_BPI

 };/* mml1_custom_fe_route_43_tx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_43_tx_set3 = { MML1_CDF_SKU_MGR_INTF_TX_ROUTE, 4, mml1_custom_fe_route_43_tx_node_list_set3 };

 

@@ -3788,20 +3688,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x19, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_44_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_44_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_44_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_44_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_44_rx_node_list_set3 };

 

@@ -3897,20 +3797,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x17, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_45_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_45_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_45_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_45_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_45_rx_node_list_set3 };

 

@@ -3987,13 +3887,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0xFF, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_46_mrx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

 };/* mml1_custom_fe_route_46_mrx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_46_mrx_set3 = { MML1_CDF_SKU_MGR_INTF_MRX_ROUTE, 2, mml1_custom_fe_route_46_mrx_node_list_set3 };

 

@@ -4030,13 +3930,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x1B, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_47_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_47_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_47_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_47_rx_node_list_set3 };

 

@@ -4073,13 +3973,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x15, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_48_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_48_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_48_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_48_rx_node_list_set3 };

 

@@ -4123,24 +4023,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_49_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_49_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -4157,7 +4039,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_49_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_49_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4173,22 +4055,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_49_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_49_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_49_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_49_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_49_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_49_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_49_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_49_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_50_RX

 * Users:

@@ -4262,13 +4137,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_50_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_50_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_50_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_50_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_50_rx_node_list_set3 };

 

@@ -4311,24 +4186,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_51_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_51_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -4345,7 +4202,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_51_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_51_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4361,22 +4218,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_51_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_51_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_51_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_51_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_51_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_51_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_51_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_51_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_52_RX

 * Users:

@@ -4449,13 +4299,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_52_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_52_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_52_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_52_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_52_rx_node_list_set3 };

 

@@ -4497,24 +4347,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_53_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_53_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 2 */

    [0] = { 

       .block_idx        = 0,

@@ -4531,7 +4363,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_53_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_53_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4547,22 +4379,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_53_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_53_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_53_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_53_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_53_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_53_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_53_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_53_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_54_RX

 * Users:

@@ -4634,13 +4459,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_54_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_54_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_54_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_54_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_54_rx_node_list_set3 };

 

@@ -4692,13 +4517,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x1B, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_55_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_55_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_55_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_55_rx_node_list_set3 };

 

@@ -4750,13 +4575,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x15, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_56_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_56_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_56_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_56_rx_node_list_set3 };

 

@@ -4810,20 +4635,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x19, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_57_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_57_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_57_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_57_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_57_rx_node_list_set3 };

 

@@ -4877,20 +4702,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x17, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_58_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_58_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_58_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_58_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_58_rx_node_list_set3 };

 

@@ -4977,20 +4802,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x01, .rf_port_ant_path = 0x01, .rf_port_band_group = 0x02, .validity = { [0] = 0x07, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_59_tx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 11 MT6308H_VPA_MIPI */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 10 MT6308H_VPA_MIPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id = 11,

+      .instance_id = 10,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_59_tx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 11 MT6308H_VPA_MIPI

+   }, // Device FE: ID 10 MT6308H_VPA_MIPI

 };/* mml1_custom_fe_route_59_tx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_59_tx_set3 = { MML1_CDF_SKU_MGR_INTF_TX_ROUTE, 3, mml1_custom_fe_route_59_tx_node_list_set3 };

 

@@ -6558,7 +6383,7 @@
    .rx_route_idx             = { MML1_FE_RX_2X2_ROUTE4, MML1_FE_RX_2X2_ROUTE28 },

    .tx_band                  = { { MMRF_UNI_RAT_5G, MMRF_UNI_BAND8 }, { MMRF_UNI_RAT_INVAILD, MMRF_UNI_BANDNONE } },

    .tx_route_idx             = { MML1_FE_TX_MRX_1X1_ROUTE4, MML1_FE_ROUTE_INVALID },

-   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING9, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

+   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING4, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

    .etm_bias_setting_idx     = { MML1_FE_ETM_BIAS_1X1_RAT_SETTING1, MML1_FE_ETM_BIAS_RAT_INVALID_SETTING },

    .hash_key                 = 28,

    .fe_timing_info           = { .fe_timing_hash_tbl_idx = { FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX_INVALID, FE_TIMING_COLLECTION_IDX_INVALID } },

@@ -6573,7 +6398,7 @@
    .rx_route_idx             = { MML1_FE_RX_2X2_ROUTE4, MML1_FE_RX_4X4_ROUTE7 },

    .tx_band                  = { { MMRF_UNI_RAT_5G, MMRF_UNI_BAND8 }, { MMRF_UNI_RAT_INVAILD, MMRF_UNI_BANDNONE } },

    .tx_route_idx             = { MML1_FE_TX_MRX_1X1_ROUTE4, MML1_FE_ROUTE_INVALID },

-   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING9, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

+   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING4, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

    .etm_bias_setting_idx     = { MML1_FE_ETM_BIAS_1X1_RAT_SETTING1, MML1_FE_ETM_BIAS_RAT_INVALID_SETTING },

    .hash_key                 = 28,

    .fe_timing_info           = { .fe_timing_hash_tbl_idx = { FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX_INVALID, FE_TIMING_COLLECTION_IDX_INVALID } },

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.h
index 987c613..5ce2a49 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_route.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_route.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 front-end route usage

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.c
index e479611..4015d3e 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_timing.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end timing settings

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.h
index ed0d5a7..57ab0e0 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/SKUCodeGen/mml1_custom_fe_timing.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_timing.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end timing

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_mipi_ant_database.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_mipi_ant_database.c
index efafbe1..85480ad 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_mipi_ant_database.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_mipi_ant_database.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_mipi_ant_database.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT MIPI

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.c
index 39fcfb4..9470c64 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      FDD/TDD RF ANT TUNER SETTING

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.h
index acb777f..ab74bc4 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_database.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_database.c
index 7e5e6f3..4333a7b 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_database.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_database.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_database.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT database

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.c
index 6ff8f2d..65a9e9c 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_hw_type3.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.h
index 7c221fe..895e917 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_ant_hw_type3.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_hw_type3.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.c b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.c
index b149331..3a98a4c 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.c
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_dat.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT DAT

 *

 * @details

diff --git a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.h b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.h
index 43b8133..de373f1 100644
--- a/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.h
+++ b/mcu/custom/l1/mml1_rf/MT2735_MMRF_MT6190_WIDE_TEMP_CUSTOM/DRDI/Set3/Toolgen/mml1_custom_rf_dat.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_dat.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT DAT

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
index 4c7a78c..cc31a82 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/Set3_CAT_Codegen_DataMapping.txt
@@ -1,7 +1,7 @@
 /*******************************************************************************

 * @file       CAT_Codegen_DataMapping.txt

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      information about mapping between compressed index and user index

 *

 * @details      Use Ctrl + F to search @PA#, @ETM#

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.c
index 8d0dd33..3be0888 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_device.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end device

 *

 * @details

@@ -73,13 +73,13 @@
    [2 ] = { .addr = 0x17    , .data = 0x0000  }, 

 };

 

-/* Device 13: FX6880_LNA_MIPI_CS */

+/* Device 12: FX6880_LNA_MIPI_CS */

 static const MML1_CDF_FE_MIPI_CW_T mml1_custom_device_ctrig_list_2_info_set3[1] = 

 {

    [0 ] = { .addr = 0x1B    , .data = 0x0000  }, 

 };

 

-/* Device 14: FX6730_LFEM_MIPI_CS */

+/* Device 13: FX6730_LFEM_MIPI_CS */

 static const MML1_CDF_FE_MIPI_CW_T mml1_custom_device_ctrig_list_3_info_set3[1] = 

 {

    [0 ] = { .addr = 0x09    , .data = 0x0000  }, 

@@ -148,7 +148,7 @@
    [1 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

-/* PMZB200UNE_SP1T_BPI */

+/* NZ5761S_ASM_BPI */

 static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_7_block_info_set3[] = 

 {

    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

@@ -160,14 +160,8 @@
    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

-/* NZ5761S_ASM_BPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_9_block_info_set3[] = 

-{

-   [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

-};

-

 /* FX6880_PAMID_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_10_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_9_block_info_set3[] = 

 {

    [0 ] = {  .pa_block_info        = { .category = MML1_CDF_COMMON_DEVICE_PA_CATEGORY_NORMAL_PA  }  },

    [1 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

@@ -175,26 +169,26 @@
 };

 

 /* MT6308H_VPA_MIPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_11_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_10_block_info_set3[] = 

 {

    [0 ] = {  .etm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ETM_CATEGORY_NORMAL_ETM  }  },

 };

 

 /* PMZB200UNE_SP1T_BPI */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_12_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_11_block_info_set3[] = 

 {

    [0 ] = {  .asm_block_info       = { .category = MML1_CDF_COMMON_DEVICE_ASM_CATEGORY_NORMAL_SWITCH  }  },

 };

 

 /* FX6880_LNA_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_13_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_12_block_info_set3[] = 

 {

    [0 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

    [1 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

 };

 

 /* FX6730_LFEM_MIPI_CS */

-static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_14_block_info_set3[] = 

+static const MML1_CDF_COMMON_DEVICE_BLOCK_INFO_U mml1_custom_device_list_13_block_info_set3[] = 

 {

    [0 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

    [1 ] = {  .elna_block_info      = { .category = MML1_CDF_COMMON_DEVICE_ELNA_CATEGORY_NORMAL_ELNA  }  },

@@ -352,19 +346,19 @@
       .p_block_info  = mml1_custom_device_list_6_block_info_set3,

    },

 

-   /* Device 7: PMZB200UNE_SP1T_BPI */

+   /* Device 7: NZ5761S_ASM_BPI */

    [7] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id          = 7,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

       .proto_info.bpi_info = {

-         .bpi_0_mask                   = 0x0080,

-         .bpi_1_mask                   = 0x0000,

+         .bpi_0_mask                   = 0x0020,

+         .bpi_1_mask                   = 0x0040,

          .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

+         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_BBIC,

       },

       .p_block_info  = mml1_custom_device_list_7_block_info_set3,

    },

@@ -381,33 +375,16 @@
          .bpi_0_mask                   = 0x0020,

          .bpi_1_mask                   = 0x0040,

          .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

+         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_BBIC,

       },

       .p_block_info  = mml1_custom_device_list_8_block_info_set3,

    },

 

-   /* Device 9: NZ5761S_ASM_BPI */

+   /* Device 9: FX6880_PAMID_MIPI_CS */

    [9] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id          = 9,

-      .device_block_num     = 1,

-      .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

-      .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

-      .proto_info.bpi_info = {

-         .bpi_0_mask                   = 0x0020,

-         .bpi_1_mask                   = 0x0040,

-         .bpi_2_mask                   = 0x0000,

-         .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

-      },

-      .p_block_info  = mml1_custom_device_list_9_block_info_set3,

-   },

-

-   /* Device 10: FX6880_PAMID_MIPI_CS */

-   [10] = {

-      .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id          = 10,

+      .instance_id          = 9,

       .device_block_num     = 3,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -422,14 +399,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 0 },

       },

-      .p_block_info  = mml1_custom_device_list_10_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_9_block_info_set3,

    },

 

-   /* Device 11: MT6308H_VPA_MIPI */

-   [11] = {

+   /* Device 10: MT6308H_VPA_MIPI */

+   [10] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id          = 11,

+      .instance_id          = 10,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -444,14 +421,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 0 },

       },

-      .p_block_info  = mml1_custom_device_list_11_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_10_block_info_set3,

    },

 

-   /* Device 12: PMZB200UNE_SP1T_BPI */

-   [12] = {

+   /* Device 11: PMZB200UNE_SP1T_BPI */

+   [11] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

-      .instance_id          = 12,

+      .instance_id          = 11,

       .device_block_num     = 1,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_BPI,

@@ -461,14 +438,14 @@
          .bpi_2_mask                   = 0x0000,

          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

       },

-      .p_block_info  = mml1_custom_device_list_12_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_11_block_info_set3,

    },

 

-   /* Device 13: FX6880_LNA_MIPI_CS */

-   [13] = {

+   /* Device 12: FX6880_LNA_MIPI_CS */

+   [12] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id          = 13,

+      .instance_id          = 12,

       .device_block_num     = 2,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -483,14 +460,14 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 1 , mml1_custom_device_ctrig_list_2_info_set3 },

       },

-      .p_block_info  = mml1_custom_device_list_13_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_12_block_info_set3,

    },

 

-   /* Device 14: FX6730_LFEM_MIPI_CS */

-   [14] = {

+   /* Device 13: FX6730_LFEM_MIPI_CS */

+   [13] = {

       .device_intf          = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type          = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id          = 14,

+      .instance_id          = 13,

       .device_block_num     = 4,

       .device_vpa_source    = MML1_CDF_COMMON_DEVICE_VPA_SOURCE_INVALID,

       .proto                = MML1_CDF_COMMON_DEVICE_TRANSPORT_MIPI,

@@ -505,7 +482,7 @@
          .trans_port                   = MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,

          .initial_config_trigger_list  = { 1 , mml1_custom_device_ctrig_list_3_info_set3 },

       },

-      .p_block_info  = mml1_custom_device_list_14_block_info_set3,

+      .p_block_info  = mml1_custom_device_list_13_block_info_set3,

    },

 

 }; /* mml1_custom_device_list_set3 */

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.h
index 5442101..aceb4ab 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_device.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_device.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end device

 *

 * @details

@@ -65,7 +65,7 @@
 *******************************************************************************/

 

 /* ==== Devices ==== */

-#define MML1_CUSTOM_DEVICES_MAX_NUM_Set3              15

+#define MML1_CUSTOM_DEVICES_MAX_NUM_Set3              14

 

 /*******************************************************************************

 *  Global Functions Prototype (Interface)

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.c
index dab0c37..03c49ed 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_dpd_capability.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end DPD mode capability

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.h
index b1310ad..9ff8541 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_dpd_capability.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_dpd_capability.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 DPD capability

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.c
index 36b60e0..644e6f2 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_elna.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall eLNA database

 *

 * @details

@@ -72,10 +72,10 @@
       {   MML1_CDF_FE_ELNA_IDX7,                    4,                    3,                    3 },

       {   MML1_CDF_FE_ELNA_IDX8,                    4,                    0,                    3 },

       {   MML1_CDF_FE_ELNA_IDX9,                    4,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX10,                   13,                    0,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX11,                   13,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX12,                   14,                    1,                    3 },

-      {  MML1_CDF_FE_ELNA_IDX13,                   14,                    0,                    3 }

+      {  MML1_CDF_FE_ELNA_IDX10,                   12,                    0,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX11,                   12,                    1,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX12,                   13,                    1,                    3 },

+      {  MML1_CDF_FE_ELNA_IDX13,                   13,                    0,                    3 }

    }

 }; /* mml1_cdf_sku_mgr_elna_mapping_tbl_set3 */

 

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.h
index 02c6d51..a176c37 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_elna.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_elna.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end elna

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.c
index 04b269f..71a5bee 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_et_capability.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end ET mode capability

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.h
index 3281221..5168e39 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_et_capability.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_et_capability.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 ET capability

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.c
index 8755ebe..a24782e 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall ETM TPC setting usage, related to linkage.

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.h
index 4063aee..a369563 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end etm

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm_blk_db.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
index 12d0c52..cfc02f9 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_etm_blk_db.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_etm_blk_db.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall ETM block data base usage

 *

 * @details

@@ -167,7 +167,7 @@
 

 /* ======== Set3 ETM Block Order List

  * [0]   InstanceId   5: MT6308H_VPA_MIPI               block   0

- * [1]   InstanceId  11: MT6308H_VPA_MIPI               block   0

+ * [1]   InstanceId  10: MT6308H_VPA_MIPI               block   0

  * ======== */

 

 /* ETM 0: InstanceId   5, MT6308H_VPA_MIPI              , block   0 */

@@ -184,7 +184,7 @@
    MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC,        /* transport port */

 };

 

-/* ETM 1: InstanceId  11, MT6308H_VPA_MIPI              , block   0 */

+/* ETM 1: InstanceId  10, MT6308H_VPA_MIPI              , block   0 */

 static const MML1_CDF_FE_ETM_INFOR_T mml1_custom_fe_etm_info_etm1_Set3 =

 {

    4,                                                 /* MIPI port number */

@@ -203,7 +203,7 @@
 static const MML1_CDF_SKU_MGR_INTF_FE_ETM_BIAS_BLK_PARAM_T mml1_custom_fe_etm_bias_blk_param_Set3[] =

 {

    { &mml1_custom_fe_etm_info_etm0_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   },  /* ETM0  : Instance 5    MT6308H_VPA_MIPI               block 0   */

-   { &mml1_custom_fe_etm_info_etm1_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   }   /* ETM1  : Instance 11   MT6308H_VPA_MIPI               block 0   */

+   { &mml1_custom_fe_etm_info_etm1_Set3,  mml1_custom_fe_etm_bias_db_MT6308H_VPA_MIPI_0_Set3,          3   }   /* ETM1  : Instance 10   MT6308H_VPA_MIPI               block 0   */

 };

 

 /* ==== Set3 ETM Block DB ==== */

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.c
index 958e857..eb7f554 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall PA Bias setting usage, related to linkage.

 *

 * @details

@@ -397,6 +397,8 @@
 /* ==== Set3 Sub-Band Info 21

 * User(s):

 *   [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0_TX_MIMO_0 :: BW_20M

+*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

+*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting21_Set3[] =

 {

@@ -414,11 +416,11 @@
 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting22_Set3[] =

 {

-   { 703000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 715000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 720000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 728000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 733000, MML1_FE_PA_BIAS_DB_DATA15 }

+   { 711000, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 719000, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 725400, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 737500, MML1_FE_PA_BIAS_DB_DATA15 },

+   { 748000, MML1_FE_PA_BIAS_DB_DATA15 }

 };

 

 /* ==== Set3 Sub-Band Info 23

@@ -505,20 +507,6 @@
    { 3800000, MML1_FE_PA_BIAS_DB_DATA0 }

 };

 

-/* ==== Set3 Sub-Band Info 25

-* User(s):

-*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

-*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0_TX_MIMO_0 :: BW_20M

-*  ==== */

-static const MML1_CDF_FE_PA_BIAS_SUB_BAND_INFO_T mml1_custom_fe_pa_bias_db_setting25_Set3[] =

-{

-   { 887000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 894000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 901000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 908000, MML1_FE_PA_BIAS_DB_DATA15 },

-   { 915000, MML1_FE_PA_BIAS_DB_DATA15 }

-};

-

 /* ==== PA Bias Info Settings ==== */

 

 /* ==== Set3 Bias Info 0

@@ -972,6 +960,8 @@
 /* ==== Set3 Bias Info 22

 * User(s):

 *   [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0

+*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0

+*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0

 *  ==== */

 static const MML1_CDF_FE_PA_BIAS_INFO_T mml1_custom_fe_pa_bias_info_setting22_Set3 =

 {

@@ -1101,24 +1091,6 @@
    }

 };

 

-/* ==== Set3 Bias Info 27

-* User(s):

-*   [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0

-*   [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0

-*  ==== */

-static const MML1_CDF_FE_PA_BIAS_INFO_T mml1_custom_fe_pa_bias_info_setting27_Set3 =

-{

-   2,    /* PA Index */

-   1,    /* Number of BW */

-   5,    /* Number of sub-bands */

-   {

-      {

-         20000,   /* BW_20M */

-         mml1_custom_fe_pa_bias_db_setting25_Set3

-      },

-   }

-};

-

 /* ==== TX 1X1 PA Bias Setting Table ==== */

 

 static const MML1_CDF_FE_PA_BIAS_INFO_T* mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3[] =

@@ -1149,8 +1121,7 @@
    &mml1_custom_fe_pa_bias_info_setting23_Set3,

    &mml1_custom_fe_pa_bias_info_setting24_Set3,

    &mml1_custom_fe_pa_bias_info_setting25_Set3,

-   &mml1_custom_fe_pa_bias_info_setting26_Set3,

-   &mml1_custom_fe_pa_bias_info_setting27_Set3

+   &mml1_custom_fe_pa_bias_info_setting26_Set3

 }; /* mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3 */

 

 /* ==== TX 1X1 RAT-based Remapping Tables ==== */

@@ -1224,12 +1195,14 @@
    MML1_FE_PA_BIAS_DB_SETTING8,   /* [  3] [B] Set3_LTE_SB_RX-B7(2)-TX-B7(1)_LTE_B7_0 */

                                   /* [  3] [B] Set3_NR_SB_RX-N7(2)-TX-N7(1)_NR_B7_0 */

    MML1_FE_PA_BIAS_DB_SETTING22,  /* [  4] [B] Set3_NR_SB_RX-N8(2)-TX-N8(1)_NR_B8_0 */

+                                  /* [  4] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0 */

+                                  /* [  4] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0 */

    MML1_FE_PA_BIAS_DB_SETTING23,  /* [  5] [B] Set3_NR_SB_RX-N28(2)-TX-N28(1)_NR_B28_0 */

    MML1_FE_PA_BIAS_DB_SETTING24,  /* [  6] [D] Set3_NR_SB_RX-N41(2)-TX-N41(1)_NR_B41_0 */

                                   /* [  6] [B] Set3_NR_SB_RX-N41(4)-TX-N41(1)_NR_B41_0 */

    MML1_FE_PA_BIAS_DB_SETTING25,  /* [  7] [D] Set3_NR_SB_RX-N77(2)-TX-N77(1)_NR_B77_0 */

                                   /* [  7] [B] Set3_NR_SB_RX-N77(4)-TX-N77(1)_NR_B77_0 */

-   MML1_FE_PA_BIAS_DB_SETTING26,  /* [  8] [D] Set3_NR_SB_RX-N78(2)-TX-N78(1)_NR_B78_0 */

+   MML1_FE_PA_BIAS_DB_SETTING26   /* [  8] [D] Set3_NR_SB_RX-N78(2)-TX-N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_NR_SB_RX-N78(4)-TX-N78(1)_NR_B78_0 */

                                   /* [  8] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(0)N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(0)N78(1)_NR_B78_0 */

@@ -1247,8 +1220,6 @@
                                   /* [  8] [B] Set3_ENDC_2CA_RX-B8(2)N78(4)-TX-B8(1)N78(1)_NR_B78_0 */

                                   /* [  8] [D] Set3_ENDC_2CA_RX-B40(2)N78(2)-TX-B40(1)N78(1)_NR_B78_0 */

                                   /* [  8] [B] Set3_ENDC_2CA_RX-B40(2)N78(4)-TX-B40(1)N78(1)_NR_B78_0 */

-   MML1_FE_PA_BIAS_DB_SETTING27   /* [  9] [D] Set3_NR_2CA_RX-N8(2)N78(2)-TX-N8(1)N78(0)_NR_B8_0 */

-                                  /* [  9] [B] Set3_NR_2CA_RX-N8(2)N78(4)-TX-N8(1)N78(0)_NR_B8_0 */

 };

 

 /* ==== Overall TX 1X1 Remapping Table ==== */

@@ -1260,7 +1231,7 @@
    {   3, mml1_custom_fe_pa_bias_wcdma_remapping_tbl_Set3 },

    {   0, NULL },

    {  14, mml1_custom_fe_pa_bias_lte_remapping_tbl_Set3 },

-   {  10, mml1_custom_fe_pa_bias_nr_remapping_tbl_Set3 }

+   {   9, mml1_custom_fe_pa_bias_nr_remapping_tbl_Set3 }

 };

 

 /* ==== Overall TX 2X2 Table ==== */

@@ -1269,7 +1240,7 @@
 

 static const MML1_CDF_SKU_MGR_INTF_FE_PA_BIAS_PARAM_T mml1_custom_fe_pa_bias_setting_init_tbl_Set3 =

 {

-   mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3, 28,

+   mml1_custom_fe_pa_bias_1x1_setting_tbl_Set3, 27,

    NULL, 0,

    mml1_custom_fe_pa_bias_rat_remapping_tbl_Set3

 };

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.h
index 4e4db35..c61d5c7 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end pa bias

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
index b6fc19b..56b79f5 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_pa_bias_blk_db.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_pa_bias_blk_db.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      overall PA bias block data

 *

 * @details

@@ -179,16 +179,16 @@
    {

       /* DATA 0,       DATA 1,       DATA 2,       DATA 3,       DATA 4      */

       /*{addr, data}, {addr, data}, {addr, data}, {addr, data}, {addr, data} */

-      {{{0x00, 0x16}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

-      {{{0x00, 0x14}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

-      {{{0x00, 0x14}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

-      {{{0x00, 0x14}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

-      {{{0x00, 0x14}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

-      {{{0x00, 0x14}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

-      {{{0x00, 0x14}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

-      {{{0x00, 0x14}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

+      {{{0x00, 0x0E}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

+      {{{0x00, 0x0C}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

+      {{{0x00, 0x0C}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

+      {{{0x00, 0x0C}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

+      {{{0x00, 0x0C}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

+      {{{0x00, 0x0C}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

+      {{{0x00, 0x0C}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

+      {{{0x00, 0x0C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

       {{{0x00, 0x00}, {0x01, 0x00}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G10  */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G0   */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G1   */

@@ -209,16 +209,16 @@
    {

       /* DATA 0,       DATA 1,       DATA 2,       DATA 3,       DATA 4      */

       /*{addr, data}, {addr, data}, {addr, data}, {addr, data}, {addr, data} */

-      {{{0x00, 0x26}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

-      {{{0x00, 0x24}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

-      {{{0x00, 0x24}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

-      {{{0x00, 0x24}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

-      {{{0x00, 0x24}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

-      {{{0x00, 0x24}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

-      {{{0x00, 0x24}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

-      {{{0x00, 0x24}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

+      {{{0x00, 0x2E}, {0x01, 0x44}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G0   */

+      {{{0x00, 0x2C}, {0x01, 0x46}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G1   */

+      {{{0x00, 0x2C}, {0x01, 0x57}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G2   */

+      {{{0x00, 0x2C}, {0x01, 0x68}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G3   */

+      {{{0x00, 0x2C}, {0x01, 0x79}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G4   */

+      {{{0x00, 0x2C}, {0x01, 0x8B}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G5   */

+      {{{0x00, 0x2C}, {0x01, 0xAA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G6   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G7   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G8   */

+      {{{0x00, 0x2C}, {0x01, 0xDA}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G9   */

       {{{0x00, 0x00}, {0x01, 0x00}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* APT   G10  */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G0   */

       {{{0x00, 0x00}, {0x01, 0x9D}, {0x05, 0x01}, {0x03, 0x00}, {0x00, 0x00}}},  /* ET    G1   */

@@ -681,7 +681,7 @@
  * [0]   InstanceId   1: FX5596Y_TXM_MIPI               block   2

  * [1]   InstanceId   1: FX5596Y_TXM_MIPI               block   0

  * [2]   InstanceId   6: NZ5627K_MMMB_PA_MIPI           block   0

- * [3]   InstanceId  10: FX6880_PAMID_MIPI_CS           block   0

+ * [3]   InstanceId   9: FX6880_PAMID_MIPI_CS           block   0

  * ======== */

 

 /* PA 0: InstanceId   1, FX5596Y_TXM_MIPI              , block   2 */

@@ -717,7 +717,7 @@
    MML1_CDF_COMMON_DEVICE_TRANSPORT_PORT_RFIC         /* MIPI port source */

 };

 

-/* PA 3: InstanceId  10, FX6880_PAMID_MIPI_CS          , block   0 */

+/* PA 3: InstanceId   9, FX6880_PAMID_MIPI_CS          , block   0 */

 static const MML1_CDF_FE_PA_INFOR_T mml1_custom_fe_pa_info_pa3_Set3 =

 {

    4,                                                 /* MIPI port number */

@@ -734,7 +734,7 @@
    { &mml1_custom_fe_pa_info_pa0_Set3,    mml1_custom_fe_pa_bias_db_FX5596Y_TXM_MIPI_2_Set3,           1   },  /* PA0  : Instance 1    FX5596Y_TXM_MIPI               block 2   */

    { &mml1_custom_fe_pa_info_pa1_Set3,    mml1_custom_fe_pa_bias_db_FX5596Y_TXM_MIPI_0_Set3,           1   },  /* PA1  : Instance 1    FX5596Y_TXM_MIPI               block 0   */

    { &mml1_custom_fe_pa_info_pa2_Set3,    mml1_custom_fe_pa_bias_db_NZ5627K_MMMB_PA_MIPI_0_Set3,       17  },  /* PA2  : Instance 6    NZ5627K_MMMB_PA_MIPI           block 0   */

-   { &mml1_custom_fe_pa_info_pa3_Set3,    mml1_custom_fe_pa_bias_db_FX6880_PAMID_MIPI_CS_0_Set3,       1   }   /* PA3  : Instance 10   FX6880_PAMID_MIPI_CS           block 0   */

+   { &mml1_custom_fe_pa_info_pa3_Set3,    mml1_custom_fe_pa_bias_db_FX6880_PAMID_MIPI_CS_0_Set3,       1   }   /* PA3  : Instance 9    FX6880_PAMID_MIPI_CS           block 0   */

 };

 

 /* ==== Set3 PA Block DB ==== */

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.c
index f9f1623..ba1672c 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_route.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end route usage

 *

 * @details

@@ -1158,24 +1158,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_14_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_14_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -1192,7 +1174,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_14_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_14_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -1208,22 +1190,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_14_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_14_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_14_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_14_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_14_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_14_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_14_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_14_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_15_RX

 * Users:

@@ -1297,13 +1272,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_15_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_15_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_15_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_15_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_15_rx_node_list_set3 };

 

@@ -1439,24 +1414,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_17_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_17_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -1473,7 +1430,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_17_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_17_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -1489,22 +1446,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_17_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_17_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_17_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_17_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_17_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_17_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_17_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_17_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_18_RX

 * Users:

@@ -1578,13 +1528,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_18_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_18_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_18_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_18_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_18_rx_node_list_set3 };

 

@@ -2325,25 +2275,7 @@
       },

    },

 };

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_28_rx_node_3_block_static_params_set3[1] = 

-{

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_28_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_28_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -2359,22 +2291,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_28_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_28_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_28_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_28_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_28_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_28_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_28_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_28_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_29_RX

 * Users:

@@ -2445,13 +2370,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_29_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_29_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_29_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_29_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_29_rx_node_list_set3 };

 

@@ -3011,24 +2936,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_36_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_36_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 2 */

    [0] = { 

       .block_idx        = 0,

@@ -3045,7 +2952,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_36_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_36_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -3061,22 +2968,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_36_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_36_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_36_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_36_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_36_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_36_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_36_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_36_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_37_RX

 * Users:

@@ -3149,13 +3049,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_37_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_37_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_37_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_37_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_37_rx_node_list_set3 };

 

@@ -3672,27 +3572,27 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x01, .rf_port_ant_path = 0x01, .rf_port_band_group = 0x02, .validity = { [0] = 0x07, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_43_tx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 11 MT6308H_VPA_MIPI */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 10 MT6308H_VPA_MIPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id = 11,

+      .instance_id = 10,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_43_tx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 11 MT6308H_VPA_MIPI

-   /* Device FE: ID 12 PMZB200UNE_SP1T_BPI */

+   }, // Device FE: ID 10 MT6308H_VPA_MIPI

+   /* Device FE: ID 11 PMZB200UNE_SP1T_BPI */

    [3] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

-      .instance_id = 12,

+      .instance_id = 11,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_43_tx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 12 PMZB200UNE_SP1T_BPI

+   }, // Device FE: ID 11 PMZB200UNE_SP1T_BPI

 };/* mml1_custom_fe_route_43_tx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_43_tx_set3 = { MML1_CDF_SKU_MGR_INTF_TX_ROUTE, 4, mml1_custom_fe_route_43_tx_node_list_set3 };

 

@@ -3788,20 +3688,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x19, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_44_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_44_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_44_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_44_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_44_rx_node_list_set3 };

 

@@ -3897,20 +3797,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x17, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_45_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_45_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_45_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_45_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_45_rx_node_list_set3 };

 

@@ -3987,13 +3887,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0xFF, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_46_mrx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

 };/* mml1_custom_fe_route_46_mrx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_46_mrx_set3 = { MML1_CDF_SKU_MGR_INTF_MRX_ROUTE, 2, mml1_custom_fe_route_46_mrx_node_list_set3 };

 

@@ -4030,13 +3930,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x1B, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_47_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_47_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_47_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_47_rx_node_list_set3 };

 

@@ -4073,13 +3973,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x15, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_48_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_48_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_48_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_48_rx_node_list_set3 };

 

@@ -4123,24 +4023,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_49_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_49_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -4157,7 +4039,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_49_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_49_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4173,22 +4055,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_49_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_49_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_49_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_49_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_49_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_49_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_49_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_49_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_50_RX

 * Users:

@@ -4262,13 +4137,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_50_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_50_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_50_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_50_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_50_rx_node_list_set3 };

 

@@ -4311,24 +4186,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_51_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_51_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 1 */

    [0] = { 

       .block_idx        = 0,

@@ -4345,7 +4202,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_51_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_51_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4361,22 +4218,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_51_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_51_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_51_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_51_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_51_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_51_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_51_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_51_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_52_RX

 * Users:

@@ -4449,13 +4299,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_52_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_52_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_52_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_52_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_52_rx_node_list_set3 };

 

@@ -4497,24 +4347,6 @@
 };

 static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_53_rx_node_2_block_static_params_set3[1] = 

 {

-   /* Block [ 0] ASM :: Single-ON, portA = 0 */

-   [0] = { 

-      .block_idx        = 0,

-      .conflict_group   = MML1_CDF_DEVICE_FE_TR_NON_CONFLICT,

-      .block_type       = MML1_CDF_DEVICE_FE_BLOCK_IS_ASM_TYPE,

-      .params = {

-         .asm_params = {

-            .port_config_type = MML1_CDF_DEVICE_FE_ASM_PORT_CONFIG_SINGLE_TYPE,

-            .port_a           = 0,

-            .port_b           = 0,

-            .special_pin      = 0,

-            .is_dual_on_block = KAL_FALSE,

-         },

-      },

-   },

-};

-static const MML1_CDF_DEVICE_DRIVER_FE_INTF_BLOCK_STATIC_PARAM_T mml1_custom_fe_route_53_rx_node_3_block_static_params_set3[1] = 

-{

    /* Block [ 0] ASM :: Single-ON, portA = 2 */

    [0] = { 

       .block_idx        = 0,

@@ -4531,7 +4363,7 @@
       },

    },

 };

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_53_rx_node_list_set3[4] = 

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_NODE_T             mml1_custom_fe_route_53_rx_node_list_set3[3] = 

 { 

    /* Device RF: ID 0 MT6190 */

    [0] = {

@@ -4547,22 +4379,15 @@
       .instance_id = 2,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_53_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 2 FX3739_DS_MIPI_ES_PRX

-   /* Device FE: ID 7 PMZB200UNE_SP1T_BPI */

+   /* Device FE: ID 7 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_PMZB200UNE_SP1T_BPI,

+      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

       .instance_id = 7,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_53_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 7 PMZB200UNE_SP1T_BPI

-   /* Device FE: ID 8 NZ5761S_ASM_BPI */

-   [3] = {

-      .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

-      .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 8,

-      .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_53_rx_node_3_block_static_params_set3 } }

-   }, // Device FE: ID 8 NZ5761S_ASM_BPI

+   }, // Device FE: ID 7 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_53_rx_node_list_set3 */

-static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_53_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 4, mml1_custom_fe_route_53_rx_node_list_set3 };

+static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_53_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_53_rx_node_list_set3 };

 

 /* ==== Set3   FE_1X1_ROUTE_54_RX

 * Users:

@@ -4634,13 +4459,13 @@
       .instance_id = 4,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_54_rx_node_1_block_static_params_set3 } }

    }, // Device FE: ID 4 FX3739_DS_MIPI_ES_DRX

-   /* Device FE: ID 9 NZ5761S_ASM_BPI */

+   /* Device FE: ID 8 NZ5761S_ASM_BPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_NZ5761S_ASM_BPI,

-      .instance_id = 9,

+      .instance_id = 8,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_54_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 9 NZ5761S_ASM_BPI

+   }, // Device FE: ID 8 NZ5761S_ASM_BPI

 };/* mml1_custom_fe_route_54_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_54_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_54_rx_node_list_set3 };

 

@@ -4692,13 +4517,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x1B, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_55_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_55_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_55_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_55_rx_node_list_set3 };

 

@@ -4750,13 +4575,13 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x15, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 14 FX6730_LFEM_MIPI_CS */

+   /* Device FE: ID 13 FX6730_LFEM_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6730_LFEM_MIPI_CS,

-      .instance_id = 14,

+      .instance_id = 13,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_56_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 14 FX6730_LFEM_MIPI_CS

+   }, // Device FE: ID 13 FX6730_LFEM_MIPI_CS

 };/* mml1_custom_fe_route_56_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_56_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 2, mml1_custom_fe_route_56_rx_node_list_set3 };

 

@@ -4810,20 +4635,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x19, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_57_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_57_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_57_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_57_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_57_rx_node_list_set3 };

 

@@ -4877,20 +4702,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x17, .rf_port_ant_path = 0xFF, .rf_port_band_group = 0xFF, .validity = { [0] = 0xFF, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_58_rx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 13 FX6880_LNA_MIPI_CS */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 12 FX6880_LNA_MIPI_CS */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_LNA_MIPI_CS,

-      .instance_id = 13,

+      .instance_id = 12,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_58_rx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 13 FX6880_LNA_MIPI_CS

+   }, // Device FE: ID 12 FX6880_LNA_MIPI_CS

 };/* mml1_custom_fe_route_58_rx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_58_rx_set3 = { MML1_CDF_SKU_MGR_INTF_RX_ROUTE, 3, mml1_custom_fe_route_58_rx_node_list_set3 };

 

@@ -4977,20 +4802,20 @@
       .instance_id = 0,

       .static_params = { .rf_params = { .rf_port = 0x01, .rf_port_ant_path = 0x01, .rf_port_band_group = 0x02, .validity = { [0] = 0x07, [1] = 0xFF, [2] = 0xFF, [3] = 0xFF } } }

    }, // Device RF: ID 0 MT6190

-   /* Device FE: ID 10 FX6880_PAMID_MIPI_CS */

+   /* Device FE: ID 9 FX6880_PAMID_MIPI_CS */

    [1] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_FX6880_PAMID_MIPI_CS,

-      .instance_id = 10,

+      .instance_id = 9,

       .static_params = {  .fe_params = { .num_blocks = 2, .block_static_list = mml1_custom_fe_route_59_tx_node_1_block_static_params_set3 } }

-   }, // Device FE: ID 10 FX6880_PAMID_MIPI_CS

-   /* Device FE: ID 11 MT6308H_VPA_MIPI */

+   }, // Device FE: ID 9 FX6880_PAMID_MIPI_CS

+   /* Device FE: ID 10 MT6308H_VPA_MIPI */

    [2] = {

       .device_intf = MML1_CDF_COMMON_DEVICE_INTF_FE,

       .device_type.fe_type = MML1_CDF_DEVICE_DRIVER_FE_INTF_MT6308H_VPA_MIPI,

-      .instance_id = 11,

+      .instance_id = 10,

       .static_params = {  .fe_params = { .num_blocks = 1, .block_static_list = mml1_custom_fe_route_59_tx_node_2_block_static_params_set3 } }

-   }, // Device FE: ID 11 MT6308H_VPA_MIPI

+   }, // Device FE: ID 10 MT6308H_VPA_MIPI

 };/* mml1_custom_fe_route_59_tx_node_list_set3 */

 static const MML1_CDF_SKU_MGR_INTF_ROUTE_T                  mml1_custom_fe_route_59_tx_set3 = { MML1_CDF_SKU_MGR_INTF_TX_ROUTE, 3, mml1_custom_fe_route_59_tx_node_list_set3 };

 

@@ -6558,7 +6383,7 @@
    .rx_route_idx             = { MML1_FE_RX_2X2_ROUTE4, MML1_FE_RX_2X2_ROUTE28 },

    .tx_band                  = { { MMRF_UNI_RAT_5G, MMRF_UNI_BAND8 }, { MMRF_UNI_RAT_INVAILD, MMRF_UNI_BANDNONE } },

    .tx_route_idx             = { MML1_FE_TX_MRX_1X1_ROUTE4, MML1_FE_ROUTE_INVALID },

-   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING9, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

+   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING4, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

    .etm_bias_setting_idx     = { MML1_FE_ETM_BIAS_1X1_RAT_SETTING1, MML1_FE_ETM_BIAS_RAT_INVALID_SETTING },

    .hash_key                 = 28,

    .fe_timing_info           = { .fe_timing_hash_tbl_idx = { FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX_INVALID, FE_TIMING_COLLECTION_IDX_INVALID } },

@@ -6573,7 +6398,7 @@
    .rx_route_idx             = { MML1_FE_RX_2X2_ROUTE4, MML1_FE_RX_4X4_ROUTE7 },

    .tx_band                  = { { MMRF_UNI_RAT_5G, MMRF_UNI_BAND8 }, { MMRF_UNI_RAT_INVAILD, MMRF_UNI_BANDNONE } },

    .tx_route_idx             = { MML1_FE_TX_MRX_1X1_ROUTE4, MML1_FE_ROUTE_INVALID },

-   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING9, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

+   .pa_bias_setting_idx      = { MML1_FE_PA_BIAS_1X1_RAT_SETTING4, MML1_FE_PA_BIAS_RAT_INVALID_SETTING },

    .etm_bias_setting_idx     = { MML1_FE_ETM_BIAS_1X1_RAT_SETTING1, MML1_FE_ETM_BIAS_RAT_INVALID_SETTING },

    .hash_key                 = 28,

    .fe_timing_info           = { .fe_timing_hash_tbl_idx = { FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX1, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX0, FE_TIMING_COLLECTION_IDX_INVALID, FE_TIMING_COLLECTION_IDX_INVALID } },

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.h
index 987c613..5ce2a49 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_route.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_route.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      Header of mml1 front-end route usage

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.c
index e479611..4015d3e 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_timing.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      mml1 front-end timing settings

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.h
index ed0d5a7..57ab0e0 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/SKUCodeGen/mml1_custom_fe_timing.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_fe_timing.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      header of mml1 front-end timing

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_mipi_ant_database.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_mipi_ant_database.c
index efafbe1..85480ad 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_mipi_ant_database.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_mipi_ant_database.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_mipi_ant_database.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT MIPI

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.c
index 39fcfb4..9470c64 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      FDD/TDD RF ANT TUNER SETTING

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.h
index acb777f..ab74bc4 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_database.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_database.c
index 7e5e6f3..4333a7b 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_database.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_database.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_database.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT database

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.c
index 6ff8f2d..65a9e9c 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_hw_type3.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.h
index 7c221fe..895e917 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_ant_hw_type3.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_ant_hw_type3.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT TAS

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.c b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.c
index b149331..3a98a4c 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.c
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.c
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_dat.c

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT DAT

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.h b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.h
index 43b8133..de373f1 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.h
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/CG_Files/Toolgen/mml1_custom_rf_dat.h
@@ -41,7 +41,7 @@
 /*******************************************************************************

 * @file       mml1_custom_rf_dat.h

 * @author     MFEKit_v0.7.4

-* @date       2024/06/04 17:17:01

+* @date       2024/06/24 14:03:15

 * @brief      ANT DAT

 *

 * @details

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/PA_Bias_Configs/PA_BIAS_DB_NZ5627K_MMMB_PA_MIPI_BLK_Idx_0.xlsx b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/PA_Bias_Configs/PA_BIAS_DB_NZ5627K_MMMB_PA_MIPI_BLK_Idx_0.xlsx
index dcd188e..52602bd 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/PA_Bias_Configs/PA_BIAS_DB_NZ5627K_MMMB_PA_MIPI_BLK_Idx_0.xlsx
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/PA_Bias_Configs/PA_BIAS_DB_NZ5627K_MMMB_PA_MIPI_BLK_Idx_0.xlsx
Binary files differ
diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/SKU_Configs/GEN97_global_sku_set3.xml b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/SKU_Configs/GEN97_global_sku_set3.xml
index ab448ce..709eef0 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/SKU_Configs/GEN97_global_sku_set3.xml
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/SKU_Configs/GEN97_global_sku_set3.xml
@@ -108824,11 +108824,11 @@
 					<BandWidth name="BW_200M" enable="false"/>								

 				</BandWidth_Setting>									

 				<SubBand_Setting>									

-					<SubBand name="sub_band0" frequency="703"/>								

-					<SubBand name="sub_band1" frequency="715"/>								

-					<SubBand name="sub_band2" frequency="720"/>								

-					<SubBand name="sub_band3" frequency="728"/>								

-					<SubBand name="sub_band4" frequency="733"/>								

+					<SubBand name="sub_band0" frequency="711"/>								

+					<SubBand name="sub_band1" frequency="719"/>								

+					<SubBand name="sub_band2" frequency="725.4"/>								

+					<SubBand name="sub_band3" frequency="737.5"/>								

+					<SubBand name="sub_band4" frequency="748"/>								

 				</SubBand_Setting>									

 			</PA_Bias_Setting>										

 			<ETM_Bias_Setting>										

diff --git a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/Saved_Files_/L805A_CN_SET3.png b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/Saved_Files_/L805A_CN_SET3.png
index 1484e92..7051654 100644
--- a/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/Saved_Files_/L805A_CN_SET3.png
+++ b/mcu/custom/l1/tools/MFEKit/Configs/MT6885_MMRF_MT6190_EVB/Set3/Saved_Files_/L805A_CN_SET3.png
Binary files differ
diff --git a/mcu/custom/l1/tools/MFEKit/Logs/mfekit_log.txt b/mcu/custom/l1/tools/MFEKit/Logs/mfekit_log.txt
index 597a05e..15175bd 100644
--- a/mcu/custom/l1/tools/MFEKit/Logs/mfekit_log.txt
+++ b/mcu/custom/l1/tools/MFEKit/Logs/mfekit_log.txt
Binary files differ
diff --git "a/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak" "b/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
index 0d687af..59aeee3 100644
--- "a/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
+++ "b/mcu/make/projects/MOBILETEK35_IVT_T800\050NLWG_WIDE_TEMP_CUSTOM\051.mak"
@@ -3195,7 +3195,7 @@
 
 ORIGINAL_VERNO = MOLY.NR15.R3.MD700.MP.V75.P12
 
-VERNO = MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240604.20240618
+VERNO = MOLY.NR15.R3.MD700.MP.V75.P12.L805A.L1.240624.20240624
 CUSTOMER_LABEL = MOLY.NR15.R3.MD700.MP.V75_MOBILETEK35.IVT.T800_P12