Skip to content

Commit

Permalink
Merge branch 'bugfix/reserve_mspi_pin_regarding_line_mode_v5.2' into …
Browse files Browse the repository at this point in the history
…'release/v5.2'

fix(gpio_reserve): reserve the mspi pin regarding line mode (v5.2)

See merge request espressif/esp-idf!35907
  • Loading branch information
suda-morris committed Dec 26, 2024
2 parents 2ef8f9e + 607afec commit 79014cc
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion components/spi_flash/flash_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,18 @@ void IRAM_ATTR esp_mspi_pin_init(void)
#endif
/* Reserve the GPIO pins */
uint64_t reserve_pin_mask = 0;
uint8_t mspi_io;
for (esp_mspi_io_t i = 0; i < ESP_MSPI_IO_MAX; i++) {
reserve_pin_mask |= BIT64(esp_mspi_get_io(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);
}
}
esp_gpio_reserve_pins(reserve_pin_mask);
}
Expand Down

0 comments on commit 79014cc

Please sign in to comment.