From 824f7224d5effaca7a40e3d6d38659845dff6c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Mon, 3 May 2021 10:14:01 -0700 Subject: [PATCH] soc: nrf52811: fix enabled instance 0 check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Similar fix to that for the 52805. Signed-off-by: Martí Bolívar --- soc/arm/nordic_nrf/validate_enabled_instances.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/soc/arm/nordic_nrf/validate_enabled_instances.c b/soc/arm/nordic_nrf/validate_enabled_instances.c index 4a8cfeeed99..06b24926354 100644 --- a/soc/arm/nordic_nrf/validate_enabled_instances.c +++ b/soc/arm/nordic_nrf/validate_enabled_instances.c @@ -21,8 +21,10 @@ * In most Nordic SoCs, SPI and TWI peripherals with the same instance number * share certain resources and therefore cannot be used at the same time (in * nRF53 and nRF91 Series this limitation concerns UART peripherals as well). - * In nRF52810 though, there are only single instances of these peripherals - * and they are arranged in a different way, so this limitation does not apply. + * + * In some SoCs, like nRF52810, there are only single instances of + * these peripherals and they are arranged in a different way, so this + * limitation does not apply. * * The build assertions below check if conflicting peripheral instances are not * enabled simultaneously. @@ -40,7 +42,9 @@ IF_ENABLED(CONFIG_SOC_SERIES_NRF91X, (", UARTE"#idx)) \ ". Check nodes with status \"okay\" in zephyr.dts." -#if !IS_ENABLED(CONFIG_SOC_NRF52810) && !IS_ENABLED(CONFIG_SOC_NRF52805) +#if (!IS_ENABLED(CONFIG_SOC_NRF52810) && \ + !IS_ENABLED(CONFIG_SOC_NRF52805) && \ + !IS_ENABLED(CONFIG_SOC_NRF52811)) BUILD_ASSERT(CHECK(0), MSG(0)); #endif BUILD_ASSERT(CHECK(1), MSG(1));