Merge branch 'feature/support_32MB_psram_s3' into 'master'

psram: supported 32MB psram on esp32s3

Closes IDF-7365

See merge request espressif/esp-idf!23753
This commit is contained in:
Armando (Dou Yiwen) 2023-05-16 16:03:17 +08:00
commit e3fea3ad71
2 changed files with 3 additions and 1 deletions

View File

@ -325,7 +325,8 @@ esp_err_t esp_psram_impl_enable(psram_vaddr_mode_t vaddrmode)
s_psram_size = mode_reg.mr2.density == 0x1 ? PSRAM_SIZE_4MB :
mode_reg.mr2.density == 0X3 ? PSRAM_SIZE_8MB :
mode_reg.mr2.density == 0x5 ? PSRAM_SIZE_16MB :
mode_reg.mr2.density == 0x7 ? PSRAM_SIZE_32MB : 0;
mode_reg.mr2.density == 0x7 ? PSRAM_SIZE_32MB :
mode_reg.mr2.density == 0x6 ? PSRAM_SIZE_64MB : 0;
//Do PSRAM timing tuning, we use SPI1 to do the tuning, and set the SPI0 PSRAM timing related registers accordingly
mspi_timing_psram_tuning();

View File

@ -18,6 +18,7 @@ extern "C" {
#define PSRAM_SIZE_8MB (8 * 1024 * 1024)
#define PSRAM_SIZE_16MB (16 * 1024 * 1024)
#define PSRAM_SIZE_32MB (32 * 1024 * 1024)
#define PSRAM_SIZE_64MB (64 * 1024 * 1024)
/*