From 7b6796ee79c7884b116300266418b680a95d615d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 15 Apr 2020 06:32:53 -0500 Subject: [PATCH] soc: arm: nordic_nrf: Convert to new DT_INST macros Convert older DT_INST_ macro use the new include/devicetree.h DT_INST macro APIs. Signed-off-by: Kumar Gala --- soc/arm/nordic_nrf/nrf51/dts_fixup.h | 2 +- soc/arm/nordic_nrf/nrf52/dts_fixup.h | 2 +- soc/arm/nordic_nrf/nrf53/dts_fixup.h | 3 +-- soc/arm/nordic_nrf/nrf91/dts_fixup.h | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/soc/arm/nordic_nrf/nrf51/dts_fixup.h b/soc/arm/nordic_nrf/nrf51/dts_fixup.h index 45de84e5a99..63de2a501fe 100644 --- a/soc/arm/nordic_nrf/nrf51/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf51/dts_fixup.h @@ -8,7 +8,7 @@ #define DT_UART_0_NAME DT_NORDIC_NRF_UART_UART_0_LABEL -#define DT_FLASH_DEV_NAME DT_INST_0_NORDIC_NRF51_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, nordic_nrf51_flash_controller)) #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h index c9cdbac66e2..0a22c38d292 100644 --- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h @@ -14,7 +14,7 @@ #define DT_UART_1_NAME DT_NORDIC_NRF_UARTE_UART_1_LABEL -#define DT_FLASH_DEV_NAME DT_INST_0_NORDIC_NRF52_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, nordic_nrf52_flash_controller)) #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL #define DT_GPIO_P1_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_1_LABEL diff --git a/soc/arm/nordic_nrf/nrf53/dts_fixup.h b/soc/arm/nordic_nrf/nrf53/dts_fixup.h index cdcbd7b3432..9fae5a2d966 100644 --- a/soc/arm/nordic_nrf/nrf53/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf53/dts_fixup.h @@ -17,8 +17,7 @@ #define DT_UART_0_NAME DT_NORDIC_NRF_UARTE_UART_0_LABEL #define DT_UART_1_NAME DT_NORDIC_NRF_UARTE_UART_1_LABEL -#define DT_FLASH_DEV_NAME \ - DT_NORDIC_NRF53_FLASH_CONTROLLER_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, nordic_nrf53_flash_controller)) #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL #define DT_GPIO_P1_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_1_LABEL diff --git a/soc/arm/nordic_nrf/nrf91/dts_fixup.h b/soc/arm/nordic_nrf/nrf91/dts_fixup.h index 885bf5647a2..ef0770a050a 100644 --- a/soc/arm/nordic_nrf/nrf91/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf91/dts_fixup.h @@ -17,8 +17,7 @@ #define DT_UART_2_NAME DT_NORDIC_NRF_UARTE_UART_2_LABEL #define DT_UART_3_NAME DT_NORDIC_NRF_UARTE_UART_3_LABEL -#define DT_FLASH_DEV_NAME \ - DT_NORDIC_NRF91_FLASH_CONTROLLER_FLASH_CONTROLLER_LABEL +#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, nordic_nrf91_flash_controller)) #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL