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

fix(esp_hw_support): fix esp32p4 xtal_xpd depends on TOP power domain (v5.3)

See merge request espressif/esp-idf!38453
This commit is contained in:
Jiang Jiang Jian
2025-04-17 17:14:56 +08:00
11 changed files with 30 additions and 3 deletions

View File

@@ -2195,7 +2195,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;
} }

View File

@@ -155,6 +155,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

View File

@@ -86,6 +86,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)

View File

@@ -67,6 +67,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_ADC_PERIPH_NUM config SOC_ADC_PERIPH_NUM
int int
default 1 default 1

View File

@@ -77,6 +77,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)

View File

@@ -251,6 +251,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

View File

@@ -80,7 +80,8 @@
#define SOC_PM_SUPPORTED 1 #define SOC_PM_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
/*-------------------------- AES CAPS -----------------------------------------*/ /*-------------------------- AES CAPS -----------------------------------------*/
#define SOC_AES_SUPPORT_DMA (1) #define SOC_AES_SUPPORT_DMA (1)

View File

@@ -43,6 +43,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

View File

@@ -78,7 +78,8 @@
// #define SOC_PM_SUPPORTED 1 // #define SOC_PM_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
/*-------------------------- AES CAPS -----------------------------------------*/ /*-------------------------- AES CAPS -----------------------------------------*/
#define SOC_AES_SUPPORT_DMA (1) #define SOC_AES_SUPPORT_DMA (1)

View File

@@ -243,6 +243,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

View File

@@ -94,7 +94,8 @@
#define SOC_PM_SUPPORTED 1 #define SOC_PM_SUPPORTED 1
/*-------------------------- 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)