From 3e93f9f67d1fcd21cd7e08ba6437ba62bd97a182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Thu, 27 Feb 2020 09:32:05 +0000 Subject: [PATCH] modules: hal: nordic: Fix translation of peripheral symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the hal_nordic module revision, to apply the following changes: nrfx_config: Fix translation of symbols for _S or _NS only peripherals For peripherals with only one type of access available (either secure or non-secure), the common symbol translation scheme cannot be used as it leads to mapping to non-existing symbols (e.g. NRF_FICR_NS). Instead, use fixed translations for these symbols (e.g. NRF_FICR to NRF_FICR_S, only for secure images). nrfx_config: Add missing _S/_NS symbol translations for nRF5340/nRF9160 Add translations of names with _S and _NS suffixes for peripheral access symbols that are available for a given chip but were not used so far in any nrfx HAL or driver, to make the lists of translations complete and consistent. This commit corrects also the translation of NRF_I2S symbol for nRF5340 whose name for this SoC contains also the index 0 (so it needs to be handled similarly like NRF_PDM0 is). Signed-off-by: Andrzej Głąbek --- soc/arm/nordic_nrf/validate_base_addresses.c | 5 ++++- west.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/soc/arm/nordic_nrf/validate_base_addresses.c b/soc/arm/nordic_nrf/validate_base_addresses.c index 5096377082d..fb4f490153e 100644 --- a/soc/arm/nordic_nrf/validate_base_addresses.c +++ b/soc/arm/nordic_nrf/validate_base_addresses.c @@ -19,6 +19,9 @@ * Provide translation of symbols for peripherals that for some SoCs got names * without the index. */ +#ifndef NRF_I2S0 +#define NRF_I2S0 NRF_I2S +#endif #ifndef NRF_PDM0 #define NRF_PDM0 NRF_PDM #endif @@ -79,7 +82,7 @@ CHECK_ADDRESS(DT_NORDIC_NRF_GPIOTE_GPIOTE_0_BASE_ADDRESS, NRF_GPIOTE); #endif #if defined(DT_NORDIC_NRF_I2S_I2S_0_BASE_ADDRESS) -CHECK_ADDRESS(DT_NORDIC_NRF_I2S_I2S_0_BASE_ADDRESS, NRF_I2S); +CHECK_ADDRESS(DT_NORDIC_NRF_I2S_I2S_0_BASE_ADDRESS, NRF_I2S0); #endif #if defined(DT_INST_0_NORDIC_NRF_IPC_BASE_ADDRESS) diff --git a/west.yml b/west.yml index cd8ecb8a43d..42c968bc01c 100644 --- a/west.yml +++ b/west.yml @@ -47,7 +47,7 @@ manifest: revision: a12d92816a53a521d79cefcf5c38b9dc8a4fed6e path: modules/hal/cypress - name: hal_nordic - revision: 62f9c632209ce9438edfcfdcee7a846344359647 + revision: f6d5eca68e07551d6a36359b67600f9e98736839 path: modules/hal/nordic - name: hal_openisa revision: 3b54187649cc9b37161d49918f1ad28ff7c7f830