mirror of
https://github.com/espressif/esp-idf.git
synced 2026-04-27 19:13:21 +00:00
Merge branch 'bugfix/fix_big_vdddig_bug_p4eco6_v6.0' into 'release/v6.0'
Fix_vdddig_big_bug when boot in ECO6 (v6.0) See merge request espressif/esp-idf!45182
This commit is contained in:
@@ -33,6 +33,9 @@ choice ESP32P4_REV_MIN
|
||||
config ESP32P4_REV_MIN_300
|
||||
bool "Rev v3.0"
|
||||
depends on !ESP32P4_SELECTS_REV_LESS_V3
|
||||
config ESP32P4_REV_MIN_301
|
||||
bool "Rev v3.1"
|
||||
depends on !ESP32P4_SELECTS_REV_LESS_V3
|
||||
endchoice
|
||||
|
||||
config ESP32P4_REV_MIN_FULL
|
||||
@@ -41,6 +44,7 @@ config ESP32P4_REV_MIN_FULL
|
||||
default 1 if ESP32P4_REV_MIN_1
|
||||
default 100 if ESP32P4_REV_MIN_100
|
||||
default 300 if ESP32P4_REV_MIN_300
|
||||
default 301 if ESP32P4_REV_MIN_301
|
||||
|
||||
config ESP_REV_MIN_FULL
|
||||
int
|
||||
|
||||
@@ -67,15 +67,24 @@ void rtc_clk_init(rtc_clk_config_t cfg)
|
||||
hp_dcmvset = pvt_hp_dcmvset;
|
||||
}
|
||||
// Switch to DCDC
|
||||
#if CONFIG_ESP32P4_REV_MIN_301
|
||||
unsigned chip_version = efuse_hal_chip_revision();
|
||||
if (ESP_CHIP_REV_ABOVE(chip_version, 301)) {
|
||||
SET_PERI_REG_MASK(PMU_DCM_CTRL_REG, PMU_DCDC_FB_RES_FORCE_PD);
|
||||
}
|
||||
#endif
|
||||
pmu_ll_set_dcdc_en(&PMU, true);
|
||||
pmu_ll_set_dcdc_switch_force_power_down(&PMU, false);
|
||||
pmu_ll_hp_set_dcm_vset(&PMU, PMU_MODE_HP_ACTIVE, hp_dcmvset);
|
||||
SET_PERI_REG_MASK(PMU_HP_ACTIVE_HP_REGULATOR0_REG, PMU_DIG_REGULATOR0_DBIAS_SEL); // Hand over control of dbias to pmu
|
||||
esp_rom_delay_us(1000);
|
||||
unsigned chip_version = efuse_hal_chip_revision();
|
||||
#if CONFIG_ESP32P4_REV_MIN_301
|
||||
if (ESP_CHIP_REV_ABOVE(chip_version, 301)) {
|
||||
REG_SET_FIELD(LP_SYSTEM_REG_SYS_CTRL_REG, LP_SYSTEM_REG_LP_FIB_SEL, 0xEF);// lp_fib_sel bit4 set to 0: select dig_fib_reg instead of ana_fib_reg
|
||||
CLEAR_PERI_REG_MASK(PMU_DCM_CTRL_REG, PMU_DCDC_FB_RES_FORCE_PD);
|
||||
esp_rom_delay_us(10);
|
||||
}
|
||||
#endif
|
||||
pmu_ll_hp_set_regulator_xpd(&PMU, PMU_MODE_HP_ACTIVE, false);
|
||||
|
||||
soc_xtal_freq_t xtal_freq = cfg.xtal_freq;
|
||||
|
||||
Reference in New Issue
Block a user