Selaa lähdekoodia

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
Armando (Dou Yiwen) 2 vuotta sitten
vanhempi
sitoutus
e3fea3ad71

+ 2 - 1
components/esp_psram/esp32s3/esp_psram_impl_octal.c

@@ -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();

+ 1 - 0
components/esp_psram/esp_psram_impl.h

@@ -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)
 
 
 /*