StackRduino
diff --git a/‎ports/mimxrt10xx/common-hal/rtc/RTC.c‎
Lines changed: 1 addition & 0 deletions b/‎ports/mimxrt10xx/common-hal/rtc/RTC.c‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎ports/mimxrt10xx/supervisor/port.c‎
Lines changed: 8 additions & 3 deletions b/‎ports/mimxrt10xx/supervisor/port.c‎
Lines changed: 8 additions & 3 deletions
@@ -72,5 +72,6 @@ int common_hal_rtc_get_calibration(void) {
 }
 
 void common_hal_rtc_set_calibration(int calibration) {
+    // SNVS has HPCALB_VAL bits for calibration.
     mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board"));
 }
@@ -328,7 +328,7 @@ uint32_t *port_heap_get_top(void) {
     return &_ld_heap_end;
 }
 
-// Place the word to save just after our BSS section that gets blanked.
+// Place the word into the low power section of the SNVS.
 void port_set_saved_word(uint32_t value) {
     SNVS->LPGPR[1] = value;
 }
@@ -366,8 +366,11 @@ void port_interrupt_after_ticks(uint32_t ticks) {
     uint8_t subticks;
     uint64_t current_ticks = port_get_raw_ticks(&subticks);
     current_ticks += ticks;
-    SNVS->HPTALR = current_ticks << 5 | subticks;
+    SNVS->HPCR &= ~SNVS_HPCR_HPTA_EN_MASK;
+    // Wait for the alarm to be disabled.
+    while ((SNVS->HPCR & SNVS_HPCR_HPTA_EN_MASK) != 0) {}
     SNVS->HPTAMR = current_ticks >> (32 - 5);
+    SNVS->HPTALR = current_ticks << 5 | subticks;
     SNVS->HPCR |= SNVS_HPCR_HPTA_EN_MASK;
 }
 
@@ -379,8 +382,10 @@ void port_sleep_until_interrupt(void) {
         __set_FPSCR(__get_FPSCR()  & ~(0x9f));
         (void) __get_FPSCR();
     }
-    // Call wait for interrupt ourselves if the SD isn't enabled.
+    NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn);
+    CLOCK_SetMode(kCLOCK_ModeWait);
     __WFI();
+    CLOCK_SetMode(kCLOCK_ModeRun);
 }
 
 /**
Original file line number	Diff line number	Diff line change
`@@ -72,5 +72,6 @@ int common_hal_rtc_get_calibration(void) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void common_hal_rtc_set_calibration(int calibration) {`
	`75`	`+ // SNVS has HPCALB_VAL bits for calibration.`
`75`	`76`	`mp_raise_NotImplementedError(translate("RTC calibration is not supported on this board"));`
`76`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -328,7 +328,7 @@ uint32_t *port_heap_get_top(void) {`
`328`	`328`	`return &_ld_heap_end;`
`329`	`329`	`}`
`330`	`330`
`331`		`-// Place the word to save just after our BSS section that gets blanked.`
	`331`	`+// Place the word into the low power section of the SNVS.`
`332`	`332`	`void port_set_saved_word(uint32_t value) {`
`333`	`333`	`SNVS->LPGPR[1] = value;`
`334`	`334`	`}`
`@@ -366,8 +366,11 @@ void port_interrupt_after_ticks(uint32_t ticks) {`
`366`	`366`	`uint8_t subticks;`
`367`	`367`	`uint64_t current_ticks = port_get_raw_ticks(&subticks);`
`368`	`368`	`current_ticks += ticks;`
`369`		`- SNVS->HPTALR = current_ticks << 5 \| subticks;`
	`369`	`+ SNVS->HPCR &= ~SNVS_HPCR_HPTA_EN_MASK;`
	`370`	`+ // Wait for the alarm to be disabled.`
	`371`	`+ while ((SNVS->HPCR & SNVS_HPCR_HPTA_EN_MASK) != 0) {}`
`370`	`372`	`SNVS->HPTAMR = current_ticks >> (32 - 5);`
	`373`	`+ SNVS->HPTALR = current_ticks << 5 \| subticks;`
`371`	`374`	`SNVS->HPCR \|= SNVS_HPCR_HPTA_EN_MASK;`
`372`	`375`	`}`
`373`	`376`
`@@ -379,8 +382,10 @@ void port_sleep_until_interrupt(void) {`
`379`	`382`	`__set_FPSCR(__get_FPSCR() & ~(0x9f));`
`380`	`383`	`(void) __get_FPSCR();`
`381`	`384`	`}`
`382`		`- // Call wait for interrupt ourselves if the SD isn't enabled.`
	`385`	`+ NVIC_ClearPendingIRQ(SNVS_HP_WRAPPER_IRQn);`
	`386`	`+ CLOCK_SetMode(kCLOCK_ModeWait);`
`383`	`387`	`__WFI();`
	`388`	`+ CLOCK_SetMode(kCLOCK_ModeRun);`
`384`	`389`	`}`
`385`	`390`
`386`	`391`	`/**`