This commit is contained in:
Yihui Xiong 2020-08-05 16:07:18 +08:00
parent 6dc0f4f1b6
commit dbe47a6a2a
2 changed files with 4 additions and 3 deletions

View File

@ -302,7 +302,8 @@ void port_sleep_until_interrupt(void) {
nrf_gpio_cfg_output(MICROPY_QSPI_CS); nrf_gpio_cfg_output(MICROPY_QSPI_CS);
nrf_gpio_pin_write(MICROPY_QSPI_CS, 1); nrf_gpio_pin_write(MICROPY_QSPI_CS, 1);
*(volatile uint32_t *)0x40029010 = 1; // Workaround to disable QSPI according to nRF52840 Revision 1 Errata V1.4 - 3.8
NRF_QSPI->TASKS_DEACTIVATE = 1;
*(volatile uint32_t *)0x40029054 = 1; *(volatile uint32_t *)0x40029054 = 1;
NRF_QSPI->ENABLE = 0; NRF_QSPI->ENABLE = 0;
} }

View File

@ -39,7 +39,7 @@
#include "supervisor/shared/external_flash/qspi_flash.h" #include "supervisor/shared/external_flash/qspi_flash.h"
#if defined(MICROPY_QSPI_OFF_WHEN_SLEEP) #if defined(MICROPY_QSPI_OFF_WHEN_SLEEP)
#define QSPI_ENABLE qspi_enable #define QSPI_ENABLE() qspi_enable()
static void qspi_enable(void) static void qspi_enable(void)
{ {
@ -62,7 +62,7 @@ static void qspi_enable(void)
} }
#else #else
#define QSPI_ENABLE() #define QSPI_ENABLE() ((void)0)
#endif #endif
bool spi_flash_command(uint8_t command) { bool spi_flash_command(uint8_t command) {