Merge branch 'feature/esp32c61_flash_psram_timing_tuning' into 'master'

feat(mspi): support 120MHz flash and psram for esp32c61

Closes IDF-9256, IDF-14918, and IDFCI-3240

See merge request espressif/esp-idf!45012
This commit is contained in:
Song Ruo Jing
2026-01-22 16:36:25 +08:00
40 changed files with 141 additions and 280 deletions
-2
View File
@@ -601,11 +601,9 @@ static NOINLINE_ATTR IRAM_ATTR void flash_init_state(void)
* In this stage, we re-configure the Flash (and MSPI) to required configuration
*/
spi_flash_init_chip_state();
#if SOC_MEMSPI_SRC_FREQ_120M_SUPPORTED
// This function needs to be called when PLL is enabled. Needs to be called after spi_flash_init_chip_state in case
// some state of flash is modified.
mspi_timing_flash_tuning();
#endif
}
MSPI_INIT_ATTR void mspi_init(void)