From 57dd3604e2436f074b579c084764774f02d0f65b Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Tue, 3 Sep 2024 10:51:12 +0200 Subject: [PATCH] mspl: Treat simulated nrf54l15 like real one Let's use the SOC_COMPATIBLE_NRF54LX kconfig option instead of SOC_SERIES_NRF54LX so we treat both the real and simulated targets equally. Signed-off-by: Alberto Escolar Piedras --- subsys/mpsl/init/Kconfig | 2 +- subsys/mpsl/init/mpsl_init.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/subsys/mpsl/init/Kconfig b/subsys/mpsl/init/Kconfig index a2bfde8c099..db07e322d61 100644 --- a/subsys/mpsl/init/Kconfig +++ b/subsys/mpsl/init/Kconfig @@ -69,7 +69,7 @@ config MPSL_LOW_PRIO_IRQN default 25 if SOC_COMPATIBLE_NRF52X # SWI5 default 26 if SOC_COMPATIBLE_NRF53X # SWI0 default 404 if SOC_SERIES_NRF54HX # QDEC130 - default 28 if SOC_SERIES_NRF54LX # SWI00 + default 28 if SOC_COMPATIBLE_NRF54LX # SWI00 help This option sets the low priority interrupt that MPSL will use. Check the interrupt number in the MDK diff --git a/subsys/mpsl/init/mpsl_init.c b/subsys/mpsl/init/mpsl_init.c index fb7caefd24a..72ddca57430 100644 --- a/subsys/mpsl/init/mpsl_init.c +++ b/subsys/mpsl/init/mpsl_init.c @@ -42,11 +42,11 @@ extern void rtc_pretick_rtc0_isr_hook(void); #endif #endif -#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_SOC_SERIES_NRF54LX) +#if !defined(CONFIG_SOC_SERIES_NRF54HX) && !defined(CONFIG_SOC_COMPATIBLE_NRF54LX) #define MPSL_TIMER_IRQn TIMER0_IRQn #define MPSL_RTC_IRQn RTC0_IRQn #define MPSL_RADIO_IRQn RADIO_IRQn -#elif defined(CONFIG_SOC_SERIES_NRF54LX) +#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX) #define MPSL_TIMER_IRQn TIMER10_IRQn #define MPSL_RTC_IRQn GRTC_3_IRQn #define MPSL_RADIO_IRQn RADIO_0_IRQn @@ -59,11 +59,11 @@ extern void rtc_pretick_rtc0_isr_hook(void); #if defined(CONFIG_SOC_SERIES_NRF54HX) /* Basic build time sanity checking */ #define MPSL_RESERVED_GRTC_CHANNELS ((1U << 8) | (1U << 9) | (1U << 10) | (1U << 11) | (1U << 12)) -#elif defined(CONFIG_SOC_SERIES_NRF54LX) +#elif defined(CONFIG_SOC_COMPATIBLE_NRF54LX) #define MPSL_RESERVED_GRTC_CHANNELS ((1U << 7) | (1U << 8) | (1U << 9) | (1U << 10) | (1U << 11)) #endif -#if defined(CONFIG_SOC_SERIES_NRF54HX) || defined(CONFIG_SOC_SERIES_NRF54LX) +#if defined(CONFIG_SOC_SERIES_NRF54HX) || defined(CONFIG_SOC_COMPATIBLE_NRF54LX) BUILD_ASSERT(MPSL_RTC_IRQn != DT_IRQN(DT_NODELABEL(grtc)), "MPSL requires a dedicated GRTC IRQ");