espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/esp32p4_xtal_path_not_on_top_v5.4' into 'release/v5.4'

Browse Source 
fix(esp_hw_support): fix esp32p4 xtal_xpd depends on TOP power domain (v5.4)

See merge request espressif/esp-idf!38452
This commit is contained in:
Jiang Jiang Jian
2025-04-17 17:03:47 +08:00
parent 0be344409b d2755374e0
commit 9c9d5cc1a2
9 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_hw_support/sleep_modes.c
View File

@@ -2310,7 +2310,9 @@ FORCE_INLINE_ATTR bool top_domain_pd_allowed(void) {
#if SOC_PM_SUPPORT_MODEM_PD #if SOC_PM_SUPPORT_MODEM_PD
top_pd_allowed &= modem_domain_pd_allowed(); top_pd_allowed &= modem_domain_pd_allowed();
#endif #endif
#if SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN
top_pd_allowed &= (s_config.domain[ESP_PD_DOMAIN_XTAL].pd_option != ESP_PD_OPTION_ON); top_pd_allowed &= (s_config.domain[ESP_PD_DOMAIN_XTAL].pd_option != ESP_PD_OPTION_ON);
#endif
return top_pd_allowed; return top_pd_allowed;
} }

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

@@ -251,6 +251,10 @@ config SOC_XTAL_SUPPORT_48M
bool bool
default y default y
config SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN
bool
default y
config SOC_AES_SUPPORT_DMA config SOC_AES_SUPPORT_DMA
bool bool
default y default y

3
components/soc/esp32c5/include/soc/soc_caps.h
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -87,6 +87,7 @@
/*-------------------------- XTAL CAPS ---------------------------------------*/ /*-------------------------- XTAL CAPS ---------------------------------------*/
#define SOC_XTAL_SUPPORT_40M 1 #define SOC_XTAL_SUPPORT_40M 1
#define SOC_XTAL_SUPPORT_48M 1 #define SOC_XTAL_SUPPORT_48M 1
#define SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN 1
/*-------------------------- AES CAPS -----------------------------------------*/ /*-------------------------- AES CAPS -----------------------------------------*/
#define SOC_AES_SUPPORT_DMA (1) #define SOC_AES_SUPPORT_DMA (1)

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

@@ -247,6 +247,10 @@ config SOC_XTAL_SUPPORT_40M
bool bool
default y default y
config SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN
bool
default y
config SOC_AES_SUPPORT_DMA config SOC_AES_SUPPORT_DMA
bool bool
default y default y

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

@@ -80,6 +80,7 @@
/*-------------------------- XTAL CAPS ---------------------------------------*/ /*-------------------------- XTAL CAPS ---------------------------------------*/
#define SOC_XTAL_SUPPORT_40M 1 #define SOC_XTAL_SUPPORT_40M 1
#define SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN 1
/*-------------------------- AES CAPS -----------------------------------------*/ /*-------------------------- AES CAPS -----------------------------------------*/
#define SOC_AES_SUPPORT_DMA (1) #define SOC_AES_SUPPORT_DMA (1)

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

@@ -167,6 +167,10 @@ config SOC_XTAL_SUPPORT_40M
bool bool
default y default y
config SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN
bool
default y
config SOC_ADC_PERIPH_NUM config SOC_ADC_PERIPH_NUM
int int
default 1 default 1

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

@@ -66,6 +66,7 @@
#define SOC_SPIRAM_SUPPORTED 1 #define SOC_SPIRAM_SUPPORTED 1
/*-------------------------- XTAL CAPS ---------------------------------------*/ /*-------------------------- XTAL CAPS ---------------------------------------*/
#define SOC_XTAL_SUPPORT_40M 1 #define SOC_XTAL_SUPPORT_40M 1
#define SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN 1
//TODO: [ESP32C61] IDF-9302, IDF-9303, IDF-9304 //TODO: [ESP32C61] IDF-9302, IDF-9303, IDF-9304
/*-------------------------- ADC CAPS -------------------------------*/ /*-------------------------- ADC CAPS -------------------------------*/

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

@@ -239,6 +239,10 @@ config SOC_XTAL_SUPPORT_32M
bool bool
default y default y
config SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN
bool
default y
config SOC_AES_SUPPORT_DMA config SOC_AES_SUPPORT_DMA
bool bool
default y default y

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

@@ -94,6 +94,7 @@
/*-------------------------- XTAL CAPS ---------------------------------------*/ /*-------------------------- XTAL CAPS ---------------------------------------*/
#define SOC_XTAL_SUPPORT_32M 1 #define SOC_XTAL_SUPPORT_32M 1
#define SOC_XTAL_CLOCK_PATH_DEPENDS_ON_TOP_DOMAIN 1
/*-------------------------- AES CAPS -----------------------------------------*/ /*-------------------------- AES CAPS -----------------------------------------*/
#define SOC_AES_SUPPORT_DMA (1) #define SOC_AES_SUPPORT_DMA (1)