[mynewt-nimble] branch master updated: nimble/hw: Apply #102 #106 and #107 erratas also for nRF52840

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 79927d1  nimble/hw: Apply #102 #106 and #107 erratas also for nRF52840
     new a6c509b  Merge pull request #401 from sjanc/nrf52840_errata
79927d1 is described below

commit 79927d161659eb71173f10ba84288a262cceb874
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Apr 1 12:12:34 2019 +0200

    nimble/hw: Apply #102 #106 and #107 erratas also for nRF52840
    
    Although Nordic's infocenter claims this is fixed in final build of
    nRF52840, LL/ENC/MAS/BI-01-C was failing without enabling those.
---
 nimble/drivers/nrf52/src/ble_phy.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nimble/drivers/nrf52/src/ble_phy.c b/nimble/drivers/nrf52/src/ble_phy.c
index 04228d7..eddb372 100644
--- a/nimble/drivers/nrf52/src/ble_phy.c
+++ b/nimble/drivers/nrf52/src/ble_phy.c
@@ -245,7 +245,6 @@ struct nrf_ccm_data
 struct nrf_ccm_data g_nrf_ccm_data;
 #endif
 
-#ifdef NRF52
 static void
 ble_phy_apply_errata_102_106_107(void)
 {
@@ -256,7 +255,6 @@ ble_phy_apply_errata_102_106_107(void)
     *(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
                          0xfffffffe) | 0x01000000;
 }
-#endif
 
 #if (BLE_LL_BT5_PHY_SUPPORTED == 1)
 
@@ -1842,9 +1840,7 @@ ble_phy_set_access_addr(uint32_t access_addr)
 
     g_ble_phy_data.phy_access_address = access_addr;
 
-#ifdef NRF52
     ble_phy_apply_errata_102_106_107();
-#endif
 
     return 0;
 }