diff --git a/components/esp_phy/Kconfig b/components/esp_phy/Kconfig
index 29735914bf2..85aa913b80b 100644
--- a/components/esp_phy/Kconfig
+++ b/components/esp_phy/Kconfig
@@ -205,4 +205,45 @@ menu "PHY"
             PLL track helps the PHY module adapt to temperature changes, ensuring stable performance.
             When pll enabled, the ESP PHY module will periodically track and adjust PLL parameters.
 
+        config ESP_PHY_PLL_TRACK_TEMP_DEBUG
+            bool "PHY temperature tracking debug mode"
+            depends on ESP_PHY_DEBUG
+            default n
+            help
+                If enabled, allows customization of temperature delta for PHY track pll.
+
+        config ESP_PHY_PLL_TRACK_TEMP_DEBUG_FLAG
+            int "Debug flag for PHY temperature tracking"
+            depends on ESP_PHY_PLL_TRACK_TEMP_DEBUG
+            range 1 3
+            default 1
+            help
+                Bitmask debug flag passed to the PHY temperature tracking routine.
+                Each bit enables a specific tracking mode.
+
+                - bit0: PLL tracking
+                - bit1: Calibration parameter tracking
+
+        config ESP_PHY_PLL_TRACK_TEMP_DELTA
+            int "Temperature delta for PHY track pll"
+            depends on ESP_PHY_PLL_TRACK_TEMP_DEBUG
+            range 0 255
+            default 10
+            help
+                Set the temperature delta for PHY track pll.
+
+        config ESP_PHY_INIT_IRAM
+            bool "Place PHY (de)init in IRAM"
+            depends on SOC_IEEE802154_BLE_ONLY
+            default n
+            help
+                Select this option to place esp_phy and PHY library functions related to phy_init in IRAM.
+                This config applies to ESP32-H2, ESP32-H21, and ESP32-H4.
+
+        config ESP_PHY_ENABLE_VERSION_PRINT
+            bool "Print PHY version"
+            default y
+            help
+                Select to print PHY version in esp_phy_enable. This config only applies to esp32hxx for now.
+
 endmenu  # PHY
diff --git a/components/esp_phy/include/esp_private/phy.h b/components/esp_phy/include/esp_private/phy.h
index 29581b643d0..32d1505f428 100644
--- a/components/esp_phy/include/esp_private/phy.h
+++ b/components/esp_phy/include/esp_private/phy.h
@@ -203,6 +203,23 @@ void phy_wakeup_from_modem_state_extra_init(void);
 void esp_phy_modem_rf_flag_update(void);
 #endif
 
+
+/**
+ * @brief Wait for frequency hardware hop to complete
+ *
+ */
+void phy_wait_freq_hw_hop_done(void);
+
+#if CONFIG_ESP_PHY_PLL_TRACK_TEMP_DEBUG
+/**
+ * @brief Set the temperature delta for PHY track pll
+ *
+ * @param     debug_flag  Debug flag for PHY temperature tracking
+ * @param     track_temp   Temperature delta for PHY temperature tracking
+ */
+void phy_track_temp_debug(uint8_t debug_flag, uint8_t track_temp);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/esp_phy/src/phy_common.c b/components/esp_phy/src/phy_common.c
index 58e960c6f8d..e395274684b 100644
--- a/components/esp_phy/src/phy_common.c
+++ b/components/esp_phy/src/phy_common.c
@@ -150,3 +150,9 @@ void phy_wakeup_from_modem_state_extra_init(void)
     temperature_sensor_ll_enable(true);
 }
 #endif
+
+__attribute__((weak)) void phy_wait_freq_hw_hop_done(void)
+{
+    ESP_LOGD(TAG, "phy_wait_freq_hw_hop_done is not implemented");
+    return;
+}
diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c
index ca2b9db813e..e291ca00349 100644
--- a/components/esp_phy/src/phy_init.c
+++ b/components/esp_phy/src/phy_init.c
@@ -328,6 +328,9 @@ void esp_phy_enable(esp_phy_modem_t modem)
         assert(phy_module_has_clock_bits(PHY_INIT_MODEM_CLOCK_REQUIRED_BITS));
         if (s_is_phy_calibrated == false) {
             esp_phy_load_cal_and_init();
+#if CONFIG_ESP_PHY_PLL_TRACK_TEMP_DEBUG
+            phy_track_temp_debug(CONFIG_ESP_PHY_PLL_TRACK_TEMP_DEBUG_FLAG, CONFIG_ESP_PHY_PLL_TRACK_TEMP_DELTA);
+#endif
             s_is_phy_calibrated = true;
         } else {
 #if SOC_PM_SUPPORT_PMU_MODEM_STATE && CONFIG_ESP_WIFI_ENHANCED_LIGHT_SLEEP
@@ -409,6 +412,7 @@ void esp_phy_disable(esp_phy_modem_t modem)
         // Update WiFi MAC time before disable WiFi/BT common peripheral clock
         phy_update_wifi_mac_time(true, esp_timer_get_time());
 #endif
+        phy_wait_freq_hw_hop_done();
         // Disable WiFi/BT common peripheral clock. Do not disable clock for hardware RNG
         esp_phy_common_clock_disable();
     }
diff --git a/components/esp_phy/src/phy_init_esp32hxx.c b/components/esp_phy/src/phy_init_esp32hxx.c
index 727cb8c8d59..c1fa7b5325a 100644
--- a/components/esp_phy/src/phy_init_esp32hxx.c
+++ b/components/esp_phy/src/phy_init_esp32hxx.c
@@ -118,6 +118,9 @@ void esp_phy_enable(esp_phy_modem_t modem)
         if (!s_phy_is_enabled) {
             register_chipv7_phy(NULL, NULL, PHY_RF_CAL_FULL);
             phy_version_print();
+#if CONFIG_ESP_PHY_PLL_TRACK_TEMP_DEBUG
+            phy_track_temp_debug(CONFIG_ESP_PHY_PLL_TRACK_TEMP_DEBUG_FLAG, CONFIG_ESP_PHY_PLL_TRACK_TEMP_DELTA);
+#endif
             s_phy_is_enabled = true;
         } else {
             phy_wakeup_init();
@@ -153,6 +156,7 @@ void esp_phy_disable(esp_phy_modem_t modem)
 #endif
         phy_close_rf();
         phy_xpd_tsens();
+        phy_wait_freq_hw_hop_done();
 #if SOC_MODEM_CLOCK_IS_INDEPENDENT
         modem_clock_module_disable(PERIPH_PHY_MODULE);
 #endif