Added new SVC trim equation for new samples

nxp-wei-feng · mmahadevan108 · commit ba6f9fb6ffde · 2025-06-25T10:02:26.000-06:00
Signed-off-by: Feng Wei &lt;wei.feng@nxp.com&gt;
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/CMakeLists.txt b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/CMakeLists.txt
@@ -46,7 +46,7 @@ if (CONFIG_MCUX_COMPONENT_driver.ocotp_rw61x)
 endif()
 
 if (CONFIG_MCUX_COMPONENT_driver.power)
-    mcux_component_version(2.5.0)
+    mcux_component_version(2.5.1)
     mcux_add_source( SOURCES fsl_power.c fsl_power.h )
     mcux_add_include( INCLUDES . )
 endif()
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/fsl_power.c b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/fsl_power.c
@@ -52,6 +52,10 @@
         *((volatile uint32_t *)(addr)) = (val); \
     } while (false)
 
+#define POWER_SAVED_GDET_CLOCK_SOURCE (s_gdetCfgData.TRIM0 & CLKCTL0_ELS_GDET_CLK_SEL_SEL_MASK)
+#define POWER_GDET_CLOCK_SOURCE_64MHZ (CLKCTL0_ELS_GDET_CLK_SEL_SEL(2U))
+#define POWER_GDET_CLOCK_SOURCE_32MHZ (CLKCTL0_ELS_GDET_CLK_SEL_SEL(3U))
+
 typedef struct _power_nvic_context
 {
     uint32_t PriorityGroup;
@@ -1229,6 +1233,8 @@ void Power_InitLoadGdetCfg(power_load_gdet_cfg loadFunc, const power_gdet_data_t
 
     s_gdetCfgloadFunc = loadFunc;
     (void)memcpy(&s_gdetCfgData, data, sizeof(power_gdet_data_t));
+    /* Save GDET clock source on startup */
+    s_gdetCfgData.TRIM0  = CLKCTL0->ELS_GDET_CLK_SEL;
     s_gdetCfgData.CFG[3] = POWER_TrimSvc(data->CFG[3], pack);
 }
 
@@ -1426,24 +1432,36 @@ uint32_t POWER_TrimSvc(uint32_t gdetTrim, uint32_t pack)
         /* A2 */
         /* Autotrim value at [7:0] */
         x = (int32_t)(uint32_t)(gdetTrim & 0xFFUL);
-        if (pack == 0U)
+        if (POWER_SAVED_GDET_CLOCK_SOURCE == POWER_GDET_CLOCK_SOURCE_64MHZ)
         {
-            /* QFN */
-            y1 = (18 * x * x) + (801 * x) + 437290;
-            y3 = y1 / 10000;
+            if (pack == 0U)
+            {
+                /* QFN */
+                y1 = (18 * x * x) + (801 * x) + 437290;
+                y3 = y1 / 10000;
+            }
+            else if (pack == 1U)
+            {
+                /* CSP */
+                y1 = (82 * x * x) - (5171 * x) + 559320;
+                y3 = y1 / 10000;
+            }
+            else
+            {
+                /* BGA */
+                assert(pack == 2U);
+                y1 = (25 * x * x) + (1337 * x) + 381140;
+                y3 = y1 / 10000;
+            }
         }
-        else if (pack == 1U)
+        else if (POWER_SAVED_GDET_CLOCK_SOURCE == POWER_GDET_CLOCK_SOURCE_32MHZ)
         {
-            /* CSP */
-            y1 = (82 * x * x) - (5171 * x) + 559320;
+            y1 = (-63 * x * x) + (10961 * x) + 265000;
             y3 = y1 / 10000;
         }
         else
         {
-            /* BGA */
-            assert(pack == 2U);
-            y1 = (25 * x * x) + (1337 * x) + 381140;
-            y3 = y1 / 10000;
+            assert(false);
         }
 
         trimSvc = ((uint32_t)y3) << 24;
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/fsl_power.h b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW610/drivers/fsl_power.h
@@ -23,8 +23,8 @@
 
 /*! @name Driver version */
 /*@{*/
-/*! @brief POWER driver version 2.5.0. */
-#define FSL_POWER_DRIVER_VERSION (MAKE_VERSION(2, 5, 0))
+/*! @brief POWER driver version 2.5.1. */
+#define FSL_POWER_DRIVER_VERSION (MAKE_VERSION(2, 5, 1))
 /*@}*/
 
 /*!
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/CMakeLists.txt b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/CMakeLists.txt
@@ -46,7 +46,7 @@ if (CONFIG_MCUX_COMPONENT_driver.ocotp_rw61x)
 endif()
 
 if (CONFIG_MCUX_COMPONENT_driver.power)
-    mcux_component_version(2.5.0)
+    mcux_component_version(2.5.1)
     mcux_add_source( SOURCES fsl_power.c fsl_power.h )
     mcux_add_include( INCLUDES . )
 endif()
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/fsl_power.c b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/fsl_power.c
@@ -52,6 +52,10 @@
         *((volatile uint32_t *)(addr)) = (val); \
     } while (false)
 
+#define POWER_SAVED_GDET_CLOCK_SOURCE (s_gdetCfgData.TRIM0 & CLKCTL0_ELS_GDET_CLK_SEL_SEL_MASK)
+#define POWER_GDET_CLOCK_SOURCE_64MHZ (CLKCTL0_ELS_GDET_CLK_SEL_SEL(2U))
+#define POWER_GDET_CLOCK_SOURCE_32MHZ (CLKCTL0_ELS_GDET_CLK_SEL_SEL(3U))
+
 typedef struct _power_nvic_context
 {
     uint32_t PriorityGroup;
@@ -1229,6 +1233,8 @@ void Power_InitLoadGdetCfg(power_load_gdet_cfg loadFunc, const power_gdet_data_t
 
     s_gdetCfgloadFunc = loadFunc;
     (void)memcpy(&s_gdetCfgData, data, sizeof(power_gdet_data_t));
+    /* Save GDET clock source on startup */
+    s_gdetCfgData.TRIM0  = CLKCTL0->ELS_GDET_CLK_SEL;
     s_gdetCfgData.CFG[3] = POWER_TrimSvc(data->CFG[3], pack);
 }
 
@@ -1426,24 +1432,36 @@ uint32_t POWER_TrimSvc(uint32_t gdetTrim, uint32_t pack)
         /* A2 */
         /* Autotrim value at [7:0] */
         x = (int32_t)(uint32_t)(gdetTrim & 0xFFUL);
-        if (pack == 0U)
+        if (POWER_SAVED_GDET_CLOCK_SOURCE == POWER_GDET_CLOCK_SOURCE_64MHZ)
         {
-            /* QFN */
-            y1 = (18 * x * x) + (801 * x) + 437290;
-            y3 = y1 / 10000;
+            if (pack == 0U)
+            {
+                /* QFN */
+                y1 = (18 * x * x) + (801 * x) + 437290;
+                y3 = y1 / 10000;
+            }
+            else if (pack == 1U)
+            {
+                /* CSP */
+                y1 = (82 * x * x) - (5171 * x) + 559320;
+                y3 = y1 / 10000;
+            }
+            else
+            {
+                /* BGA */
+                assert(pack == 2U);
+                y1 = (25 * x * x) + (1337 * x) + 381140;
+                y3 = y1 / 10000;
+            }
         }
-        else if (pack == 1U)
+        else if (POWER_SAVED_GDET_CLOCK_SOURCE == POWER_GDET_CLOCK_SOURCE_32MHZ)
         {
-            /* CSP */
-            y1 = (82 * x * x) - (5171 * x) + 559320;
+            y1 = (-63 * x * x) + (10961 * x) + 265000;
             y3 = y1 / 10000;
         }
         else
         {
-            /* BGA */
-            assert(pack == 2U);
-            y1 = (25 * x * x) + (1337 * x) + 381140;
-            y3 = y1 / 10000;
+            assert(false);
         }
 
         trimSvc = ((uint32_t)y3) << 24;
diff --git a/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/fsl_power.h b/mcux/mcux-sdk-ng/devices/Wireless/RW/RW612/drivers/fsl_power.h
@@ -23,8 +23,8 @@
 
 /*! @name Driver version */
 /*@{*/
-/*! @brief POWER driver version 2.5.0. */
-#define FSL_POWER_DRIVER_VERSION (MAKE_VERSION(2, 5, 0))
+/*! @brief POWER driver version 2.5.1. */
+#define FSL_POWER_DRIVER_VERSION (MAKE_VERSION(2, 5, 1))
 /*@}*/
 
 /*!
