From 5e01e07a4e42748d7016d447aceddbf9cade107b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 25 May 2019 07:29:41 -0600 Subject: [PATCH] Rename arch/arm/src/nrf52/chip to arch/arm/src/nrf52/hardware. --- arch/arm/src/nrf52/chip.h | 2 +- arch/arm/src/nrf52/{chip => hardware}/nrf52_clock.h | 10 +++++----- arch/arm/src/nrf52/{chip => hardware}/nrf52_ficr.h | 10 +++++----- arch/arm/src/nrf52/{chip => hardware}/nrf52_gpio.h | 10 +++++----- .../arm/src/nrf52/{chip => hardware}/nrf52_memorymap.h | 8 ++++---- arch/arm/src/nrf52/{chip => hardware}/nrf52_nvmc.h | 10 +++++----- arch/arm/src/nrf52/{chip => hardware}/nrf52_rng.h | 10 +++++----- arch/arm/src/nrf52/{chip => hardware}/nrf52_uarte.h | 10 +++++----- arch/arm/src/nrf52/{chip => hardware}/nrf52_utils.h | 8 ++++---- arch/arm/src/nrf52/{chip => hardware}/nrf52_wdt.h | 10 +++++----- arch/arm/src/nrf52/nrf52832_errdata.c | 4 ++-- arch/arm/src/nrf52/nrf52_allocateheap.c | 2 +- arch/arm/src/nrf52/nrf52_flash.c | 4 ++-- arch/arm/src/nrf52/nrf52_gpio.c | 2 +- arch/arm/src/nrf52/nrf52_gpio.h | 2 +- arch/arm/src/nrf52/nrf52_lowputc.c | 4 ++-- arch/arm/src/nrf52/nrf52_nvmc.c | 4 ++-- arch/arm/src/nrf52/nrf52_rng.c | 4 ++-- arch/arm/src/nrf52/nrf52_serial.c | 2 +- arch/arm/src/nrf52/nrf52_start.c | 2 +- arch/arm/src/nrf52/nrf52_utils.c | 2 +- arch/arm/src/nrf52/nrf52_wdt.c | 2 +- 22 files changed, 61 insertions(+), 61 deletions(-) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_clock.h (96%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_ficr.h (97%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_gpio.h (94%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_memorymap.h (95%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_nvmc.h (95%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_rng.h (94%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_uarte.h (98%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_utils.h (95%) rename arch/arm/src/nrf52/{chip => hardware}/nrf52_wdt.h (95%) diff --git a/arch/arm/src/nrf52/chip.h b/arch/arm/src/nrf52/chip.h index ab62e8c8ef..1791918c29 100644 --- a/arch/arm/src/nrf52/chip.h +++ b/arch/arm/src/nrf52/chip.h @@ -48,7 +48,7 @@ #include #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /* If the common ARMv7-M vector handling logic is used, then it expects the * following definition in this file that provides the number of supported external diff --git a/arch/arm/src/nrf52/chip/nrf52_clock.h b/arch/arm/src/nrf52/hardware/nrf52_clock.h similarity index 96% rename from arch/arm/src/nrf52/chip/nrf52_clock.h rename to arch/arm/src/nrf52/hardware/nrf52_clock.h index 41ba551a52..7501481a14 100644 --- a/arch/arm/src/nrf52/chip/nrf52_clock.h +++ b/arch/arm/src/nrf52/hardware/nrf52_clock.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/nrf52/chip/nrf52_clock.h + * arch/arm/src/nrf52/hardware/nrf52_clock.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,15 +33,15 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_CLOCK_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_CLOCK_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_CLOCK_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_CLOCK_H /************************************************************************************************ * Included Files ************************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -97,4 +97,4 @@ /* Register Bitfield Definitions ****************************************************************/ -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_LCD_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_LCD_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_ficr.h b/arch/arm/src/nrf52/hardware/nrf52_ficr.h similarity index 97% rename from arch/arm/src/nrf52/chip/nrf52_ficr.h rename to arch/arm/src/nrf52/hardware/nrf52_ficr.h index 04230049ed..e047593229 100644 --- a/arch/arm/src/nrf52/chip/nrf52_ficr.h +++ b/arch/arm/src/nrf52/hardware/nrf52_ficr.h @@ -1,5 +1,5 @@ /*************************************************************************************************** - * arch/arm/src/nrf52/chip/nrf52_ficr.h + * arch/arm/src/nrf52/hardware/nrf52_ficr.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Alan Carvalho de Assis @@ -33,15 +33,15 @@ * ***************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H /*************************************************************************************************** * Included Files ***************************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /*************************************************************************************************** * Pre-processor Definitions @@ -160,4 +160,4 @@ /* INTENSET Register */ -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_FICR_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_FICR_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_gpio.h b/arch/arm/src/nrf52/hardware/nrf52_gpio.h similarity index 94% rename from arch/arm/src/nrf52/chip/nrf52_gpio.h rename to arch/arm/src/nrf52/hardware/nrf52_gpio.h index ccee637567..6c52462187 100644 --- a/arch/arm/src/nrf52/chip/nrf52_gpio.h +++ b/arch/arm/src/nrf52/hardware/nrf52_gpio.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/nrf52/chip/nrf52_gpio.h + * arch/arm/src/nrf52/hardware/nrf52_gpio.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H /************************************************************************************ * Included Files @@ -42,7 +42,7 @@ #include #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -84,4 +84,4 @@ # define NRF52_GPIO_CNF_PULL_DOWN (1 << NRF52_GPIO_CNF_PULL_SHIFT) # define NRF52_GPIO_CNF_PULL_UP (3 << NRF52_GPIO_CNF_PULL_SHIFT) -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_GPIO_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_GPIO_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_memorymap.h b/arch/arm/src/nrf52/hardware/nrf52_memorymap.h similarity index 95% rename from arch/arm/src/nrf52/chip/nrf52_memorymap.h rename to arch/arm/src/nrf52/hardware/nrf52_memorymap.h index ca4a5c2a25..e32056c692 100644 --- a/arch/arm/src/nrf52/chip/nrf52_memorymap.h +++ b/arch/arm/src/nrf52/hardware/nrf52_memorymap.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/nrf52/chip/nrf52_memorymap.h + * arch/arm/src/nrf52/hardware/nrf52_memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H /**************************************************************************** * Included Files @@ -130,4 +130,4 @@ #define NRF52_GPIO_P0_BASE 0x50000000 #define NRF52_GPIO_P1_BASE 0x50003000 -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_MEMORYMAP_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_nvmc.h b/arch/arm/src/nrf52/hardware/nrf52_nvmc.h similarity index 95% rename from arch/arm/src/nrf52/chip/nrf52_nvmc.h rename to arch/arm/src/nrf52/hardware/nrf52_nvmc.h index 502a240647..cef1537ae5 100644 --- a/arch/arm/src/nrf52/chip/nrf52_nvmc.h +++ b/arch/arm/src/nrf52/hardware/nrf52_nvmc.h @@ -1,5 +1,5 @@ /*************************************************************************************************** - * arch/arm/src/nrf52/chip/nrf52_nvmc.h + * arch/arm/src/nrf52/hardware/nrf52_nvmc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Alan Carvalho de Assis @@ -33,15 +33,15 @@ * ***************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H /*************************************************************************************************** * Included Files ***************************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /*************************************************************************************************** * Pre-processor Definitions @@ -96,4 +96,4 @@ /* INTENSET Register */ -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_NVMC_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_NVMC_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_rng.h b/arch/arm/src/nrf52/hardware/nrf52_rng.h similarity index 94% rename from arch/arm/src/nrf52/chip/nrf52_rng.h rename to arch/arm/src/nrf52/hardware/nrf52_rng.h index 34e1de5fc8..b322a09763 100644 --- a/arch/arm/src/nrf52/chip/nrf52_rng.h +++ b/arch/arm/src/nrf52/hardware/nrf52_rng.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/nrf52/chip/nrf52_rng.h + * arch/arm/src/nrf52/hardware/nrf52_rng.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Zhiqiang Li @@ -33,15 +33,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_RNG_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_RNG_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_RNG_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_RNG_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" #include "chip.h" /************************************************************************************ @@ -78,4 +78,4 @@ #define NRF52_RNG_INT_EVENT_RDY (1<<0) -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_STM32_RNG_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_STM32_RNG_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_uarte.h b/arch/arm/src/nrf52/hardware/nrf52_uarte.h similarity index 98% rename from arch/arm/src/nrf52/chip/nrf52_uarte.h rename to arch/arm/src/nrf52/hardware/nrf52_uarte.h index b87de7d5a3..f40e01bae1 100644 --- a/arch/arm/src/nrf52/chip/nrf52_uarte.h +++ b/arch/arm/src/nrf52/hardware/nrf52_uarte.h @@ -1,5 +1,5 @@ /***************************************************************************************************** - * arch/arm/src/nrf52/chip/nrf52_uarte.h + * arch/arm/src/nrf52/hardware/nrf52_uarte.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,15 +33,15 @@ * *****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H /***************************************************************************************************** * Included Files *****************************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /***************************************************************************************************** * Pre-processor Definitions @@ -185,4 +185,4 @@ #define NRF52_UART_INTENSET_RXDRDY (1 << 2) -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UARTE_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UARTE_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_utils.h b/arch/arm/src/nrf52/hardware/nrf52_utils.h similarity index 95% rename from arch/arm/src/nrf52/chip/nrf52_utils.h rename to arch/arm/src/nrf52/hardware/nrf52_utils.h index 1b127b90f1..a3c93edfd2 100644 --- a/arch/arm/src/nrf52/chip/nrf52_utils.h +++ b/arch/arm/src/nrf52/hardware/nrf52_utils.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/nrf52/nrf52_utils.h + * arch/arm/src/nrf52/hardware/nrf52_utils.h * * Copyright (C) 2017 Gregory Nutt. All rights reserved. * Author: Zhiqiang Li @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H /**************************************************************************** * Included Files @@ -122,5 +122,5 @@ static inline void nrf52_interrupt_disable(uint32_t reg_intenclr, putreg32(bitfield, reg_intenclr); } -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_UTILS_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_UTILS_H */ diff --git a/arch/arm/src/nrf52/chip/nrf52_wdt.h b/arch/arm/src/nrf52/hardware/nrf52_wdt.h similarity index 95% rename from arch/arm/src/nrf52/chip/nrf52_wdt.h rename to arch/arm/src/nrf52/hardware/nrf52_wdt.h index 9957357544..2037c91b93 100644 --- a/arch/arm/src/nrf52/chip/nrf52_wdt.h +++ b/arch/arm/src/nrf52/hardware/nrf52_wdt.h @@ -1,5 +1,5 @@ /*************************************************************************************************** - * arch/arm/src/nrf52/chip/nrf52_wdt.h + * arch/arm/src/nrf52/hardware/nrf52_wdt.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Alan Carvalho de Assis @@ -33,15 +33,15 @@ * ***************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H -#define __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H +#ifndef __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H +#define __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H /*************************************************************************************************** * Included Files ***************************************************************************************************/ #include -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" /*************************************************************************************************** * Pre-processor Definitions @@ -100,4 +100,4 @@ #define NRF52_UART_INTENSET_RXDRDY (1 << 2) -#endif /* __ARCH_ARM_SRC_NRF52_CHIP_NRF52_WDT_H */ +#endif /* __ARCH_ARM_SRC_NRF52_HARDWARE_NRF52_WDT_H */ diff --git a/arch/arm/src/nrf52/nrf52832_errdata.c b/arch/arm/src/nrf52/nrf52832_errdata.c index eca042ed9a..ee0f79233b 100644 --- a/arch/arm/src/nrf52/nrf52832_errdata.c +++ b/arch/arm/src/nrf52/nrf52832_errdata.c @@ -53,8 +53,8 @@ #include "up_arch.h" #include "chip.h" -#include "chip/nrf52_utils.h" -#include "chip/nrf52_rng.h" +#include "hardware/nrf52_utils.h" +#include "hardware/nrf52_rng.h" #include "up_internal.h" /**************************************************************************** diff --git a/arch/arm/src/nrf52/nrf52_allocateheap.c b/arch/arm/src/nrf52/nrf52_allocateheap.c index 4ec0d0287f..344d47fc3f 100644 --- a/arch/arm/src/nrf52/nrf52_allocateheap.c +++ b/arch/arm/src/nrf52/nrf52_allocateheap.c @@ -52,7 +52,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/nrf52_memorymap.h" +#include "hardware/nrf52_memorymap.h" #include diff --git a/arch/arm/src/nrf52/nrf52_flash.c b/arch/arm/src/nrf52/nrf52_flash.c index d1f9ee66e7..73073d8d21 100644 --- a/arch/arm/src/nrf52/nrf52_flash.c +++ b/arch/arm/src/nrf52/nrf52_flash.c @@ -54,8 +54,8 @@ #include "up_arch.h" -#include "chip/nrf52_ficr.h" -#include "chip/nrf52_nvmc.h" +#include "hardware/nrf52_ficr.h" +#include "hardware/nrf52_nvmc.h" #include "nrf52_nvmc.h" /**************************************************************************** diff --git a/arch/arm/src/nrf52/nrf52_gpio.c b/arch/arm/src/nrf52/nrf52_gpio.c index 9a0198f57c..a5c0a88279 100644 --- a/arch/arm/src/nrf52/nrf52_gpio.c +++ b/arch/arm/src/nrf52/nrf52_gpio.c @@ -48,7 +48,7 @@ #include #include "up_arch.h" -#include "chip/nrf52_gpio.h" +#include "hardware/nrf52_gpio.h" #include "nrf52_gpio.h" /**************************************************************************** diff --git a/arch/arm/src/nrf52/nrf52_gpio.h b/arch/arm/src/nrf52/nrf52_gpio.h index c96fe5b430..55f6580ecd 100644 --- a/arch/arm/src/nrf52/nrf52_gpio.h +++ b/arch/arm/src/nrf52/nrf52_gpio.h @@ -48,7 +48,7 @@ #endif #include -#include "chip/nrf52_gpio.h" +#include "hardware/nrf52_gpio.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/nrf52/nrf52_lowputc.c b/arch/arm/src/nrf52/nrf52_lowputc.c index d4fff9296d..c0b7cd40cb 100644 --- a/arch/arm/src/nrf52/nrf52_lowputc.c +++ b/arch/arm/src/nrf52/nrf52_lowputc.c @@ -44,8 +44,8 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/nrf52_memorymap.h" -#include "chip/nrf52_uarte.h" +#include "hardware/nrf52_memorymap.h" +#include "hardware/nrf52_uarte.h" #include "nrf52_config.h" #include "nrf52_clockconfig.h" diff --git a/arch/arm/src/nrf52/nrf52_nvmc.c b/arch/arm/src/nrf52/nrf52_nvmc.c index dfa273bf8f..82beb1fa43 100644 --- a/arch/arm/src/nrf52/nrf52_nvmc.c +++ b/arch/arm/src/nrf52/nrf52_nvmc.c @@ -48,8 +48,8 @@ #include "up_arch.h" #include "barriers.h" -#include "chip/nrf52_ficr.h" -#include "chip/nrf52_nvmc.h" +#include "hardware/nrf52_ficr.h" +#include "hardware/nrf52_nvmc.h" #include "nrf52_nvmc.h" /**************************************************************************** diff --git a/arch/arm/src/nrf52/nrf52_rng.c b/arch/arm/src/nrf52/nrf52_rng.c index 991f462995..0a120eac7f 100644 --- a/arch/arm/src/nrf52/nrf52_rng.c +++ b/arch/arm/src/nrf52/nrf52_rng.c @@ -53,8 +53,8 @@ #include "up_arch.h" #include "chip.h" -#include "chip/nrf52_utils.h" -#include "chip/nrf52_rng.h" +#include "hardware/nrf52_utils.h" +#include "hardware/nrf52_rng.h" #include "up_internal.h" #if defined(CONFIG_NRF52_RNG) diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c index 653dcb32cb..f1e4f4324f 100644 --- a/arch/arm/src/nrf52/nrf52_serial.c +++ b/arch/arm/src/nrf52/nrf52_serial.c @@ -59,7 +59,7 @@ #include "chip.h" #include "nrf52_config.h" -#include "chip/nrf52_uarte.h" +#include "hardware/nrf52_uarte.h" #include "nrf52_clockconfig.h" #include "nrf52_lowputc.h" #include "nrf52_serial.h" diff --git a/arch/arm/src/nrf52/nrf52_start.c b/arch/arm/src/nrf52/nrf52_start.c index 1ec79f0542..d95a9a475f 100644 --- a/arch/arm/src/nrf52/nrf52_start.c +++ b/arch/arm/src/nrf52/nrf52_start.c @@ -48,7 +48,7 @@ #include "nvic.h" #include "nrf52_clockconfig.h" -#include "chip/nrf52_utils.h" +#include "hardware/nrf52_utils.h" #include "nrf52_lowputc.h" #include "nrf52_start.h" #include "nrf52_gpio.h" diff --git a/arch/arm/src/nrf52/nrf52_utils.c b/arch/arm/src/nrf52/nrf52_utils.c index 83f92589f5..1a23b91297 100644 --- a/arch/arm/src/nrf52/nrf52_utils.c +++ b/arch/arm/src/nrf52/nrf52_utils.c @@ -45,7 +45,7 @@ #include "up_arch.h" #include "nrf52_irq.h" -#include "chip/nrf52_utils.h" +#include "hardware/nrf52_utils.h" /**************************************************************************** * Public Functions diff --git a/arch/arm/src/nrf52/nrf52_wdt.c b/arch/arm/src/nrf52/nrf52_wdt.c index 7a7149a296..873f48a526 100644 --- a/arch/arm/src/nrf52/nrf52_wdt.c +++ b/arch/arm/src/nrf52/nrf52_wdt.c @@ -54,7 +54,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/nrf52_wdt.h" +#include "hardware/nrf52_wdt.h" #include "nrf52_wdt.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_NRF52_WDT)