diff --git a/components/esp_hw_support/include/esp_private/esp_modem_clock.h b/components/esp_hw_support/include/esp_private/esp_modem_clock.h
index d84129b5a0..8de079ecb6 100644
--- a/components/esp_hw_support/include/esp_private/esp_modem_clock.h
+++ b/components/esp_hw_support/include/esp_private/esp_modem_clock.h
@@ -16,6 +16,7 @@
 #include "hal/modem_clock_types.h"
 #include "esp_private/esp_pmu.h"
 #include "esp_private/critical_section.h"
+#include "esp_macros.h"
 
 #if SOC_MODEM_CLOCK_SUPPORTED
 #include "hal/modem_clock_hal.h"
@@ -57,6 +58,28 @@ typedef enum {
     MODEM_CLOCK_DEVICE_MAX
 } modem_clock_device_t;
 
+#define MODEM_CLOCK(dev) BIT(MODEM_CLOCK_##dev)
+
+#define MODEM_CLOCKS_1(a)                  MODEM_CLOCK(a)
+#define MODEM_CLOCKS_2(a, b)               MODEM_CLOCK(a) | MODEM_CLOCK(b)
+#define MODEM_CLOCKS_3(a, b, c)            MODEM_CLOCK(a) | MODEM_CLOCKS_2(b, c)
+#define MODEM_CLOCKS_4(a, b, c, d)         MODEM_CLOCK(a) | MODEM_CLOCKS_3(b, c, d)
+#define MODEM_CLOCKS_5(a, b, c, d, ...)    MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_1(__VA_ARGS__)
+#define MODEM_CLOCKS_6(a, b, c, d, ...)    MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_2(__VA_ARGS__)
+#define MODEM_CLOCKS_7(a, b, c, d, ...)    MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_3(__VA_ARGS__)
+#define MODEM_CLOCKS_8(a, b, c, d, ...)    MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_4(__VA_ARGS__)
+#define MODEM_CLOCKS_9(a, b, c, d, ...)    MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_5(__VA_ARGS__)
+#define MODEM_CLOCKS_10(a, b, c, d, ...)   MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_6(__VA_ARGS__)
+#define MODEM_CLOCKS_11(a, b, c, d, ...)   MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_7(__VA_ARGS__)
+#define MODEM_CLOCKS_12(a, b, c, d, ...)   MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_8(__VA_ARGS__)
+#define MODEM_CLOCKS_13(a, b, c, d, ...)   MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_9(__VA_ARGS__)
+#define MODEM_CLOCKS_14(a, b, c, d, ...)   MODEM_CLOCKS_4(a, b, c, d) | MODEM_CLOCKS_10(__VA_ARGS__)
+
+#define MODEM_CLOCKS_N(n)                  MODEM_CLOCKS_##n
+#define MODEM_CLOCKS_DISPATCH(n, ...)      MODEM_CLOCKS_N(n)(__VA_ARGS__)
+#define MODEM_CLOCKS(...) \
+    MODEM_CLOCKS_DISPATCH(ESP_VA_NARG(__VA_ARGS__), __VA_ARGS__)
+
 #define MODEM_STATUS_IDLE           (0)
 #define MODEM_STATUS_WIFI_INITED    (0x1UL)
 
diff --git a/components/esp_hw_support/port/esp32c5/modem_clock_impl.c b/components/esp_hw_support/port/esp32c5/modem_clock_impl.c
index bcb965d0d2..30c5137187 100644
--- a/components/esp_hw_support/port/esp32c5/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32c5/modem_clock_impl.c
@@ -11,19 +11,19 @@
 #include "esp_private/regi2c_ctrl.h"
 
 /* Clock dependency definitions */
-#define WIFI_CLOCK_DEPS         (BIT(MODEM_CLOCK_WIFI_MAC) | BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_COEXIST))
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define WIFI_CLOCK_DEPS                     ( MODEM_CLOCKS( WIFI_MAC, WIFI_APB, WIFI_BB, WIFI_BB_44M, COEXIST ) )
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_APB, WIFI_BB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M, BT_I154_COMMON_BB ) )
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {
diff --git a/components/esp_hw_support/port/esp32c6/modem_clock_impl.c b/components/esp_hw_support/port/esp32c6/modem_clock_impl.c
index de86e9def6..7b8a257250 100644
--- a/components/esp_hw_support/port/esp32c6/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32c6/modem_clock_impl.c
@@ -11,19 +11,19 @@
 #include "esp_private/regi2c_ctrl.h"
 
 /* Clock dependency definitions */
-#define WIFI_CLOCK_DEPS         (BIT(MODEM_CLOCK_WIFI_MAC) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_COEXIST))
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_BB))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  (BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define WIFI_CLOCK_DEPS                     ( MODEM_CLOCKS( WIFI_MAC, WIFI_BB, COEXIST ) )
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_BB ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( BT_I154_COMMON_BB ) )
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {
diff --git a/components/esp_hw_support/port/esp32c61/modem_clock_impl.c b/components/esp_hw_support/port/esp32c61/modem_clock_impl.c
index a960d95bfc..5eca8a62f7 100644
--- a/components/esp_hw_support/port/esp32c61/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32c61/modem_clock_impl.c
@@ -12,39 +12,39 @@
 
 /* Clock dependency definitions */
 #if SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT
-#define WIFI_CLOCK_DEPS         (BIT(MODEM_CLOCK_WIFI_MAC) | BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_COEXIST))
+#define WIFI_CLOCK_DEPS                     ( MODEM_CLOCKS( WIFI_MAC, WIFI_APB, WIFI_BB, WIFI_BB_44M, COEXIST ) )
 #else
-#define WIFI_CLOCK_DEPS         (BIT(MODEM_CLOCK_WIFI_MAC) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_COEXIST))
+#define WIFI_CLOCK_DEPS                     ( MODEM_CLOCKS( WIFI_MAC, WIFI_BB, COEXIST ) )
 #endif
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
 #if ANA_I2C_MST_CLK_HAS_ROOT_GATING
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
 #else
-#define I2C_ANA_MST_CLOCK_DEPS  (0)
+#define I2C_ANA_MST_CLOCK_DEPS              (0)
 #endif
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
 #if SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_APB, WIFI_BB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M, BT_I154_COMMON_BB ) )
 #else
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_BB))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  (BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_BB ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( BT_I154_COMMON_BB ) )
 #endif
 #ifndef SOC_WIFI_SUPPORTED
 #undef  PHY_CALIBRATION_WIFI_CLOCK_DEPS
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     0
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( 0 )
 #endif
 #if !defined(SOC_BT_SUPPORTED) && !defined(SOC_IEEE802154_SUPPORTED)
 #undef  PHY_CALIBRATION_BT_I154_CLOCK_DEPS
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  0
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( 0 )
 #endif
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {
diff --git a/components/esp_hw_support/port/esp32h2/modem_clock_impl.c b/components/esp_hw_support/port/esp32h2/modem_clock_impl.c
index 9a79344418..ca8260df81 100644
--- a/components/esp_hw_support/port/esp32h2/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32h2/modem_clock_impl.c
@@ -14,18 +14,18 @@
 #endif // CONFIG_IDF_TARGET_ESP32H2
 
 /* Clock dependency definitions */
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS (BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     0
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( BT_I154_COMMON_BB ) )
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( 0 )
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {
diff --git a/components/esp_hw_support/port/esp32h21/modem_clock_impl.c b/components/esp_hw_support/port/esp32h21/modem_clock_impl.c
index 232e5a16b6..b754ff7c47 100644
--- a/components/esp_hw_support/port/esp32h21/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32h21/modem_clock_impl.c
@@ -11,36 +11,36 @@
 #include "esp_private/regi2c_ctrl.h"
 
 /* Clock dependency definitions */
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
 #if ANA_I2C_MST_CLK_HAS_ROOT_GATING
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
 #else
-#define I2C_ANA_MST_CLOCK_DEPS  (0)
+#define I2C_ANA_MST_CLOCK_DEPS              (0)
 #endif
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
 #if SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT
-#define PHY_CALIBRATION_CLOCK_DEPS      (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_CLOCK_DEPS          ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_APB, WIFI_BB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M, BT_I154_COMMON_BB ) )
 #else
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_BB))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS (BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_BB ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( BT_I154_COMMON_BB ) )
 #endif
 #ifndef SOC_WIFI_SUPPORTED
 #undef  PHY_CALIBRATION_WIFI_CLOCK_DEPS
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     0
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( 0 )
 #endif
 #if !defined(SOC_BT_SUPPORTED) && !defined(SOC_IEEE802154_SUPPORTED)
 #undef  PHY_CALIBRATION_BT_I154_CLOCK_DEPS
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS 0
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( 0 )
 #endif
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {
diff --git a/components/esp_hw_support/port/esp32h4/modem_clock_impl.c b/components/esp_hw_support/port/esp32h4/modem_clock_impl.c
index 1f0b1ea59f..caf2f6b59c 100644
--- a/components/esp_hw_support/port/esp32h4/modem_clock_impl.c
+++ b/components/esp_hw_support/port/esp32h4/modem_clock_impl.c
@@ -11,36 +11,36 @@
 #include "esp_private/regi2c_ctrl.h"
 
 /* Clock dependency definitions */
-#define BLE_CLOCK_DEPS          (BIT(MODEM_CLOCK_BLE_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define IEEE802154_CLOCK_DEPS   (BIT(MODEM_CLOCK_802154_MAC) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB) | BIT(MODEM_CLOCK_ETM) | BIT(MODEM_CLOCK_COEXIST))
-#define COEXIST_CLOCK_DEPS      (BIT(MODEM_CLOCK_COEXIST))
+#define BLE_CLOCK_DEPS                      ( MODEM_CLOCKS( BLE_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define IEEE802154_CLOCK_DEPS               ( MODEM_CLOCKS( 802154_MAC, BT_I154_COMMON_BB, ETM, COEXIST ) )
+#define COEXIST_CLOCK_DEPS                  ( MODEM_CLOCKS( COEXIST ) )
 #if ANA_I2C_MST_CLK_HAS_ROOT_GATING
-#define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
+#define I2C_ANA_MST_CLOCK_DEPS              ( MODEM_CLOCKS( I2C_MASTER ) )
 #else
-#define I2C_ANA_MST_CLOCK_DEPS  (0)
+#define I2C_ANA_MST_CLOCK_DEPS              (0)
 #endif
-#define PHY_CLOCK_DEPS          (I2C_ANA_MST_CLOCK_DEPS | BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE) | BIT(MODEM_CLOCK_MODEM_PRIVATE_FE))
-#define MODEM_ETM_CLOCK_DEPS    (BIT(MODEM_CLOCK_ETM))
-#define MODEM_ADC_COMMON_FE_CLOCK_DEPS  (BIT(MODEM_CLOCK_MODEM_ADC_COMMON_FE))
+#define PHY_CLOCK_DEPS                      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE, MODEM_PRIVATE_FE ) | I2C_ANA_MST_CLOCK_DEPS )
+#define MODEM_ETM_CLOCK_DEPS                ( MODEM_CLOCKS( ETM ) )
+#define MODEM_ADC_COMMON_FE_CLOCK_DEPS      ( MODEM_CLOCKS( MODEM_ADC_COMMON_FE ) )
 #if SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT
-#define PHY_CALIBRATION_CLOCK_DEPS      (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB) | BIT(MODEM_CLOCK_WIFI_BB_44M))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS (BIT(MODEM_CLOCK_WIFI_APB) | BIT(MODEM_CLOCK_WIFI_BB_44M) | BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_CLOCK_DEPS          ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_APB, WIFI_BB, WIFI_BB_44M ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( WIFI_APB, WIFI_BB_44M, BT_I154_COMMON_BB ) )
 #else
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     (BIT(MODEM_CLOCK_WIFI_BB))
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS (BIT(MODEM_CLOCK_BT_I154_COMMON_BB))
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( MODEM_CLOCKS( WIFI_BB ) )
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( MODEM_CLOCKS( BT_I154_COMMON_BB ) )
 #endif
 #ifndef SOC_WIFI_SUPPORTED
 #undef  PHY_CALIBRATION_WIFI_CLOCK_DEPS
-#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     0
+#define PHY_CALIBRATION_WIFI_CLOCK_DEPS     ( 0 )
 #endif
 #if !defined(SOC_BT_SUPPORTED) && !defined(SOC_IEEE802154_SUPPORTED)
 #undef  PHY_CALIBRATION_BT_I154_CLOCK_DEPS
-#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS 0
+#define PHY_CALIBRATION_BT_I154_CLOCK_DEPS  ( 0 )
 #endif
-#define PHY_CALIBRATION_CLOCK_DEPS          (PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS)
+#define PHY_CALIBRATION_CLOCK_DEPS          ( PHY_CALIBRATION_WIFI_CLOCK_DEPS | PHY_CALIBRATION_BT_I154_CLOCK_DEPS )
 
-uint32_t modem_clock_get_module_deps(shared_periph_module_t module)
+uint32_t IRAM_ATTR modem_clock_get_module_deps(shared_periph_module_t module)
 {
     uint32_t deps = 0;
     switch (module) {