Skip to content

Commit b8c264b

Browse files
committed
[nrf fromlist] platform: nordic_nrf: enable GPIO IOCTL service wrappers on nRF54L/nRF71
Gate the tfm_platform_gpio_pin_mcu_select() wrappers on NRF_GPIO_HAS_SEL to match the service implementation. The MCUSEL field was renamed to CTRLSEL on nRF54L/nRF71, so the old guard always short-circuited to NOT_SUPPORTED there. Upstream PR: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/50878 Change-Id: I5c5f8e9e5b9352be9464adba944a8a0fa5dc1d92 Signed-off-by: Dag Erik Gjørvad <dag.erik.gjorvad@nordicsemi.no>
1 parent 7c7180b commit b8c264b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

platform/ext/target/nordic_nrf/common/core/services/src/tfm_ioctl_core_ns_api.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <nrfx.h>
8+
#include <hal/nrf_gpio.h>
89
#include <stdint.h>
910
#include <tfm_platform_api.h>
1011
#include <tfm_ioctl_core_api.h>
@@ -39,7 +40,7 @@ enum tfm_platform_err_t tfm_platform_mem_read(void *destination, uint32_t addr,
3940
enum tfm_platform_err_t tfm_platform_gpio_pin_mcu_select(uint32_t pin_number, uint32_t mcu,
4041
uint32_t *result)
4142
{
42-
#if defined(GPIO_PIN_CNF_MCUSEL_Msk)
43+
#if NRF_GPIO_HAS_SEL
4344
enum tfm_platform_err_t ret;
4445
psa_invec in_vec;
4546
psa_outvec out_vec;

platform/ext/target/nordic_nrf/common/core/services/src/tfm_ioctl_core_s_api.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77

88
#include <nrfx.h>
9+
#include <hal/nrf_gpio.h>
910
#include <stdint.h>
1011
#include "tfm_platform_api.h"
1112
#include "tfm_ioctl_core_api.h"
@@ -38,7 +39,7 @@ enum tfm_platform_err_t tfm_platform_mem_read(void *destination, uint32_t addr,
3839
enum tfm_platform_err_t tfm_platform_gpio_pin_mcu_select(uint32_t pin_number, uint32_t mcu,
3940
uint32_t *result)
4041
{
41-
#if defined(GPIO_PIN_CNF_MCUSEL_Msk)
42+
#if NRF_GPIO_HAS_SEL
4243
enum tfm_platform_err_t ret;
4344
psa_invec in_vec;
4445
psa_outvec out_vec;

0 commit comments

Comments
 (0)