Merge branch 'bugfix/reserve_mspi_pin_regarding_line_mode' into 'master'

fix(gpio_reserve): reserve the mspi pin regarding line mode See merge request espressif/esp-idf!33488
espressif · Sep 13, 2024 · bd38d80 · bd38d80
2 parents f98e288 + a80603c
commit bd38d80
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/components/spi_flash/flash_ops.c b/components/spi_flash/flash_ops.c
@@ -159,6 +159,12 @@ void esp_mspi_pin_reserve(void)
     uint64_t reserve_pin_mask = 0;
     uint8_t mspi_io;
     for (esp_mspi_io_t i = 0; i < ESP_MSPI_IO_MAX; i++) {
+#if SOC_SPI_MEM_SUPPORT_OPI_MODE
+        if (!bootloader_flash_is_octal_mode_enabled()
+            && i >=  ESP_MSPI_IO_DQS && i <= ESP_MSPI_IO_D7) {
+            continue;
+        }
+#endif
         mspi_io = esp_mspi_get_io(i);
         if (mspi_io < 64) {     // 'reserve_pin_mask' have 64 bits length
             reserve_pin_mask |= BIT64(mspi_io);