From 8ffaca92ea32a4536189efdab28c6fe90f40f82d Mon Sep 17 00:00:00 2001
From: liuning <liuning@espressif.com>
Date: Mon, 19 Jan 2026 15:00:10 +0800
Subject: [PATCH] fix(phy): wifi mac clock is not required during phy
 calibration

---
 components/esp_hw_support/modem_clock.c             | 2 +-
 components/esp_phy/esp32/include/phy_init_deps.h    | 2 +-
 components/esp_phy/esp32c2/include/phy_init_deps.h  | 2 +-
 components/esp_phy/esp32c3/include/phy_init_deps.h  | 2 +-
 components/esp_phy/esp32c5/include/phy_init_deps.h  | 2 +-
 components/esp_phy/esp32c6/include/phy_init_deps.h  | 2 +-
 components/esp_phy/esp32c61/include/phy_init_deps.h | 2 +-
 components/esp_phy/esp32s2/include/phy_init_deps.h  | 2 +-
 components/esp_phy/esp32s3/include/phy_init_deps.h  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/esp_hw_support/modem_clock.c b/components/esp_hw_support/modem_clock.c
index 85a42619d69..4e9920cabf5 100644
--- a/components/esp_hw_support/modem_clock.c
+++ b/components/esp_hw_support/modem_clock.c
@@ -275,7 +275,7 @@ void IRAM_ATTR modem_clock_module_mac_reset(periph_module_t module)
 #define I2C_ANA_MST_CLOCK_DEPS  (BIT(MODEM_CLOCK_I2C_MASTER))
 #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_MAC) | BIT(MODEM_CLOCK_WIFI_BB))
+#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))
 
 #ifndef SOC_WIFI_SUPPORTED
diff --git a/components/esp_phy/esp32/include/phy_init_deps.h b/components/esp_phy/esp32/include/phy_init_deps.h
index aa4f8475d9d..46e9ab0185c 100644
--- a/components/esp_phy/esp32/include/phy_init_deps.h
+++ b/components/esp_phy/esp32/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x8FCF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x8F8F
diff --git a/components/esp_phy/esp32c2/include/phy_init_deps.h b/components/esp_phy/esp32c2/include/phy_init_deps.h
index 31eddebb0cf..5eaf988ce33 100644
--- a/components/esp_phy/esp32c2/include/phy_init_deps.h
+++ b/components/esp_phy/esp32c2/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0xE0788FCF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0xE0788F8F
diff --git a/components/esp_phy/esp32c3/include/phy_init_deps.h b/components/esp_phy/esp32c3/include/phy_init_deps.h
index 20002b5ec3c..5511098ecf5 100644
--- a/components/esp_phy/esp32c3/include/phy_init_deps.h
+++ b/components/esp_phy/esp32c3/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x788FCF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x788F8F
diff --git a/components/esp_phy/esp32c5/include/phy_init_deps.h b/components/esp_phy/esp32c5/include/phy_init_deps.h
index db3a10a9bc2..0dc907bd33b 100644
--- a/components/esp_phy/esp32c5/include/phy_init_deps.h
+++ b/components/esp_phy/esp32c5/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x3BE7FF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x3BE5FF
diff --git a/components/esp_phy/esp32c6/include/phy_init_deps.h b/components/esp_phy/esp32c6/include/phy_init_deps.h
index e0b68dcdd10..ae1806caca5 100644
--- a/components/esp_phy/esp32c6/include/phy_init_deps.h
+++ b/components/esp_phy/esp32c6/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x7E7FF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x7E1FF
diff --git a/components/esp_phy/esp32c61/include/phy_init_deps.h b/components/esp_phy/esp32c61/include/phy_init_deps.h
index db3a10a9bc2..0dc907bd33b 100644
--- a/components/esp_phy/esp32c61/include/phy_init_deps.h
+++ b/components/esp_phy/esp32c61/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x3BE7FF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x3BE5FF
diff --git a/components/esp_phy/esp32s2/include/phy_init_deps.h b/components/esp_phy/esp32s2/include/phy_init_deps.h
index 539c4797e4a..8853734381a 100644
--- a/components/esp_phy/esp32s2/include/phy_init_deps.h
+++ b/components/esp_phy/esp32s2/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x7887CF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x78878F
diff --git a/components/esp_phy/esp32s3/include/phy_init_deps.h b/components/esp_phy/esp32s3/include/phy_init_deps.h
index 20002b5ec3c..5511098ecf5 100644
--- a/components/esp_phy/esp32s3/include/phy_init_deps.h
+++ b/components/esp_phy/esp32s3/include/phy_init_deps.h
@@ -6,4 +6,4 @@
 
 #pragma once
 
-#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x788FCF
+#define PHY_INIT_MODEM_CLOCK_REQUIRED_BITS  0x788F8F