Skip to content

Release/v5.5 #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jason2866 merged 3 commits into from
Nov 24, 2025
Merged

Release/v5.5 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b698ac7
feat(psram): support 250MHz in experimental
Icarus113 Jul 12, 2024
ffcf9f3
change(psram): use 200M as default
Icarus113 Nov 17, 2025
d66ebb8
Merge branch 'feat/psram_250m_p4_v5.5' into 'release/v5.5'
suda-morris Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions components/esp_hw_support/port/esp32p4/Kconfig.ldo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ menu "LDO Regulator Configurations"
choice ESP_LDO_VOLTAGE_PSRAM_DOMAIN
prompt "PSRAM power domain voltage"
depends on ESP_LDO_RESERVE_PSRAM
default ESP_LDO_VOLTAGE_PSRAM_1900_MV
default ESP_LDO_VOLTAGE_PSRAM_1800_MV
help
Select the voltage used by the PSRAM power domain.

config ESP_LDO_VOLTAGE_PSRAM_1900_MV
bool "1.9V"
config ESP_LDO_VOLTAGE_PSRAM_1800_MV
bool "1.8V"
endchoice

config ESP_LDO_VOLTAGE_PSRAM_DOMAIN
int
default 1900 if ESP_LDO_VOLTAGE_PSRAM_1900_MV
default 1800 if ESP_LDO_VOLTAGE_PSRAM_1800_MV
endmenu
2 changes: 1 addition & 1 deletion components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_ldo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ TEST_CASE("LDO channel state dump", "[LDO][manual][ignore]")
esp_ldo_channel_handle_t success_ldo_chans[3] = {};
esp_ldo_channel_config_t ldo_chan_config = {
.chan_id = 2,
.voltage_mv = 1900,
.voltage_mv = 1800,
};
TEST_ESP_OK(esp_ldo_acquire_channel(&ldo_chan_config, &success_ldo_chans[0]));

Expand Down
9 changes: 2 additions & 7 deletions components/esp_psram/device/esp_psram_impl_ap_hex.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@

#if CONFIG_SPIRAM_SPEED_80M
#define AP_HEX_PSRAM_MPLL_DEFAULT_FREQ_MHZ 320
#elif CONFIG_SPIRAM_SPEED_250M
#define AP_HEX_PSRAM_MPLL_DEFAULT_FREQ_MHZ 500
#else
#define AP_HEX_PSRAM_MPLL_DEFAULT_FREQ_MHZ 400
#endif
Expand Down Expand Up @@ -467,13 +469,6 @@ esp_err_t esp_psram_impl_enable(void)
mode_reg.mr2.density == 0x7 ? PSRAM_SIZE_32MB :
mode_reg.mr2.density == 0x6 ? PSRAM_SIZE_64MB : 0;

#if CONFIG_SPIRAM_SPEED_250M
if (mode_reg.mr2.density == 0x7) {
ESP_EARLY_LOGE(TAG, "PSRAM Not support 250MHz speed");
return ESP_ERR_NOT_SUPPORTED;
}
#endif

s_config_mspi_for_psram();
mspi_timing_psram_tuning();
psram_ctrlr_ll_enable_variable_dummy(PSRAM_CTRLR_LL_MSPI_ID_2, true);
Expand Down
8 changes: 6 additions & 2 deletions components/esp_psram/esp32p4/Kconfig.spiram
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@ menu "PSRAM config"

choice SPIRAM_SPEED
prompt "Set PSRAM clock speed"
default SPIRAM_SPEED_20M
default SPIRAM_SPEED_200M
help
Select the speed for the PSRAM chip.

config SPIRAM_SPEED_250M
depends on !ESP32P4_SELECTS_REV_LESS_V3
bool "250MHz clock speed"

config SPIRAM_SPEED_200M
depends on IDF_EXPERIMENTAL_FEATURES
bool "200MHz clock speed"

config SPIRAM_SPEED_80M
Expand All @@ -47,6 +50,7 @@ menu "PSRAM config"
default 80 if SPIRAM_SPEED_80M
default 100 if SPIRAM_SPEED_100M
default 200 if SPIRAM_SPEED_200M
default 250 if SPIRAM_SPEED_250M

config SPIRAM_FETCH_INSTRUCTIONS
bool
Expand Down
2 changes: 1 addition & 1 deletion components/hal/esp32p4/include/hal/ldo_ll.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ static inline void ldo_ll_voltage_to_dref_mul(int ldo_unit, int voltage_mv, uint
matched_dref = EFUSE.rd_mac_sys_2.ldo_vo1_dref;
}
}
if (ldo_unit == 1 && voltage_mv == 1900) {
if (ldo_unit == 1 && voltage_mv == 1800) {
if (EFUSE.rd_mac_sys_2.ldo_vo2_dref && EFUSE.rd_mac_sys_3.ldo_vo2_mul) {
matched_mul = EFUSE.rd_mac_sys_3.ldo_vo2_mul;
matched_dref = EFUSE.rd_mac_sys_2.ldo_vo2_dref;
Expand Down