[mynewt-core] branch master updated: hw/mcu/dialog: Fix return value from da1469x_m33_sleep

[an...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a4cddf  hw/mcu/dialog: Fix return value from da1469x_m33_sleep
2a4cddf is described below

commit 2a4cddf095176856c740fe1da49ab320c235b9e1
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Fri Nov 20 09:51:17 2020 +0100

    hw/mcu/dialog: Fix return value from da1469x_m33_sleep
    
    QSPIC code changes r0 register which is set in the code before to
    indicate that deep sleep did not happen. This means we will always
    return non-zero which means "deep sleep *did* happen" in da1469x_sleep.
    It likely is not not much of a problem except we will always take
    longer path when exiting from da1469x_sleep.
---
 hw/mcu/dialog/da1469x/src/arch/cortex_m33/da1469x_m33_sleep.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/mcu/dialog/da1469x/src/arch/cortex_m33/da1469x_m33_sleep.S b/hw/mcu/dialog/da1469x/src/arch/cortex_m33/da1469x_m33_sleep.S
index 727300d..df0d75e 100644
--- a/hw/mcu/dialog/da1469x/src/arch/cortex_m33/da1469x_m33_sleep.S
+++ b/hw/mcu/dialog/da1469x/src/arch/cortex_m33/da1469x_m33_sleep.S
@@ -160,7 +160,6 @@ da1469x_m33_sleep:
  * did not sleep.
  */
     str     r1, [r0, #0]
-    mov     r0, #0
 
 /* Enable QSPI controller clock */
     ldr     r2, =CLK_AMBA_REG
@@ -183,6 +182,7 @@ da1469x_m33_sleep:
     str     r1, [r0, #(QSPIC_CTRLMOD_OFFSET)]
 #endif
 
+    mov     r0, #0
     b       da1469x_m33_restore
 
     .section .text_ram