From 06871653755081889fcdd718226ee892915bc67c Mon Sep 17 00:00:00 2001 From: sibeibei Date: Thu, 8 May 2025 17:39:10 +0800 Subject: [PATCH] Revert "fix(esp32): Fixed qa program may fail issue when cpu 240m (v5.0)" This reverts commit 453f78e011c23814d990a940e7921acfb87a8f73. --- components/esp_hw_support/port/esp32/rtc_clk.c | 1 - components/soc/esp32/include/soc/rtc.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/esp_hw_support/port/esp32/rtc_clk.c b/components/esp_hw_support/port/esp32/rtc_clk.c index 7efb56ead9..334b247943 100644 --- a/components/esp_hw_support/port/esp32/rtc_clk.c +++ b/components/esp_hw_support/port/esp32/rtc_clk.c @@ -398,7 +398,6 @@ static void rtc_clk_cpu_freq_to_pll_mhz(int cpu_freq_mhz) rtc_clk_apb_freq_update(80 * MHZ); ets_update_cpu_frequency(cpu_freq_mhz); rtc_clk_wait_for_slow_cycle(); - esp_rom_delay_us(30); } void rtc_clk_cpu_freq_set_xtal(void) diff --git a/components/soc/esp32/include/soc/rtc.h b/components/soc/esp32/include/soc/rtc.h index d57f7e56f3..126187cf7b 100644 --- a/components/soc/esp32/include/soc/rtc.h +++ b/components/soc/esp32/include/soc/rtc.h @@ -66,11 +66,11 @@ extern "C" { */ #define RTC_CNTL_DBIAS_HP_VOLT (RTC_CNTL_DBIAS_1V25 - efuse_ll_get_vol_level_hp_inv()) #ifdef CONFIG_ESPTOOLPY_FLASHFREQ_80M -#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V25 +#define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_HP_VOLT #else #define DIG_DBIAS_80M_160M RTC_CNTL_DBIAS_1V10 #endif -#define DIG_DBIAS_240M RTC_CNTL_DBIAS_1V25 +#define DIG_DBIAS_240M RTC_CNTL_DBIAS_HP_VOLT #define DIG_DBIAS_XTAL RTC_CNTL_DBIAS_1V10 #define DIG_DBIAS_2M RTC_CNTL_DBIAS_1V00