[mynewt-core] branch master updated: hw/mcu/dialog: Retain CM_ERROR_DIS_REG

[be...@apache.org]

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

benmccrea 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 f93b8a8  hw/mcu/dialog: Retain CM_ERROR_DIS_REG
     new ab5d874  Merge pull request #2479 from andrzej-kaczmarek/cmac-retain-cm_error_dis_reg
f93b8a8 is described below

commit f93b8a869421ebbe09fdc3f52c276855d10e2d35
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Mon Feb 15 17:58:55 2021 +0100

    hw/mcu/dialog: Retain CM_ERROR_DIS_REG
    
    Latest CMAC PHY uses some hackery with CM_ERROR_DIS_REG to handle
    tx_late errors so we need to retain that register.
---
 hw/mcu/dialog/cmac/src/cmac_sleep.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/mcu/dialog/cmac/src/cmac_sleep.c b/hw/mcu/dialog/cmac/src/cmac_sleep.c
index bd0bc88..5571722 100644
--- a/hw/mcu/dialog/cmac/src/cmac_sleep.c
+++ b/hw/mcu/dialog/cmac/src/cmac_sleep.c
@@ -43,6 +43,7 @@ static __IOM uint32_t * const retained_regs[] = {
     &CMAC->CM_LL_TIMER1_36_10_EQ_Y_REG,
     &CMAC->CM_LL_TIMER1_EQ_X_HI_REG,
     &CMAC->CM_LL_TIMER1_EQ_X_LO_REG,
+    &CMAC->CM_ERROR_DIS_REG,
 #if MYNEWT_VAL(CMAC_DEBUG_DIAG_ENABLE)
     &CMAC->CM_DIAG_PORT0_REG,
     &CMAC->CM_DIAG_PORT1_REG,