adjust

xiongyihui · xiongyihui · commit dbe47a6a2a3a · 2020-08-05T16:07:18.000+08:00
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c
@@ -302,7 +302,8 @@ void port_sleep_until_interrupt(void) {
         nrf_gpio_cfg_output(MICROPY_QSPI_CS);
         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;
         NRF_QSPI->ENABLE = 0;
     }
diff --git a/ports/nrf/supervisor/qspi_flash.c b/ports/nrf/supervisor/qspi_flash.c
@@ -39,7 +39,7 @@
 #include "supervisor/shared/external_flash/qspi_flash.h"
 
 #if defined(MICROPY_QSPI_OFF_WHEN_SLEEP)
-#define QSPI_ENABLE qspi_enable
+#define QSPI_ENABLE() qspi_enable()
 
 static void qspi_enable(void)
 {
@@ -62,7 +62,7 @@ static void qspi_enable(void)
 }
 
 #else
-#define QSPI_ENABLE()
+#define QSPI_ENABLE() ((void)0)
 #endif
 
 bool spi_flash_command(uint8_t command) {

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,8 @@ void port_sleep_until_interrupt(void) {`
`302`	`302`	`nrf_gpio_cfg_output(MICROPY_QSPI_CS);`
`303`	`303`	`nrf_gpio_pin_write(MICROPY_QSPI_CS, 1);`
`304`	`304`
`305`		`- (volatile uint32_t )0x40029010 = 1;`
	`305`	`+ // Workaround to disable QSPI according to nRF52840 Revision 1 Errata V1.4 - 3.8`
	`306`	`+ NRF_QSPI->TASKS_DEACTIVATE = 1;`
`306`	`307`	`(volatile uint32_t )0x40029054 = 1;`
`307`	`308`	`NRF_QSPI->ENABLE = 0;`
`308`	`309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`#include "supervisor/shared/external_flash/qspi_flash.h"`
`40`	`40`
`41`	`41`	`#if defined(MICROPY_QSPI_OFF_WHEN_SLEEP)`
`42`		`-#define QSPI_ENABLE qspi_enable`
	`42`	`+#define QSPI_ENABLE() qspi_enable()`
`43`	`43`
`44`	`44`	`static void qspi_enable(void)`
`45`	`45`	`{`
`@@ -62,7 +62,7 @@ static void qspi_enable(void)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`#else`
`65`		`-#define QSPI_ENABLE()`
	`65`	`+#define QSPI_ENABLE() ((void)0)`
`66`	`66`	`#endif`
`67`	`67`
`68`	`68`	`bool spi_flash_command(uint8_t command) {`