espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

soc_caps: rename ESP_PD_DOMAIN_RTC8M to ESP_PD_DOMAIN_FOSC

Browse Source
This commit is contained in:
wuzhenghui
2022-12-26 21:57:52 +08:00
parent 17f9285524
commit aa20825659
19 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/ledc.c
View File

@@ -573,7 +573,7 @@ static esp_err_t ledc_set_timer_div(ledc_mode_t speed_mode, ledc_timer_t timer_n
#endif #endif
ESP_LOGD(LEDC_TAG, "In slow speed mode, global clk set: %d", glb_clk); ESP_LOGD(LEDC_TAG, "In slow speed mode, global clk set: %d", glb_clk);
/* keep ESP_PD_DOMAIN_RTC8M on during light sleep */ /* keep ESP_PD_DOMAIN_RC_FAST on during light sleep */
esp_sleep_periph_use_8m(glb_clk == LEDC_SLOW_CLK_RTC8M); esp_sleep_periph_use_8m(glb_clk == LEDC_SLOW_CLK_RTC8M);
portENTER_CRITICAL(&ledc_spinlock); portENTER_CRITICAL(&ledc_spinlock);

7
components/esp_hw_support/include/esp_sleep.h
View File

@@ -53,17 +53,18 @@ typedef enum {
#if SOC_PM_SUPPORT_RC32K_PD #if SOC_PM_SUPPORT_RC32K_PD
ESP_PD_DOMAIN_RC32K, ESP_PD_DOMAIN_RC32K,
#endif #endif
#if SOC_PM_SUPPORT_FOSC_PD #if SOC_PM_SUPPORT_RC_FAST_PD
ESP_PD_DOMAIN_FOSC, ESP_PD_DOMAIN_RC_FAST, //!< Internal Fast oscillator
#endif #endif
#if SOC_PM_SUPPORT_CPU_PD #if SOC_PM_SUPPORT_CPU_PD
ESP_PD_DOMAIN_CPU, //!< CPU core ESP_PD_DOMAIN_CPU, //!< CPU core
#endif #endif
ESP_PD_DOMAIN_RTC8M, //!< Internal 8M oscillator
ESP_PD_DOMAIN_VDDSDIO, //!< VDD_SDIO ESP_PD_DOMAIN_VDDSDIO, //!< VDD_SDIO
ESP_PD_DOMAIN_MAX //!< Number of domains ESP_PD_DOMAIN_MAX //!< Number of domains
} esp_sleep_pd_domain_t; } esp_sleep_pd_domain_t;
#define ESP_PD_DOMAIN_RTC8M _Pragma("GCC warning \"'ESP_PD_DOMAIN_RTC8M' enum is deprecated\"") ESP_PD_DOMAIN_RC_FAST
/** /**
* @brief Power down options * @brief Power down options
*/ */

2
components/esp_hw_support/sleep_modes.c
View File

@@ -1399,7 +1399,7 @@ static uint32_t get_power_down_flags(void)
pd_flags |= RTC_SLEEP_PD_CPU; pd_flags |= RTC_SLEEP_PD_CPU;
} }
#endif #endif
if (s_config.pd_options[ESP_PD_DOMAIN_RTC8M] != ESP_PD_OPTION_ON) { if (s_config.pd_options[ESP_PD_DOMAIN_RC_FAST] != ESP_PD_OPTION_ON) {
pd_flags |= RTC_SLEEP_PD_INT_8M; pd_flags |= RTC_SLEEP_PD_INT_8M;
} }
if (s_config.pd_options[ESP_PD_DOMAIN_XTAL] != ESP_PD_OPTION_ON) { if (s_config.pd_options[ESP_PD_DOMAIN_XTAL] != ESP_PD_OPTION_ON) {

4
components/soc/esp32/include/soc/Kconfig.soc_caps.in
View File

@@ -719,6 +719,10 @@ config SOC_PM_SUPPORT_RTC_SLOW_MEM_PD
bool bool
default y default y
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_CLK_APLL_SUPPORTED config SOC_CLK_APLL_SUPPORTED
bool bool
default y default y

1
components/soc/esp32/include/soc/soc_caps.h
View File

@@ -366,6 +366,7 @@
#define SOC_PM_SUPPORT_RTC_PERIPH_PD (1) #define SOC_PM_SUPPORT_RTC_PERIPH_PD (1)
#define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1)
#define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
#define SOC_CLK_APLL_SUPPORTED (1) #define SOC_CLK_APLL_SUPPORTED (1)

4
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
View File

@@ -575,6 +575,10 @@ config SOC_PM_SUPPORT_BT_PD
bool bool
default n default n
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_CLK_RC_FAST_D256_SUPPORTED config SOC_CLK_RC_FAST_D256_SUPPORTED
bool bool
default y default y

1
components/soc/esp32c2/include/soc/soc_caps.h
View File

@@ -279,6 +279,7 @@
#define SOC_PM_SUPPORT_CPU_PD (0) #define SOC_PM_SUPPORT_CPU_PD (0)
#define SOC_PM_SUPPORT_WIFI_PD (0) #define SOC_PM_SUPPORT_WIFI_PD (0)
#define SOC_PM_SUPPORT_BT_PD (0) #define SOC_PM_SUPPORT_BT_PD (0)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ /*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */
#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) #define SOC_CLK_RC_FAST_D256_SUPPORTED (1)

4
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
View File

@@ -819,6 +819,10 @@ config SOC_PM_SUPPORT_BT_PD
bool bool
default y default y
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_CLK_RC_FAST_D256_SUPPORTED config SOC_CLK_RC_FAST_D256_SUPPORTED
bool bool
default y default y

5
components/soc/esp32c3/include/soc/soc_caps.h
View File

@@ -366,14 +366,11 @@
/*-------------------------- Power Management CAPS ----------------------------*/ /*-------------------------- Power Management CAPS ----------------------------*/
#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) #define SOC_PM_SUPPORT_WIFI_WAKEUP (1)
#define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1)
#define SOC_PM_SUPPORT_CPU_PD (1) #define SOC_PM_SUPPORT_CPU_PD (1)
#define SOC_PM_SUPPORT_WIFI_PD (1) #define SOC_PM_SUPPORT_WIFI_PD (1)
#define SOC_PM_SUPPORT_BT_PD (1) #define SOC_PM_SUPPORT_BT_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ /*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */
#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) #define SOC_CLK_RC_FAST_D256_SUPPORTED (1)

2
components/soc/esp32c6/include/soc/Kconfig.soc_caps.in
View File

@@ -923,7 +923,7 @@ config SOC_PM_SUPPORT_RC32K_PD
bool bool
default y default y
config SOC_PM_SUPPORT_FOSC_PD config SOC_PM_SUPPORT_RC_FAST_PD
bool bool
default y default y

9
components/soc/esp32c6/include/soc/soc_caps.h
View File

@@ -419,20 +419,13 @@
// TODO: IDF-5351 (Copy from esp32c3, need check) // TODO: IDF-5351 (Copy from esp32c3, need check)
/*-------------------------- Power Management CAPS ----------------------------*/ /*-------------------------- Power Management CAPS ----------------------------*/
#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) #define SOC_PM_SUPPORT_WIFI_WAKEUP (1)
#define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1)
#define SOC_PM_SUPPORT_CPU_PD (1) #define SOC_PM_SUPPORT_CPU_PD (1)
#define SOC_PM_SUPPORT_WIFI_PD (1) #define SOC_PM_SUPPORT_WIFI_PD (1)
#define SOC_PM_SUPPORT_BT_PD (1) #define SOC_PM_SUPPORT_BT_PD (1)
#define SOC_PM_SUPPORT_XTAL32K_PD (1) #define SOC_PM_SUPPORT_XTAL32K_PD (1)
#define SOC_PM_SUPPORT_RC32K_PD (1) #define SOC_PM_SUPPORT_RC32K_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
#define SOC_PM_SUPPORT_FOSC_PD (1)
/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
#define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION (1) #define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION (1)

4
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@@ -751,6 +751,10 @@ config SOC_PM_SUPPORT_BT_PD
bool bool
default y default y
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC
bool bool
default y default y

5
components/soc/esp32h2/include/soc/soc_caps.h
View File

@@ -403,14 +403,11 @@
// TODO: IDF-6270 (Copy from esp32c6, need check) // TODO: IDF-6270 (Copy from esp32c6, need check)
/*-------------------------- Power Management CAPS ----------------------------*/ /*-------------------------- Power Management CAPS ----------------------------*/
#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) #define SOC_PM_SUPPORT_WIFI_WAKEUP (1)
#define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1)
#define SOC_PM_SUPPORT_CPU_PD (1) #define SOC_PM_SUPPORT_CPU_PD (1)
#define SOC_PM_SUPPORT_WIFI_PD (1) #define SOC_PM_SUPPORT_WIFI_PD (1)
#define SOC_PM_SUPPORT_BT_PD (1) #define SOC_PM_SUPPORT_BT_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
// TODO: IDF-6229 (Copy from esp32c6, need check) // TODO: IDF-6229 (Copy from esp32c6, need check)
/*-------------------------- Temperature Sensor CAPS -------------------------------------*/ /*-------------------------- Temperature Sensor CAPS -------------------------------------*/

4
components/soc/esp32h4/include/soc/Kconfig.soc_caps.in
View File

@@ -767,6 +767,10 @@ config SOC_PM_SUPPORT_BT_PD
bool bool
default y default y
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC config SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC
bool bool
default y default y

4
components/soc/esp32h4/include/soc/soc_caps.h
View File

@@ -362,12 +362,10 @@
#define SOC_PHY_DIG_REGS_MEM_SIZE (21*4) #define SOC_PHY_DIG_REGS_MEM_SIZE (21*4)
/*-------------------------- Power Management CAPS ----------------------------*/ /*-------------------------- Power Management CAPS ----------------------------*/
#define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1)
#define SOC_PM_SUPPORT_CPU_PD (1) #define SOC_PM_SUPPORT_CPU_PD (1)
#define SOC_PM_SUPPORT_BT_PD (1) #define SOC_PM_SUPPORT_BT_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
/*-------------------------- Temperature Sensor CAPS -------------------------------------*/ /*-------------------------- Temperature Sensor CAPS -------------------------------------*/
#define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC (1) #define SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC (1)

4
components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
View File

@@ -907,6 +907,10 @@ config SOC_PM_SUPPORT_RTC_SLOW_MEM_PD
bool bool
default y default y
config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_CLK_APLL_SUPPORTED config SOC_CLK_APLL_SUPPORTED
bool bool
default y default y

1
components/soc/esp32s2/include/soc/soc_caps.h
View File

@@ -401,6 +401,7 @@
#define SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP (1) /*!<Supports waking up from touch pad trigger */ #define SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP (1) /*!<Supports waking up from touch pad trigger */
#define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_FAST_MEM_PD (1)
#define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1) #define SOC_PM_SUPPORT_RTC_SLOW_MEM_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
/*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/ /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
#define SOC_CLK_APLL_SUPPORTED (1) #define SOC_CLK_APLL_SUPPORTED (1)

14
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@@ -955,6 +955,14 @@ config SOC_PM_SUPPORT_BT_WAKEUP
bool bool
default y default y
config SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP
bool
default y
config SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY
bool
default y
config SOC_PM_SUPPORT_CPU_PD config SOC_PM_SUPPORT_CPU_PD
bool bool
default y default y
@@ -967,11 +975,7 @@ config SOC_PM_SUPPORT_RTC_PERIPH_PD
bool bool
default y default y
config SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP config SOC_PM_SUPPORT_RC_FAST_PD
bool
default y
config SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY
bool bool
default y default y

12
components/soc/esp32s3/include/soc/soc_caps.h
View File

@@ -396,20 +396,16 @@
/*-------------------------- Power Management CAPS ---------------------------*/ /*-------------------------- Power Management CAPS ---------------------------*/
#define SOC_PM_SUPPORT_EXT_WAKEUP (1) #define SOC_PM_SUPPORT_EXT_WAKEUP (1)
#define SOC_PM_SUPPORT_WIFI_WAKEUP (1) #define SOC_PM_SUPPORT_WIFI_WAKEUP (1)
#define SOC_PM_SUPPORT_BT_WAKEUP (1) #define SOC_PM_SUPPORT_BT_WAKEUP (1)
#define SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP (1) /*!<Supports waking up from touch pad trigger */
#define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1)
#define SOC_PM_SUPPORT_CPU_PD (1) #define SOC_PM_SUPPORT_CPU_PD (1)
#define SOC_PM_SUPPORT_TAGMEM_PD (1) #define SOC_PM_SUPPORT_TAGMEM_PD (1)
#define SOC_PM_SUPPORT_RTC_PERIPH_PD (1)
#define SOC_PM_SUPPORT_RC_FAST_PD (1)
#define SOC_PM_SUPPORT_RTC_PERIPH_PD (1)
#define SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP (1) /*!<Supports waking up from touch pad trigger */
#define SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY (1)
/*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */ /*--------------------------- CLOCK SUBSYSTEM CAPS -------------------------- */
#define SOC_CLK_RC_FAST_D256_SUPPORTED (1) #define SOC_CLK_RC_FAST_D256_SUPPORTED (1)