michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ext: nordic: mdk: Set UICR HFXOCNT value to 0x20 if erased

Browse source 
This is a temporary fix in one of the MDK files that is a part of nrfx
and it is expected to be replaced with the final solution in the next
update of nrfx.

Signed-off-by: Simen Tinderholt <Simen.Tinderholt@nordicsemi.no>
Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Simen Tinderholt 2018-12-12 11:22:10 +01:00 • committed by Kumar Gala
commit 8f56e8e681
1 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ext/hal/nordic/nrfx/mdk/system_nrf9160.c
View file

@ -44,6 +44,8 @@ NOTICE: This file has been modified by Nordic Semiconductor ASA.
/* Errata are only handled in secure mode since they usually need access to FICR. */ /* Errata are only handled in secure mode since they usually need access to FICR. */
#if !defined(NRF_TRUSTZONE_NONSECURE) #if !defined(NRF_TRUSTZONE_NONSECURE)
static bool uicr_HFXOSRC_erased(void);
static bool uicr_HFXOCNT_erased(void);
static bool errata_6(void); static bool errata_6(void);
static bool errata_14(void); static bool errata_14(void);
static bool errata_15(void); static bool errata_15(void);
@ -78,8 +80,8 @@ void SystemInit(void)
#endif #endif
} }
/* Make sure UICR->HFXOSRC is set */ /* Set UICR->HFXOSRC and UICR->HFXOCNT to working defaults if UICR was erased */
if ((NRF_UICR_S->HFXOSRC & UICR_HFXOSRC_HFXOSRC_Msk) != UICR_HFXOSRC_HFXOSRC_TCXO) { if (uicr_HFXOSRC_erased() || uicr_HFXOCNT_erased()) {
/* Wait for pending NVMC operations to finish */ /* Wait for pending NVMC operations to finish */
while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready); while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready);
@ -87,9 +89,17 @@ void SystemInit(void)
NRF_NVMC_S->CONFIG = NVMC_CONFIG_WEN_Wen; NRF_NVMC_S->CONFIG = NVMC_CONFIG_WEN_Wen;
while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready); while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready);
/* Write new value to UICR->HFXOSRC */ if (uicr_HFXOSRC_erased()){
NRF_UICR_S->HFXOSRC = (NRF_UICR_S->HFXOSRC & ~UICR_HFXOSRC_HFXOSRC_Msk) | UICR_HFXOSRC_HFXOSRC_TCXO; /* Write default value to UICR->HFXOSRC */
while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready); NRF_UICR_S->HFXOSRC = (NRF_UICR_S->HFXOSRC & ~UICR_HFXOSRC_HFXOSRC_Msk) | UICR_HFXOSRC_HFXOSRC_TCXO;
while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready);
}
if (uicr_HFXOCNT_erased()){
/* Write default value to UICR->HFXOCNT */
NRF_UICR_S->HFXOCNT = (NRF_UICR_S->HFXOCNT & ~UICR_HFXOCNT_HFXOCNT_Msk) | 0x20;
while (NRF_NVMC_S->READY != NVMC_READY_READY_Ready);
}
/* Enable read mode in NVMC */ /* Enable read mode in NVMC */
NRF_NVMC_S->CONFIG = NVMC_CONFIG_WEN_Ren; NRF_NVMC_S->CONFIG = NVMC_CONFIG_WEN_Ren;
@ -133,6 +143,25 @@ void SystemInit(void)
#if !defined(NRF_TRUSTZONE_NONSECURE) #if !defined(NRF_TRUSTZONE_NONSECURE)
bool uicr_HFXOCNT_erased()
{
if (NRF_UICR_S->HFXOCNT == 0xFFFFFFFFul) {
return true;
}
return false;
}
bool uicr_HFXOSRC_erased()
{
if ((NRF_UICR_S->HFXOSRC & UICR_HFXOSRC_HFXOSRC_Msk) != UICR_HFXOSRC_HFXOSRC_TCXO) {
return true;
}
return false;
}
bool errata_6() bool errata_6()
{ {
if (*(uint32_t *)0x00FF0130 == 0x9ul){ if (*(uint32_t *)0x00FF0130 == 0x9ul){