From 4a4e51ffa7ee96a454c1f12c690d0cb0cce82726 Mon Sep 17 00:00:00 2001 From: Mieszko Mierunski Date: Thu, 20 Dec 2018 15:36:53 +0100 Subject: [PATCH] drivers: nrf: Fix UARTE fixup defines. Due to alias changes, after UARTE is enabled current dts_fixup is not working. Signed-off-by: Mieszko Mierunski --- soc/arm/nordic_nrf/nrf52/dts_fixup.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h index d29341b977d..a32b7ba5b37 100644 --- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h @@ -4,8 +4,13 @@ #define DT_ADC_0_NAME DT_NORDIC_NRF_SAADC_ADC_0_LABEL +#ifdef DT_NORDIC_NRF_UART_UART_0_LABEL #define DT_UART_0_NAME DT_NORDIC_NRF_UART_UART_0_LABEL -#define DT_UART_1_NAME DT_NORDIC_NRF_UART_UART_1_LABEL +#else +#define DT_UART_0_NAME DT_NORDIC_NRF_UARTE_UART_0_LABEL +#endif + +#define DT_UART_1_NAME DT_NORDIC_NRF_UARTE_UART_1_LABEL #define DT_FLASH_DEV_NAME DT_NRF_NRF52_FLASH_CONTROLLER_4001E000_LABEL