Merge branch 'feat/psram_100m' into 'master'

psram: support psram 100mhz

Closes IDF-15524

See merge request espressif/esp-idf!47249
This commit is contained in:
Armando (Dou Yiwen)
2026-04-03 06:20:33 +00:00
3 changed files with 5 additions and 8 deletions
@@ -21,9 +21,9 @@
#elif CONFIG_SPIRAM_SPEED_200M
#define MSPI_TIMING_PSRAM_NEEDS_TUNING 1
#define MSPI_TIMING_MPLL_FREQ_MHZ 400
#elif CONFIG_SPIRAM_SPEED_80M
#elif CONFIG_SPIRAM_SPEED_100M
#define MSPI_TIMING_PSRAM_NEEDS_TUNING 1
#define MSPI_TIMING_MPLL_FREQ_MHZ 320
#define MSPI_TIMING_MPLL_FREQ_MHZ 400
#else
#define MSPI_TIMING_MPLL_FREQ_MHZ 400
#endif
@@ -54,9 +54,7 @@
#define AP_OCT_PSRAM_CS_ECC_HOLD_TIME 4
#define AP_OCT_PSRAM_CS_HOLD_DELAY 3
#if CONFIG_SPIRAM_SPEED_80M
#define AP_OCT_PSRAM_MPLL_DEFAULT_FREQ_MHZ 320
#elif CONFIG_SPIRAM_SPEED_250M
#if CONFIG_SPIRAM_SPEED_250M
#define AP_OCT_PSRAM_MPLL_DEFAULT_FREQ_MHZ 500
#else
#define AP_OCT_PSRAM_MPLL_DEFAULT_FREQ_MHZ 400
+2 -3
View File
@@ -28,8 +28,8 @@ menu "PSRAM config"
config SPIRAM_SPEED_200M
bool "200MHz clock speed"
config SPIRAM_SPEED_80M
bool "80MHz clock speed"
config SPIRAM_SPEED_100M
bool "100MHz clock speed"
config SPIRAM_SPEED_40M
bool "40MHz clock speed"
@@ -38,7 +38,6 @@ menu "PSRAM config"
config SPIRAM_SPEED
int
default 40 if SPIRAM_SPEED_40M
default 80 if SPIRAM_SPEED_80M
default 100 if SPIRAM_SPEED_100M
default 200 if SPIRAM_SPEED_200M
default 250 if SPIRAM_SPEED_250M