(mynewt-core) branch master updated: hw/mcu/nordic: Fix SPI for non-secure code

[jerzy]

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

jerzy 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 95ef76fce hw/mcu/nordic: Fix SPI for non-secure code
95ef76fce is described below

commit 95ef76fce24f039856e12f4b7a68e760b9aef2d0
Author: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
AuthorDate: Wed Nov 20 14:42:09 2024 +0100

    hw/mcu/nordic: Fix SPI for non-secure code
    
    hal_spi.c used hardcoded NRF_SPIMx_S NRF_SPISx_S instead of
    secure/non-secure aware macros NRF_SPIMx NRF_SPISx
    
    Signed-off-by: Jerzy Kasenberg <jerzy.kasenb...@codecoup.pl>
---
 hw/mcu/nordic/nrf5340/src/hal_spi.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/mcu/nordic/nrf5340/src/hal_spi.c 
b/hw/mcu/nordic/nrf5340/src/hal_spi.c
index caeab72e9..dc24bd0d3 100644
--- a/hw/mcu/nordic/nrf5340/src/hal_spi.c
+++ b/hw/mcu/nordic/nrf5340/src/hal_spi.c
@@ -620,13 +620,13 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
         irq_handler = nrf5340_spi0_irq_handler;
         if (spi_type == HAL_SPI_TYPE_MASTER) {
 #if MYNEWT_VAL(SPI_0_MASTER)
-            spi->nhs_spi.spim = NRF_SPIM0_S;
+            spi->nhs_spi.spim = NRF_SPIM0;
 #else
             assert(0);
 #endif
         } else {
 #if MYNEWT_VAL(SPI_0_SLAVE)
-            spi->nhs_spi.spis = NRF_SPIS0_S;
+            spi->nhs_spi.spis = NRF_SPIS0;
 #else
             assert(0);
 #endif
@@ -640,13 +640,13 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
         irq_handler = nrf5340_spi1_irq_handler;
         if (spi_type == HAL_SPI_TYPE_MASTER) {
 #if MYNEWT_VAL(SPI_1_MASTER)
-            spi->nhs_spi.spim = NRF_SPIM1_S;
+            spi->nhs_spi.spim = NRF_SPIM1;
 #else
             assert(0);
 #endif
         } else {
 #if MYNEWT_VAL(SPI_1_SLAVE)
-            spi->nhs_spi.spis = NRF_SPIS1_S;
+            spi->nhs_spi.spis = NRF_SPIS1;
 #else
             assert(0);
 #endif
@@ -660,13 +660,13 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
         irq_handler = nrf5340_spi2_irq_handler;
         if (spi_type == HAL_SPI_TYPE_MASTER) {
 #if MYNEWT_VAL(SPI_2_MASTER)
-            spi->nhs_spi.spim = NRF_SPIM2_S;
+            spi->nhs_spi.spim = NRF_SPIM2;
 #else
             assert(0);
 #endif
         } else {
 #if MYNEWT_VAL(SPI_2_SLAVE)
-            spi->nhs_spi.spis = NRF_SPIS2_S;
+            spi->nhs_spi.spis = NRF_SPIS2;
 #else
             assert(0);
 #endif
@@ -680,13 +680,13 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
         irq_handler = nrf5340_spi3_irq_handler;
         if (spi_type == HAL_SPI_TYPE_MASTER) {
 #if MYNEWT_VAL(SPI_3_MASTER)
-            spi->nhs_spi.spim = NRF_SPIM2_S;
+            spi->nhs_spi.spim = NRF_SPIM3;
 #else
             assert(0);
 #endif
         } else {
 #if MYNEWT_VAL(SPI_3_SLAVE)
-            spi->nhs_spi.spis = NRF_SPIS2_S;
+            spi->nhs_spi.spis = NRF_SPIS3;
 #else
             assert(0);
 #endif
@@ -699,7 +699,7 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
         spi->irq_num = SPIM4_IRQn;
         irq_handler = nrf5340_spi4_irq_handler;
         if (spi_type == HAL_SPI_TYPE_MASTER) {
-            spi->nhs_spi.spim = NRF_SPIM4_S;
+            spi->nhs_spi.spim = NRF_SPIM4;
         } else {
             assert(0);
         }