Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-09-22 13:01:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/remove_esp_hw_support_to_pm_dependency' into 'master'

Browse Source 
change(esp_hw_support): remove esp_hw_support to esp_pm dependency

See merge request espressif/esp-idf!52868
This commit is contained in:
Wu Zheng Hui
2026-09-20 14:23:17 +08:00
parent d7547231a6 e8edbdd80b
commit 7fb2df7ffc
11 changed files with 22 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_hw_support/CMakeLists.txt
View File

@@ -114,9 +114,7 @@ if(NOT non_os_build)
list(APPEND priv_requires esp_driver_gpio # for GPIO and RTC (by sleep_gpio and sleep_modes)
esp_timer
esp_hal_touch_sens # for touch sensor wakeup (introduced in sleep_modes.c)
esp_pm)
list(APPEND priv_requires esp_mm
esp_mm
esp_hal_mspi
esp_hal_uart
)

9
components/esp_hw_support/port/esp32c5/include/soc/rtc.h
View File

@@ -327,17 +327,14 @@ void rtc_clk_cpu_freq_set_xtal(void);
#ifndef BOOTLOADER_BUILD
/**
* @brief Switch root clock source to PLL (only used by sleep) release root clock source locked by PMU
* @brief Release root clock source locked by PMU
*
* wifi receiving beacon frame in PMU modem state strongly depends on the BBPLL
* clock, PMU will forcibly lock the root clock source as PLL, when the root
* clock source of the software system is selected as PLL, we need to release
* the root clock source locking and switch the root clock source to PLL in the
* sleep process (a critical section).
*
* @param[in] Maximum CPU frequency, in MHz
* the root clock source locking in the sleep process (a critical section).
*/
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz);
void rtc_clk_modem_pll_lock_release(void);
#endif
/**

23
components/esp_hw_support/port/esp32c5/rtc_clk.c
View File

@@ -475,29 +475,8 @@ void rtc_clk_cpu_freq_set_xtal_for_sleep(void)
}
#ifndef BOOTLOADER_BUILD
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz)
void rtc_clk_modem_pll_lock_release(void)
{
// IDF-11064
if (cpu_freq_mhz == 240) {
esp_clk_tree_enable_src(SOC_MOD_CLK_PLL_F240M, true);
rtc_clk_cpu_freq_to_pll_240_mhz(cpu_freq_mhz);
} else if (cpu_freq_mhz == 160) {
esp_clk_tree_enable_src(SOC_MOD_CLK_PLL_F160M, true);
rtc_clk_cpu_freq_to_pll_160_mhz(cpu_freq_mhz);
} else {// cpu_freq_mhz is 80
if (!ESP_CHIP_REV_ABOVE(efuse_hal_chip_revision(), 101)) {// (use 240mhz pll if max cpu freq is 240MHz)
#if CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240
esp_clk_tree_enable_src(SOC_MOD_CLK_PLL_F240M, true);
rtc_clk_cpu_freq_to_pll_240_mhz(cpu_freq_mhz);
#else
esp_clk_tree_enable_src(SOC_MOD_CLK_PLL_F160M, true);
rtc_clk_cpu_freq_to_pll_160_mhz(cpu_freq_mhz);
#endif
} else {// (fixed for chip rev. >= ECO3)
esp_clk_tree_enable_src(SOC_MOD_CLK_PLL_F160M, true);
rtc_clk_cpu_freq_to_pll_160_mhz(cpu_freq_mhz);
}
}
clk_ll_cpu_clk_src_lock_release();
}
#endif

9
components/esp_hw_support/port/esp32c6/include/soc/rtc.h
View File

@@ -346,17 +346,14 @@ void rtc_clk_cpu_freq_get_config(rtc_cpu_freq_config_t *out_config);
void rtc_clk_cpu_freq_set_xtal(void);
/**
* @brief Switch root clock source to PLL (only used by sleep) release root clock source locked by PMU
* @brief Release root clock source locked by PMU
*
* wifi receiving beacon frame in PMU modem state strongly depends on the BBPLL
* clock, PMU will forcibly lock the root clock source as PLL, when the root
* clock source of the software system is selected as PLL, we need to release
* the root clock source locking and switch the root clock source to PLL in the
* sleep process (a critical section).
*
* @param[in] Maximum CPU frequency, in MHz
* the root clock source locking in the sleep process (a critical section).
*/
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz);
void rtc_clk_modem_pll_lock_release(void);
/**
* @brief Get the current APB frequency.

3
components/esp_hw_support/port/esp32c6/rtc_clk.c
View File

@@ -366,9 +366,8 @@ void rtc_clk_cpu_freq_set_xtal_for_sleep(void)
#endif
}
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz)
void rtc_clk_modem_pll_lock_release(void)
{
rtc_clk_cpu_freq_to_pll_mhz(cpu_freq_mhz);
clk_ll_cpu_clk_src_lock_release();
}

9
components/esp_hw_support/port/esp32c61/include/soc/rtc.h
View File

@@ -316,17 +316,14 @@ void rtc_clk_cpu_freq_get_config(rtc_cpu_freq_config_t *out_config);
void rtc_clk_cpu_freq_set_xtal(void);
/**
* @brief Switch root clock source to PLL (only used by sleep) release root clock source locked by PMU
* @brief Release root clock source locked by PMU
*
* wifi receiving beacon frame in PMU modem state strongly depends on the BBPLL
* clock, PMU will forcibly lock the root clock source as PLL, when the root
* clock source of the software system is selected as PLL, we need to release
* the root clock source locking and switch the root clock source to PLL in the
* sleep process (a critical section).
*
* @param[in] Maximum CPU frequency, in MHz
* the root clock source locking in the sleep process (a critical section).
*/
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz);
void rtc_clk_modem_pll_lock_release(void);
/**
* @brief Get the current APB frequency.

3
components/esp_hw_support/port/esp32c61/rtc_clk.c
View File

@@ -351,9 +351,8 @@ void rtc_clk_cpu_freq_set_xtal_for_sleep(void)
#endif
}
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz)
void rtc_clk_modem_pll_lock_release(void)
{
rtc_clk_cpu_freq_to_pll_160_mhz(cpu_freq_mhz);
clk_ll_cpu_clk_src_lock_release();
}

9
components/esp_hw_support/port/esp32h4/include/soc/rtc.h
View File

@@ -285,17 +285,14 @@ void rtc_clk_cpu_freq_set_xtal(void);
#endif
/**
* @brief Switch root clock source to PLL (only used by sleep) release root clock source locked by PMU
* @brief Release root clock source locked by PMU
*
* wifi receiving beacon frame in PMU modem state strongly depends on the BBPLL
* clock, PMU will forcibly lock the root clock source as PLL, when the root
* clock source of the software system is selected as PLL, we need to release
* the root clock source locking and switch the root clock source to PLL in the
* sleep process (a critical section).
*
* @param[in] Maximum CPU frequency, in MHz
* the root clock source locking in the sleep process (a critical section).
*/
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz);
void rtc_clk_modem_pll_lock_release(void);
/**
* @brief Get the current APB frequency.

7
components/esp_hw_support/port/esp32h4/rtc_clk.c
View File

@@ -437,13 +437,8 @@ void rtc_clk_cpu_freq_set_xtal_for_sleep(void)
}
#endif
void rtc_clk_cpu_freq_to_pll_and_pll_lock_release(int cpu_freq_mhz)
void rtc_clk_modem_pll_lock_release(void)
{
if (cpu_freq_mhz == 96 || cpu_freq_mhz == 48) {
rtc_clk_cpu_freq_to_pll_mhz(cpu_freq_mhz);
} else { // cpu_freq_mhz == 64
rtc_clk_cpu_freq_to_xtal_x2(cpu_freq_mhz, 1);
}
clk_ll_cpu_clk_src_lock_release();
}

2
components/esp_hw_support/sleep_modem.c
View File

@@ -14,7 +14,7 @@
#include "esp_sleep.h"
#include "esp_check.h"
#include "soc/soc_caps.h"
#include "esp_private/pm_impl.h"
#include "soc/rtc.h"
#include "esp_private/sleep_modem.h"
#include "esp_private/sleep_retention.h"
#include "sdkconfig.h"

14
components/esp_hw_support/sleep_modes.c
View File

@@ -56,10 +56,6 @@
#include "hal/timer_ll.h"
#endif
#if SOC_PM_SUPPORT_PMU_MODEM_STATE
#include "esp_private/pm_impl.h"
#endif
#if !SOC_PMU_SUPPORTED
#include "hal/rtc_cntl_ll.h"
#endif
@@ -1180,15 +1176,13 @@ static esp_err_t SLEEP_FN_ATTR esp_sleep_start(uint32_t sleep_flags, esp_sleep_m
sleep_cache_suspend();
}
#endif
// Restore CPU frequency
// Restore CPU frequency (Will fallback to rtc_clk_cpu_freq_set_config if PLL source is not configured.)
rtc_clk_cpu_freq_set_config_fast(&cpu_freq_config);
#if SOC_PM_SUPPORT_PMU_MODEM_STATE && !SOC_PM_BBPLL_PD_IN_MODEM_STATE && !SOC_PM_MODEM_STATE_USE_XTAL
if (pmu_sleep_pll_already_enabled()) {
rtc_clk_cpu_freq_to_pll_and_pll_lock_release(esp_pm_impl_get_cpu_freq(PM_MODE_CPU_MAX));
} else
#endif
{
rtc_clk_cpu_freq_set_config(&cpu_freq_config);
rtc_clk_modem_pll_lock_release();
}
#endif
esp_sleep_execute_event_callbacks(SLEEP_EVENT_SW_CLK_READY, (void *)0);
if (!deep_sleep) {