This is an automated email from the ASF dual-hosted git repository. rymek pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 93793c9bdfeb4e7930ddd46b2c34c296c35086f6 Author: Jerzy Kasenberg <[email protected]> AuthorDate: Mon Jan 8 10:43:32 2024 +0100 nrf5340/tfm: update nrfx to version 3.3.0 Signed-off-by: Jerzy Kasenberg <[email protected]> --- hw/mcu/nordic/nrf5340/tfm/include/tfm/tfm.h | 2 +- hw/mcu/nordic/nrf5340/tfm/src/tfm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/mcu/nordic/nrf5340/tfm/include/tfm/tfm.h b/hw/mcu/nordic/nrf5340/tfm/include/tfm/tfm.h index 5e50d0c57..e6482eb0a 100644 --- a/hw/mcu/nordic/nrf5340/tfm/include/tfm/tfm.h +++ b/hw/mcu/nordic/nrf5340/tfm/include/tfm/tfm.h @@ -63,7 +63,7 @@ int SECURE_CALL tfm_uicr_otp_write(uint8_t n, uint32_t val); * TFM_ERR_INVALID_PARAM - when pin_number is not present on chip * TFM_ERR_ACCESS_DENIED - when non-secure code is not allowed to change pin's MCU */ -int SECURE_CALL tfm_gpio_pin_mcu_select(uint32_t pin_number, nrf_gpio_pin_mcusel_t mcu_sel); +int SECURE_CALL tfm_gpio_pin_mcu_select(uint32_t pin_number, nrf_gpio_pin_sel_t mcu_sel); /** * Function to set or read device protection status diff --git a/hw/mcu/nordic/nrf5340/tfm/src/tfm.c b/hw/mcu/nordic/nrf5340/tfm/src/tfm.c index 22573db65..cc8c293a4 100644 --- a/hw/mcu/nordic/nrf5340/tfm/src/tfm.c +++ b/hw/mcu/nordic/nrf5340/tfm/src/tfm.c @@ -85,7 +85,7 @@ tfm_uicr_protect_device(uint8_t *approtect, uint8_t *secure_approtect, uint8_t * } int SECURE_CALL -tfm_gpio_pin_mcu_select(uint32_t pin_number, nrf_gpio_pin_mcusel_t mcu_sel) +tfm_gpio_pin_mcu_select(uint32_t pin_number, nrf_gpio_pin_sel_t mcu_sel) { int err = 0; uint32_t pin_mask = (1u << (pin_number & 31)); @@ -95,7 +95,7 @@ tfm_gpio_pin_mcu_select(uint32_t pin_number, nrf_gpio_pin_mcusel_t mcu_sel) } else if (((pin_number < 32) && (MYNEWT_VAL(TFM_MCU_SEL_GPIO0) & pin_mask)) || ((pin_number >= 32) && (pin_number < 64) && (MYNEWT_VAL(TFM_MCU_SEL_GPIO1) & pin_mask))) { - nrf_gpio_pin_mcu_select(pin_number, mcu_sel); + nrf_gpio_pin_control_select(pin_number, mcu_sel); } else { err = TFM_ERR_ACCESS_DENIED; }
