Merge branch 'bugfix/fix_mspi_timing_tuning_psram_timing_issue' into …

…'master' mspi_tuning: fix psram timing tuning bug Closes IDF-6457 See merge request espressif/esp-idf!21536
espressif · Dec 15, 2022 · 34e5a80 · 34e5a80
2 parents 67cfef0 + 25114b7
commit 34e5a80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32s3_octal_advanced b/components/esp_psram/test_apps/psram/sdkconfig.ci.esp32s3_octal_advanced
@@ -2,6 +2,7 @@ CONFIG_IDF_TARGET="esp32s3"
 
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
 CONFIG_SPIRAM_RODATA=y
 

diff --git a/components/spi_flash/spi_flash_timing_tuning.c b/components/spi_flash/spi_flash_timing_tuning.c
@@ -392,6 +392,9 @@ static void clear_timing_tuning_regs(bool control_spi1)
     } else {
         //Won't touch SPI1 registers
     }
+
+    spi_timing_config_psram_set_din_mode_num(0, 0, 0);
+    spi_timing_config_psram_set_extra_dummy(0, 0);
 }
 #endif  //#if SPI_TIMING_FLASH_NEEDS_TUNING || SPI_TIMING_PSRAM_NEEDS_TUNING
 
@@ -414,6 +417,9 @@ void spi_timing_enter_mspi_low_speed_mode(bool control_spi1)
         spi_timing_config_set_flash_clock(1, 4);
     }
 
+    //Set PSRAM module clock
+    spi_timing_config_set_psram_clock(0, 4);
+
 #if SPI_TIMING_FLASH_NEEDS_TUNING || SPI_TIMING_PSRAM_NEEDS_TUNING
     clear_timing_tuning_regs(control_spi1);
 #endif