From 179e3293be332e3c240c48c5e050af922f4210d0 Mon Sep 17 00:00:00 2001 From: cjin Date: Thu, 21 Sep 2023 11:31:53 +0800 Subject: [PATCH] change: remove has clock bug macro for esp32h2 --- components/esp_phy/src/btbb_init.c | 8 ++++---- components/soc/esp32h2/include/soc/Kconfig.soc_caps.in | 4 ---- components/soc/esp32h2/include/soc/soc_caps.h | 1 - 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/components/esp_phy/src/btbb_init.c b/components/esp_phy/src/btbb_init.c index 754ab2f0bb..6c8c9f6ab4 100644 --- a/components/esp_phy/src/btbb_init.c +++ b/components/esp_phy/src/btbb_init.c @@ -22,11 +22,11 @@ static uint8_t s_btbb_access_ref = 0; #include "btbb_retention_reg.h" static const char* TAG = "btbb_init"; -// #if SOC_PM_RETENTION_HAS_CLOCK_BUG -// #define BTBB_LINK_OWNER ENTRY(3) -// #else +#if SOC_PM_RETENTION_HAS_CLOCK_BUG +#define BTBB_LINK_OWNER ENTRY(3) +#else #define BTBB_LINK_OWNER ENTRY(0) | ENTRY(2) -// #endif // SOC_PM_RETENTION_HAS_CLOCK_BUG +#endif // SOC_PM_RETENTION_HAS_CLOCK_BUG static esp_err_t btbb_sleep_retention_init(void) { diff --git a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in index 30172b1d81..cc4654abc6 100644 --- a/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in +++ b/components/soc/esp32h2/include/soc/Kconfig.soc_caps.in @@ -1139,10 +1139,6 @@ config SOC_PM_RETENTION_HAS_REGDMA_POWER_BUG bool default y -config SOC_PM_RETENTION_HAS_CLOCK_BUG - bool - default y - config SOC_CLK_RC_FAST_SUPPORT_CALIBRATION bool default y diff --git a/components/soc/esp32h2/include/soc/soc_caps.h b/components/soc/esp32h2/include/soc/soc_caps.h index 145307d514..2b3b27ac2c 100644 --- a/components/soc/esp32h2/include/soc/soc_caps.h +++ b/components/soc/esp32h2/include/soc/soc_caps.h @@ -472,7 +472,6 @@ #define SOC_PM_MODEM_RETENTION_BY_REGDMA (1) #define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1) /*!