diff --git a/arch/arm/src/imxrt/chip.h b/arch/arm/src/imxrt/chip.h index 9b2f23236e..ed94fc6722 100644 --- a/arch/arm/src/imxrt/chip.h +++ b/arch/arm/src/imxrt/chip.h @@ -48,7 +48,7 @@ #include #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_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 vectors external diff --git a/arch/arm/src/imxrt/chip/imxrt_adc.h b/arch/arm/src/imxrt/hardware/imxrt_adc.h similarity index 98% rename from arch/arm/src/imxrt/chip/imxrt_adc.h rename to arch/arm/src/imxrt/hardware/imxrt_adc.h index 6b22c15129..de19fc85bf 100644 --- a/arch/arm/src/imxrt/chip/imxrt_adc.h +++ b/arch/arm/src/imxrt/hardware/imxrt_adc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_adc.h + * arch/arm/src/imxrt/hardware/imxrt_adc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ADC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ADC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ADC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ADC_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -260,4 +260,4 @@ #define ADC_CAL_CAL_CODE_MASK (0xf << ADC_CAL_CAL_CODE_SHIFT) /* Bits: 4-31 Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ADC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ADC_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_ccm.h b/arch/arm/src/imxrt/hardware/imxrt_ccm.h similarity index 85% rename from arch/arm/src/imxrt/chip/imxrt_ccm.h rename to arch/arm/src/imxrt/hardware/imxrt_ccm.h index ce5206e08e..949e7b5737 100644 --- a/arch/arm/src/imxrt/chip/imxrt_ccm.h +++ b/arch/arm/src/imxrt/hardware/imxrt_ccm.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/imxrt_ccm.h + * arch/arm/src/imxrt/hardware/imxrt_ccm.h * * Copyright (C) 2018-2019 Gregory Nutt. All rights reserved. * Authors: Janne Rosberg @@ -35,23 +35,23 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_CCM_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_CCM_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_CCM_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_CCM_H /***************************************************************************** * Included Files *****************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_ccm.h" +# include "hardware/rt102x/imxrt102x_ccm.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_ccm.h" +# include "hardware/rt105x/imxrt105x_ccm.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_ccm.h" +# include "hardware/rt106x/imxrt106x_ccm.h" #else # error Unrecognized i.MX RT architecture #endif -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_CCM_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_CCM_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_daisy.h b/arch/arm/src/imxrt/hardware/imxrt_daisy.h similarity index 92% rename from arch/arm/src/imxrt/chip/imxrt_daisy.h rename to arch/arm/src/imxrt/hardware/imxrt_daisy.h index 4ff29fc52d..3ea0641cd7 100644 --- a/arch/arm/src/imxrt/chip/imxrt_daisy.h +++ b/arch/arm/src/imxrt/hardware/imxrt_daisy.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_daisy.h + * arch/arm/src/imxrt/hardware/imxrt_daisy.h * * Copyright (C) 2018-2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DAISY_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DAISY_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DAISY_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DAISY_H /************************************************************************************ * Included Files @@ -58,5 +58,5 @@ void imxrt_daisy_select(unsigned int index, unsigned int alt); -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DAISY_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DAISY_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_dcdc.h b/arch/arm/src/imxrt/hardware/imxrt_dcdc.h similarity index 97% rename from arch/arm/src/imxrt/chip/imxrt_dcdc.h rename to arch/arm/src/imxrt/hardware/imxrt_dcdc.h index 28d3c758ad..1c3d4820c8 100644 --- a/arch/arm/src/imxrt/chip/imxrt_dcdc.h +++ b/arch/arm/src/imxrt/hardware/imxrt_dcdc.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/imxrt/imxrt_dcdc.h + * arch/arm/src/imxrt/hardware/imxrt_dcdc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,15 +33,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DCDC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DCDC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DCDC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DCDC_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -149,4 +149,4 @@ #define DCDC_REG3_DISABLE_STEP (1 << 30) /* Bit 30: Disable stepping */ /* Bit 31: Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DCDC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DCDC_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_dmamux.h b/arch/arm/src/imxrt/hardware/imxrt_dmamux.h similarity index 95% rename from arch/arm/src/imxrt/chip/imxrt_dmamux.h rename to arch/arm/src/imxrt/hardware/imxrt_dmamux.h index 6bbde542aa..3b6c325e1e 100644 --- a/arch/arm/src/imxrt/chip/imxrt_dmamux.h +++ b/arch/arm/src/imxrt/hardware/imxrt_dmamux.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/imxrt/chip/imxrt_dmamux.h + * arch/arm/src/imxrt/hardware/imxrt_dmamux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,22 +34,22 @@ * ****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DMAMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DMAMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DMAMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DMAMUX_H /**************************************************************************** * Included Files ****************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_dmamux.h" +# include "hardware/rt102x/imxrt102x_dmamux.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_dmamux.h" +# include "hardware/rt105x/imxrt105x_dmamux.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_dmamux.h" +# include "hardware/rt106x/imxrt106x_dmamux.h" #else # error Unrecognized i.MX RT architecture #endif @@ -144,4 +144,4 @@ #define DMAMUX_CHCFG_TRIG (1 << 30) /* Bit 30: DMA Channel Trigger Enable */ #define DMAMUX_CHCFG_ENBL (1 << 31) /* Bit 31: DMA Mux Channel Enable */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_DMAMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_DMAMUX_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_edma.h b/arch/arm/src/imxrt/hardware/imxrt_edma.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_edma.h rename to arch/arm/src/imxrt/hardware/imxrt_edma.h index 46c809e045..b46ddd5889 100644 --- a/arch/arm/src/imxrt/chip/imxrt_edma.h +++ b/arch/arm/src/imxrt/hardware/imxrt_edma.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/imxrt/chip/imxrt_edma.h + * arch/arm/src/imxrt/hardware/imxrt_edma.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_EDMA_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_EDMA_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_EDMA_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_EDMA_H /**************************************************************************************************** * Included Files ****************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /**************************************************************************************************** * Pre-processor Definitions @@ -1299,4 +1299,4 @@ struct imxrt_edmatcd_s uint16_t biter; /* Offset: 0x001e TCD Beginning Minor Loop Link, Major Loop Count */ }; -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_EDMA_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_EDMA_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_enet.h b/arch/arm/src/imxrt/hardware/imxrt_enet.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_enet.h rename to arch/arm/src/imxrt/hardware/imxrt_enet.h index 4aa725475c..f5fb1f6ef8 100644 --- a/arch/arm/src/imxrt/chip/imxrt_enet.h +++ b/arch/arm/src/imxrt/hardware/imxrt_enet.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/chip/imxrt_enet.h + * arch/arm/src/imxrt/hardware/imxrt_enet.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENET_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENET_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENET_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENET_H /***************************************************************************** * Included Files @@ -669,4 +669,4 @@ struct enet_desc_s * Public Functions *****************************************************************************/ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_ENET_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_ENET_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_flexpwm.h b/arch/arm/src/imxrt/hardware/imxrt_flexpwm.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_flexpwm.h rename to arch/arm/src/imxrt/hardware/imxrt_flexpwm.h index 6a3a66edd2..a1b9ce99dc 100644 --- a/arch/arm/src/imxrt/chip/imxrt_flexpwm.h +++ b/arch/arm/src/imxrt/hardware/imxrt_flexpwm.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_flexpwm.h + * arch/arm/src/imxrt/hardware/imxrt_flexpwm.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_FLEXPWM_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_FLEXPWM_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_FLEXPWM_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_FLEXPWM_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -1814,4 +1814,4 @@ # define FCTRL20_NOCOMB_FAULT2 (4 << FCTRL20_NOCOMB_SHIFT) /* Disable direct combinational path from the FAULT2 input to the PWM output */ # define FCTRL20_NOCOMB_FAULT3 (8 << FCTRL20_NOCOMB_SHIFT) /* Disable direct combinational path from the FAULT3 input to the PWM output */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_FLEXPWM_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_FLEXPWM_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_gpio.h b/arch/arm/src/imxrt/hardware/imxrt_gpio.h similarity index 92% rename from arch/arm/src/imxrt/chip/imxrt_gpio.h rename to arch/arm/src/imxrt/hardware/imxrt_gpio.h index 28d979bf75..fd87465085 100644 --- a/arch/arm/src/imxrt/chip/imxrt_gpio.h +++ b/arch/arm/src/imxrt/hardware/imxrt_gpio.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_gpio.h + * arch/arm/src/imxrt/hardware/imxrt_gpio.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPIO_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPIO_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPIO_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPIO_H /******************************************************************************************** * Included Files @@ -44,11 +44,11 @@ #include #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_gpio.h" +# include "hardware/rt102x/imxrt102x_gpio.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_gpio.h" +# include "hardware/rt105x/imxrt105x_gpio.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_gpio.h" +# include "hardware/rt106x/imxrt106x_gpio.h" #else # error Unrecognized i.MX RT architecture #endif @@ -90,4 +90,4 @@ #define GPIO_ICR_MASK(n) (3 << GPIO_ICR_SHIFT(n)) #define GPIO_ICR(i,n) ((uint32_t)(i) << GPIO_ICR_SHIFT(n)) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPIO_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPIO_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_gpt.h b/arch/arm/src/imxrt/hardware/imxrt_gpt.h similarity index 98% rename from arch/arm/src/imxrt/chip/imxrt_gpt.h rename to arch/arm/src/imxrt/hardware/imxrt_gpt.h index ffee586535..aa2e08fafd 100644 --- a/arch/arm/src/imxrt/chip/imxrt_gpt.h +++ b/arch/arm/src/imxrt/hardware/imxrt_gpt.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_gpt.h + * arch/arm/src/imxrt/hardware/imxrt_gpt.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPT_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPT_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPT_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPT_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -179,4 +179,4 @@ #define GPT_IR_ROVIE (1 << 5) /* Bit: 5 Rollover Interrupt Enable. */ /* Bits: 6-31 Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_GPT_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_GPT_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_iomuxc.h b/arch/arm/src/imxrt/hardware/imxrt_iomuxc.h similarity index 95% rename from arch/arm/src/imxrt/chip/imxrt_iomuxc.h rename to arch/arm/src/imxrt/hardware/imxrt_iomuxc.h index 53fa0a3862..18799f3bcc 100644 --- a/arch/arm/src/imxrt/chip/imxrt_iomuxc.h +++ b/arch/arm/src/imxrt/hardware/imxrt_iomuxc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/imxrt_iomuxc.h + * arch/arm/src/imxrt/hardware/imxrt_iomuxc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_IOMUXC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_IOMUXC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_IOMUXC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_IOMUXC_H /************************************************************************************ * Included Files @@ -44,11 +44,11 @@ #include #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_iomuxc.h" +# include "hardware/rt102x/imxrt102x_iomuxc.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_iomuxc.h" +# include "hardware/rt105x/imxrt105x_iomuxc.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_iomuxc.h" +# include "hardware/rt106x/imxrt106x_iomuxc.h" #else # error Unrecognized i.MX RT architecture #endif @@ -121,4 +121,4 @@ # define PADCTL_PUS_UP_22K (3 << PADCTL_PUS_SHIFT) /* 22K Ohm Pull Up */ #define PADCTL_HYS (1 << 16) /* Bit 16: Hysteresis Enable Field */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_IOMUXC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_IOMUXC_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_lcd.h b/arch/arm/src/imxrt/hardware/imxrt_lcd.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_lcd.h rename to arch/arm/src/imxrt/hardware/imxrt_lcd.h index 4a7b94e254..c77685ff34 100644 --- a/arch/arm/src/imxrt/chip/imxrt_lcd.h +++ b/arch/arm/src/imxrt/hardware/imxrt_lcd.h @@ -1,5 +1,5 @@ /************************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_lcd.h + * arch/arm/src/imxrt/hardware/imxrt_lcd.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Copyright (C) 2016-2018 NXP. All rights reserved. @@ -34,15 +34,15 @@ * ************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LCD_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LCD_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LCD_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LCD_H /************************************************************************************************ * Included Files ************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************ * Pre-processor Definitions @@ -1706,4 +1706,4 @@ #define LCDIF_LUT1_DATA_DATA_SHIFT (0U) #define LCDIF_LUT1_DATA_DATA(x) (((uint32_t)(((uint32_t)(x)) << LCDIF_LUT1_DATA_DATA_SHIFT)) & LCDIF_LUT1_DATA_DATA_MASK) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LCD_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LCD_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_lpi2c.h b/arch/arm/src/imxrt/hardware/imxrt_lpi2c.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_lpi2c.h rename to arch/arm/src/imxrt/hardware/imxrt_lpi2c.h index a7d15b0b54..e48cd49d23 100644 --- a/arch/arm/src/imxrt/chip/imxrt_lpi2c.h +++ b/arch/arm/src/imxrt/hardware/imxrt_lpi2c.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_lpi2c.h + * arch/arm/src/imxrt/hardware/imxrt_lpi2c.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPI2C_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPI2C_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPI2C_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPI2C_H /******************************************************************************************** * Included Files @@ -619,4 +619,4 @@ #define LPI2C_STAR_RXEMPTY (1 << 15) /* Start Of Frame */ /* Bits 31-16 Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPI2C_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPI2C_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_lpspi.h b/arch/arm/src/imxrt/hardware/imxrt_lpspi.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_lpspi.h rename to arch/arm/src/imxrt/hardware/imxrt_lpspi.h index 699e4eddf4..3f8e69d41e 100644 --- a/arch/arm/src/imxrt/chip/imxrt_lpspi.h +++ b/arch/arm/src/imxrt/hardware/imxrt_lpspi.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_lpspi.h + * arch/arm/src/imxrt/hardware/imxrt_lpspi.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Pavlina Koleva @@ -33,15 +33,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPSPI_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPSPI_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPSPI_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPSPI_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -368,4 +368,4 @@ #define LPSPI_RDR_DATA_SHIFT (0) /* Bits 0-31: Receive Data */ #define LPSPI_RDR_DATA_MASK (0xffffffff << LPSPI_RDR_DATA_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPSPI_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPSPI_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_lpuart.h b/arch/arm/src/imxrt/hardware/imxrt_lpuart.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_lpuart.h rename to arch/arm/src/imxrt/hardware/imxrt_lpuart.h index 2ea9e58446..d3b481d8ed 100644 --- a/arch/arm/src/imxrt/chip/imxrt_lpuart.h +++ b/arch/arm/src/imxrt/hardware/imxrt_lpuart.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_lpuart.h + * arch/arm/src/imxrt/hardware/imxrt_lpuart.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPUART_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPUART_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPUART_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPUART_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -413,4 +413,4 @@ # define LPUART_WATER_RXCOUNT(n) ((uint32_t)(n) << LPUART_WATER_RXCOUNT_SHIFT) /* Bits 27-31: Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_LPUART_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_LPUART_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_memorymap.h b/arch/arm/src/imxrt/hardware/imxrt_memorymap.h similarity index 85% rename from arch/arm/src/imxrt/chip/imxrt_memorymap.h rename to arch/arm/src/imxrt/hardware/imxrt_memorymap.h index 217b5a20f6..3d320adf63 100644 --- a/arch/arm/src/imxrt/chip/imxrt_memorymap.h +++ b/arch/arm/src/imxrt/hardware/imxrt_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_memorymap.h + * arch/arm/src/imxrt/hardware/imxrt_memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_MEMORYMAP_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_MEMORYMAP_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_MEMORYMAP_H /************************************************************************************ * Included Files @@ -43,13 +43,13 @@ #include #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_memorymap.h" +# include "hardware/rt102x/imxrt102x_memorymap.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_memorymap.h" +# include "hardware/rt105x/imxrt105x_memorymap.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_memorymap.h" +# include "hardware/rt106x/imxrt106x_memorymap.h" #else # error Unrecognized i.MX RT architecture #endif -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_MEMORYMAP_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_ocotp.h b/arch/arm/src/imxrt/hardware/imxrt_ocotp.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_ocotp.h rename to arch/arm/src/imxrt/hardware/imxrt_ocotp.h index d4d5d3f0cb..296b6fef1b 100644 --- a/arch/arm/src/imxrt/chip/imxrt_ocotp.h +++ b/arch/arm/src/imxrt/hardware/imxrt_ocotp.h @@ -1,5 +1,5 @@ /************************************************************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_ocotp.h + * arch/arm/src/imxrt/hardware/imxrt_ocotp.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_OCOTP_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_OCOTP_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_OCOTP_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_OCOTP_H /* The OCOTP IP block provides a set of register to access the On Chip OPT. * It also provides a shadow image of the 64 OTP entries that are read only @@ -48,7 +48,7 @@ ************************************************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************************************************ * Pre-processor Definitions @@ -426,4 +426,4 @@ #define OCOTP_LOCK_FIELD_RETURN_MASK (15 << OCOTP_LOCK_FIELD_RETURN_SHIFT) # define OCOTP_LOCK_FIELD_RETURN(n) ((uint32_t)(n) << OCOTP_LOCK_FIELD_RETURN_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_OCOTP_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_OCOTP_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_pinmux.h b/arch/arm/src/imxrt/hardware/imxrt_pinmux.h similarity index 86% rename from arch/arm/src/imxrt/chip/imxrt_pinmux.h rename to arch/arm/src/imxrt/hardware/imxrt_pinmux.h index ffcdc1f6ab..61f4f60809 100644 --- a/arch/arm/src/imxrt/chip/imxrt_pinmux.h +++ b/arch/arm/src/imxrt/hardware/imxrt_pinmux.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_pinmux.h + * arch/arm/src/imxrt/hardware/imxrt_pinmux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PINMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PINMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PINMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PINMUX_H /************************************************************************************ * Included Files @@ -44,13 +44,13 @@ #include #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_pinmux.h" +# include "hardware/rt102x/imxrt102x_pinmux.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_pinmux.h" +# include "hardware/rt105x/imxrt105x_pinmux.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_pinmux.h" +# include "hardware/rt106x/imxrt106x_pinmux.h" #else # error Unrecognized i.MX RT architecture #endif -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PINMUX_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_pit.h b/arch/arm/src/imxrt/hardware/imxrt_pit.h similarity index 96% rename from arch/arm/src/imxrt/chip/imxrt_pit.h rename to arch/arm/src/imxrt/hardware/imxrt_pit.h index 6924185307..ce736f4408 100644 --- a/arch/arm/src/imxrt/chip/imxrt_pit.h +++ b/arch/arm/src/imxrt/hardware/imxrt_pit.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_pit.h + * arch/arm/src/imxrt/hardware/imxrt_pit.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PIT_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PIT_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PIT_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PIT_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -128,4 +128,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_PIT_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_PIT_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_snvs.h b/arch/arm/src/imxrt/hardware/imxrt_snvs.h similarity index 98% rename from arch/arm/src/imxrt/chip/imxrt_snvs.h rename to arch/arm/src/imxrt/hardware/imxrt_snvs.h index 7bead26f3e..7db7bfde41 100644 --- a/arch/arm/src/imxrt/chip/imxrt_snvs.h +++ b/arch/arm/src/imxrt/hardware/imxrt_snvs.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_snvs.h + * arch/arm/src/imxrt/hardware/imxrt_snvs.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SNVS_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SNVS_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SNVS_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SNVS_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -294,4 +294,4 @@ #define SNVS_HPVIDR2_IPERA_SHIFT (24) /* Bits 24-31: IP Era */ #define SNVS_HPVIDR2_IPERA_MASK (0xff << SNVS_HPVIDR2_IPERA_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SNVS_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SNVS_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_src.h b/arch/arm/src/imxrt/hardware/imxrt_src.h similarity index 97% rename from arch/arm/src/imxrt/chip/imxrt_src.h rename to arch/arm/src/imxrt/hardware/imxrt_src.h index 60beeedbe9..7458139332 100644 --- a/arch/arm/src/imxrt/chip/imxrt_src.h +++ b/arch/arm/src/imxrt/hardware/imxrt_src.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/imxrt_src.h + * arch/arm/src/imxrt/hardware/imxrt_src.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SRC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SRC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SRC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SRC_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -153,5 +153,5 @@ * software. */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_SRC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_SRC_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_tmr.h b/arch/arm/src/imxrt/hardware/imxrt_tmr.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_tmr.h rename to arch/arm/src/imxrt/hardware/imxrt_tmr.h index ae24118fe9..283ba70910 100644 --- a/arch/arm/src/imxrt/chip/imxrt_tmr.h +++ b/arch/arm/src/imxrt/hardware/imxrt_tmr.h @@ -1,5 +1,5 @@ /******************************************************************************************************************************************** - * arch/arm/src/imxrt/chip/imxrt_tmr.h + * arch/arm/src/imxrt/hardware/imxrt_tmr.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ********************************************************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_TMR_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_TMR_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_TMR_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_TMR_H /******************************************************************************************************************************************** * Included Files ********************************************************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************************************************************** * Pre-processor Definitions @@ -659,4 +659,4 @@ # define TMR_ENBL_CHN4 (8 << TMR_ENBL_ENBL_SHIFT) /* Channel 3 enable */ /* Bits: 4-15 Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_TMR_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_TMR_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_usb_analog.h b/arch/arm/src/imxrt/hardware/imxrt_usb_analog.h similarity index 98% rename from arch/arm/src/imxrt/chip/imxrt_usb_analog.h rename to arch/arm/src/imxrt/hardware/imxrt_usb_analog.h index a7ca8f96cd..14b9031fe3 100644 --- a/arch/arm/src/imxrt/chip/imxrt_usb_analog.h +++ b/arch/arm/src/imxrt/hardware/imxrt_usb_analog.h @@ -1,5 +1,5 @@ /************************************************************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_usb_analog.h + * arch/arm/src/imxrt/hardware/imxrt_usb_analog.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USB_ANALOG_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USB_ANALOG_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_ANALOG_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_ANALOG_H /************************************************************************************************************************************ * Included Files ************************************************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************************************************ * Pre-processor Definitions @@ -206,4 +206,4 @@ #define USB_ANALOG_DIGPROG_SILICON_REVISION 0x006C0000 /* Silicon revision 1.0 */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USB_ANALOG_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USB_ANALOG_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_usdhc.h b/arch/arm/src/imxrt/hardware/imxrt_usdhc.h similarity index 99% rename from arch/arm/src/imxrt/chip/imxrt_usdhc.h rename to arch/arm/src/imxrt/hardware/imxrt_usdhc.h index 9cc10b997c..2a0ec097bd 100644 --- a/arch/arm/src/imxrt/chip/imxrt_usdhc.h +++ b/arch/arm/src/imxrt/hardware/imxrt_usdhc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_usdhc.h + * arch/arm/src/imxrt/hardware/imxrt_usdhc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt & Contributors @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USDHC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USDHC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USDHC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USDHC_H /************************************************************************************ * Included Files @@ -552,4 +552,4 @@ * Public Functions ************************************************************************************/ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_USDHC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_USDHC_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_wdog.h b/arch/arm/src/imxrt/hardware/imxrt_wdog.h similarity index 96% rename from arch/arm/src/imxrt/chip/imxrt_wdog.h rename to arch/arm/src/imxrt/hardware/imxrt_wdog.h index 1f1bfba62f..5420a09653 100644 --- a/arch/arm/src/imxrt/chip/imxrt_wdog.h +++ b/arch/arm/src/imxrt/hardware/imxrt_wdog.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/imxrt_wdog.h + * arch/arm/src/imxrt/hardware/imxrt_wdog.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Janne Rosberg @@ -33,15 +33,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_WDOG_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_WDOG_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_WDOG_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_WDOG_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -139,4 +139,4 @@ #define RTWDOG_UPDATE_KEY (0xd928c520) #define RTWDOG_REFRESH_KEY (0xb480a602) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_WDOG_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_WDOG_H */ diff --git a/arch/arm/src/imxrt/chip/imxrt_xbar.h b/arch/arm/src/imxrt/hardware/imxrt_xbar.h similarity index 88% rename from arch/arm/src/imxrt/chip/imxrt_xbar.h rename to arch/arm/src/imxrt/hardware/imxrt_xbar.h index 47bab85828..29c596d547 100644 --- a/arch/arm/src/imxrt/chip/imxrt_xbar.h +++ b/arch/arm/src/imxrt/hardware/imxrt_xbar.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt_abar.h + * arch/arm/src/imxrt/hardware/imxrt_abar.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_XBAR_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_XBAR_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_XBAR_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_XBAR_H /************************************************************************************ * Included Files @@ -43,14 +43,14 @@ #include #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #if defined(CONFIG_ARCH_FAMILY_IMXRT102x) -# include "chip/rt102x/imxrt102x_xbar.h" +# include "hardware/rt102x/imxrt102x_xbar.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT105x) -# include "chip/rt105x/imxrt105x_xbar.h" +# include "hardware/rt105x/imxrt105x_xbar.h" #elif defined(CONFIG_ARCH_FAMILY_IMXRT106x) -# include "chip/rt106x/imxrt106x_xbar.h" +# include "hardware/rt106x/imxrt106x_xbar.h" #else # error Unrecognized i.MX RT architecture #endif @@ -71,4 +71,4 @@ #define IMXRT_SEL1_MASK (0x7f << IMXRT_SEL1_SHIFTS) /* Bit 15 Reserved */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT_XBAR_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT_XBAR_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_ccm.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_ccm.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h index 0c1c27e64f..642127a7cc 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_ccm.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt102x_ccm.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt102x_ccm.h * * Copyright (C) 2018-2019 Gregory Nutt. All rights reserved. * Authors: Janne Rosberg @@ -35,15 +35,15 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_CCM_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_CCM_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H /***************************************************************************** * Included Files *****************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /***************************************************************************** * Pre-processor Definitions @@ -967,4 +967,4 @@ #define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) # define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_CCM_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_CCM_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_dmamux.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h similarity index 97% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_dmamux.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h index d83fa2bca6..b666d5846a 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_dmamux.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt102x_dmamux.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt102x_dmamux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_DMAMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_DMAMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H /***************************************************************************** * Included Files @@ -140,4 +140,4 @@ #define IMXRT_DMA_NCHANNELS 128 /* Includes reserved channels */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_DMAMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_DMAMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_gpio.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h similarity index 96% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_gpio.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h index fe288177cb..e7f749e5e4 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_gpio.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_gpio.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt105x_gpio.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt105x_gpio.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,15 +35,15 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_GPIO_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_GPIO_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H /***************************************************************************** * Included Files *****************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /***************************************************************************** * Pre-processor Definitions @@ -113,4 +113,4 @@ #define IMXRT_GPIO5_CLEAR (IMXRT_GPIO5_BASE + IMXRT_GPIO_CLEAR_OFFSET) #define IMXRT_GPIO5_TOGGLE (IMXRT_GPIO5_BASE + IMXRT_GPIO_TOGGLE_OFFSET) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_GPIO_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_GPIO_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_iomuxc.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h index 4d5f325b08..43080701b0 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_iomuxc.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt102x_iomuxc.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt102x_iomuxc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,15 +34,15 @@ * POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_IOMUXC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_IOMUXC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H /***************************************************************************** * Included Files *****************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /***************************************************************************** * Pre-processor Definitions @@ -1603,4 +1603,4 @@ #define GPR_GPR25_M7_APC_AC_R3_TOP_MASK (0x1fffffff << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT) #define GPR_GPR25_M7_APC_AC_R3_TOP(n) ((uint32_t)(n)) << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_IOMUXC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_IOMUXC_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_memorymap.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h similarity index 98% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_memorymap.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h index f380cb4807..c27907cecd 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_memorymap.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt102x_memorymap.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt102x_memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_MEMORYMAP_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H /***************************************************************************** * Included Files @@ -258,4 +258,4 @@ #define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */ #define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_MEMORYMAP_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_pinmux.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_pinmux.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h index 600f2565e3..77baf1d6cd 100644 --- a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_pinmux.h +++ b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h @@ -1,5 +1,5 @@ /***************************************************************************** - * arch/arm/src/imxrt/chip/rt102x/imxrt102x_pinmux.h + * arch/arm/src/imxrt/hardware/rt102x/imxrt102x_pinmux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,15 +34,15 @@ * *****************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_PINMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_PINMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H /***************************************************************************** * Included Files *****************************************************************************/ #include -#include "chip/imxrt_iomuxc.h" +#include "hardware/imxrt_iomuxc.h" /***************************************************************************** * Pre-processor Definitions @@ -911,4 +911,4 @@ #define GPIO_REF_32K_OUT_1 (GPIO_PERIPH | GPIO_ALT2 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_SD_B0_06_INDEX)) #define GPIO_REF_32K_OUT_2 (GPIO_PERIPH | GPIO_ALT6 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_06_INDEX)) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT102X_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT102X_PINMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt102x/imxrt102x_xbar.h b/arch/arm/src/imxrt/hardware/rt102x/imxrt102x_xbar.h similarity index 100% rename from arch/arm/src/imxrt/chip/rt102x/imxrt102x_xbar.h rename to arch/arm/src/imxrt/hardware/rt102x/imxrt102x_xbar.h diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_ccm.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_ccm.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h index 5b214127fb..40bd07a635 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_ccm.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_ccm.h @@ -1,5 +1,5 @@ /************************************************************************************************************ - * arch/arm/src/imxrt/chip/rt105x/imxrt_ccm.h + * arch/arm/src/imxrt/hardware/rt105x/imxrt_ccm.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Janne Rosberg @@ -34,15 +34,15 @@ * ************************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_CCM_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_CCM_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H /************************************************************************************************************ * Included Files ************************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************************ * Pre-processor Definitions @@ -1142,4 +1142,4 @@ #define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) # define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_CCM_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_CCM_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_dmamux.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h similarity index 98% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_dmamux.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h index a1c9dae722..c79e5b16d3 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_dmamux.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_dmamux.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/imxrt105x_dmamux.h + * arch/arm/src/imxrt/hardware/imxrt105x_dmamux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_DMAMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_DMAMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H /************************************************************************************ * Included Files @@ -165,4 +165,4 @@ #define IMXRT_DMA_NCHANNLES 128 /* Includes reserved channels */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_DMAMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_DMAMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_gpio.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h similarity index 96% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_gpio.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h index 2970ac4224..a868493fe8 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_gpio.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/rt105x/imxrt105x_gpio.h + * arch/arm/src/imxrt/hardware/rt105x/imxrt105x_gpio.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_GPIO_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_GPIO_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -124,4 +124,4 @@ #define IMXRT_GPIO5_CLEAR (IMXRT_GPIO5_BASE + IMXRT_GPIO_CLEAR_OFFSET) #define IMXRT_GPIO5_TOGGLE (IMXRT_GPIO5_BASE + IMXRT_GPIO_TOGGLE_OFFSET) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_GPIO_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_GPIO_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_iomuxc.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h index 6666f7a3f8..dcffde20a4 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_iomuxc.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/rt105x/imxrt105x_iomuxc.h + * arch/arm/src/imxrt/hardware/rt105x/imxrt105x_iomuxc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_IOMUXC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_IOMUXC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -1991,4 +1991,4 @@ #define GPR_GPR25_M7_APC_AC_R3_TOP_MASK (0x1fffffff << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT) #define GPR_GPR25_M7_APC_AC_R3_TOP(n) ((uint32_t)(n)) << GPR_GPR25_M7_APC_AC_R3_TOP_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_IOMUXC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_IOMUXC_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_memorymap.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h similarity index 98% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_memorymap.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h index 1ab9d130d3..a9a18f1199 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_memorymap.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/rt105x/imxrt105x_memorymap.h + * arch/arm/src/imxrt/hardware/rt105x/imxrt105x_memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_MEMORYMAP_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H /************************************************************************************ * Included Files @@ -255,4 +255,4 @@ #define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */ #define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_MEMORYMAP_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_pinmux.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_pinmux.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h index 59955e2183..307412a677 100644 --- a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_pinmux.h +++ b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h @@ -1,5 +1,5 @@ /***************************************************************************************************** - * arch/arm/src/imxrt/chip/rt105x/imxrt105x_pinmux.h + * arch/arm/src/imxrt/hardware/rt105x/imxrt105x_pinmux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,15 +33,15 @@ * *****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_PINMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_PINMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H /***************************************************************************************************** * Included Files *****************************************************************************************************/ #include -#include "chip/imxrt_iomuxc.h" +#include "hardware/imxrt_iomuxc.h" /***************************************************************************************************** * Pre-processor Definitions @@ -1087,4 +1087,4 @@ #define GPIO_XBAR1_INOUT19_4 (GPIO_PERIPH | GPIO_ALT6 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_07_INDEX)) #define GPIO_XBAR1_XBAR_IN02 (GPIO_PERIPH | GPIO_ALT3 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_00_INDEX)) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT105X_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT105X_PINMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt105x/imxrt105x_xbar.h b/arch/arm/src/imxrt/hardware/rt105x/imxrt105x_xbar.h similarity index 100% rename from arch/arm/src/imxrt/chip/rt105x/imxrt105x_xbar.h rename to arch/arm/src/imxrt/hardware/rt105x/imxrt105x_xbar.h diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_ccm.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_ccm.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h index d9bb263e08..1196f0a1aa 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_ccm.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_ccm.h @@ -1,5 +1,5 @@ /************************************************************************************************************ - * arch/arm/src/imxrt/chip/rt106x/imxrt_ccm.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt_ccm.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Janne Rosberg @@ -34,15 +34,15 @@ * ************************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_CCM_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_CCM_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H /************************************************************************************************************ * Included Files ************************************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************************ * Pre-processor Definitions @@ -1141,4 +1141,4 @@ #define CCM_ANALOG_MISC2_VIDEO_DIV_MASK (0x3 << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) # define CCM_ANALOG_MISC2_VIDEO_DIV(n) ((uint32_t)(n) << CCM_ANALOG_MISC2_VIDEO_DIV_SHIFT) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_CCM_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_CCM_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_dmamux.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h similarity index 98% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_dmamux.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h index 3e05c859fc..b806c35169 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_dmamux.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/rt106x/imxrt106x_dmamux.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt106x_dmamux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_DMAMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_DMAMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H /************************************************************************************ * Included Files @@ -171,4 +171,4 @@ #define IMXRT_DMA_NCHANNLES 128 /* Includes reserved channels */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_DMAMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_DMAMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_gpio.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h similarity index 97% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_gpio.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h index 6e732d5ac2..d6f830f6dd 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_gpio.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/imxrt/rt106x/imxrt106x_gpio.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt106x_gpio.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_GPIO_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_GPIO_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H /******************************************************************************************** * Included Files ********************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /******************************************************************************************** * Pre-processor Definitions @@ -172,4 +172,4 @@ # define IMXRT_GPIO9_CLEAR (IMXRT_GPIO9_BASE + IMXRT_GPIO_CLEAR_OFFSET) # define IMXRT_GPIO9_TOGGLE (IMXRT_GPIO9_BASE + IMXRT_GPIO_TOGGLE_OFFSET) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_GPIO_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_GPIO_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_iomuxc.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_iomuxc.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h index 9ec3b043af..0ffb052009 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_iomuxc.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/rt106x/imxrt106x_iomuxc.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt106x_iomuxc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,15 +34,15 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_IOMUXC_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_IOMUXC_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H /************************************************************************************ * Included Files ************************************************************************************/ #include -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************ * Pre-processor Definitions @@ -2543,4 +2543,4 @@ #define GPR_GPR34_SIP_TEST_MUX_BOOT_PIN_SEL(n) ((uint32_t)(n) << GPR_GPR34_SIP_TEST_MUX_BOOT_PIN_SEL_SHIFT) #define GPR_GPR34_SIP_TEST_MUX_QSPI_SIP_EN (1 << 8) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_IOMUXC_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_IOMUXC_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_memorymap.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h similarity index 98% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_memorymap.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h index 327dfb9d7f..5184a6134d 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_memorymap.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/imxrt/chip/rt106x/imxrt106x_memorymap.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt106x_memorymap.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_MEMORYMAP_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H /************************************************************************************ * Included Files @@ -298,4 +298,4 @@ #define IMXRT_PROCROM_BASE 0xe00fe000 /* 4KB Processor ROM */ #define IMXRT_PPBROM_BASE 0xe00ff000 /* 4KB PPB ROM */ -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_MEMORYMAP_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_pinmux.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h similarity index 99% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_pinmux.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h index edb3ed2558..b6e9ebf3a3 100644 --- a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_pinmux.h +++ b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h @@ -1,5 +1,5 @@ /***************************************************************************************************** - * arch/arm/src/imxrt/chip/rt106x/imxrt106x_pinmux.h + * arch/arm/src/imxrt/hardware/rt106x/imxrt106x_pinmux.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,15 +34,15 @@ * *****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_PINMUX_H -#define __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_PINMUX_H +#ifndef __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H +#define __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H /***************************************************************************************************** * Included Files *****************************************************************************************************/ #include -#include "chip/imxrt_iomuxc.h" +#include "hardware/imxrt_iomuxc.h" /***************************************************************************************************** * Pre-processor Definitions @@ -1092,4 +1092,4 @@ #define GPIO_XBAR1_INOUT19_4 (GPIO_PERIPH | GPIO_ALT6 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_07_INDEX)) #define GPIO_XBAR1_XBAR_IN02 (GPIO_PERIPH | GPIO_ALT3 | GPIO_PADMUX(IMXRT_PADMUX_GPIO_EMC_00_INDEX)) -#endif /* __ARCH_ARM_SRC_IMXRT_CHIP_IMXRT106X_PINMUX_H */ +#endif /* __ARCH_ARM_SRC_IMXRT_HARDWARE_IMXRT106X_PINMUX_H */ diff --git a/arch/arm/src/imxrt/chip/rt106x/imxrt106x_xbar.h b/arch/arm/src/imxrt/hardware/rt106x/imxrt106x_xbar.h similarity index 100% rename from arch/arm/src/imxrt/chip/rt106x/imxrt106x_xbar.h rename to arch/arm/src/imxrt/hardware/rt106x/imxrt106x_xbar.h diff --git a/arch/arm/src/imxrt/imxrt_allocateheap.c b/arch/arm/src/imxrt/imxrt_allocateheap.c index 8404f2d58c..22a0a406d1 100644 --- a/arch/arm/src/imxrt/imxrt_allocateheap.c +++ b/arch/arm/src/imxrt/imxrt_allocateheap.c @@ -54,7 +54,7 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #include "imxrt_mpuinit.h" #include diff --git a/arch/arm/src/imxrt/imxrt_clockconfig.c b/arch/arm/src/imxrt/imxrt_clockconfig.c index 6d38cae770..9037d72020 100644 --- a/arch/arm/src/imxrt/imxrt_clockconfig.c +++ b/arch/arm/src/imxrt/imxrt_clockconfig.c @@ -44,11 +44,11 @@ #include "up_arch.h" #include -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_dcdc.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_dcdc.h" #include "imxrt_clockconfig.h" #include "imxrt_lcd.h" -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #include diff --git a/arch/arm/src/imxrt/imxrt_daisy.c b/arch/arm/src/imxrt/imxrt_daisy.c index 7d668e6268..4fa9d42309 100644 --- a/arch/arm/src/imxrt/imxrt_daisy.c +++ b/arch/arm/src/imxrt/imxrt_daisy.c @@ -42,7 +42,7 @@ #include #include "chip.h" #include "up_arch.h" -#include "chip/imxrt_daisy.h" +#include "hardware/imxrt_daisy.h" #include "imxrt_iomuxc.h" /**************************************************************************** diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c index e0c69ede70..18c79019d6 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -62,8 +62,8 @@ #include "sched/sched.h" #include "chip.h" -#include "chip/imxrt_edma.h" -#include "chip/imxrt_dmamux.h" +#include "hardware/imxrt_edma.h" +#include "hardware/imxrt_dmamux.h" #include "imxrt_periphclks.h" #include "imxrt_edma.h" @@ -886,7 +886,7 @@ void weak_function up_dma_initialize(void) * * Input Parameters: * dmamux - DMAMUX configuration see DMAMUX channel configuration register - * bit-field definitions in chip/imxrt_dmamux.h. Settings include: + * bit-field definitions in hardware/imxrt_dmamux.h. Settings include: * * DMAMUX_CHCFG_SOURCE Chip-specific DMA source (required) * DMAMUX_CHCFG_AON DMA Channel Always Enable (optional) @@ -896,7 +896,7 @@ void weak_function up_dma_initialize(void) * A value of zero will disable the DMAMUX channel. * dchpri - DCHPRI channel priority configuration. See DCHPRI channel * configuration register bit-field definitions in - * chip/imxrt_edma.h. Meaningful settings include: + * hardware/imxrt_edma.h. Meaningful settings include: * * EDMA_DCHPRI_CHPRI Channel Arbitration Priority * DCHPRI_DPA Disable Preempt Ability diff --git a/arch/arm/src/imxrt/imxrt_edma.h b/arch/arm/src/imxrt/imxrt_edma.h index ed7713b685..12813a8f12 100644 --- a/arch/arm/src/imxrt/imxrt_edma.h +++ b/arch/arm/src/imxrt/imxrt_edma.h @@ -100,7 +100,7 @@ #include #include -#include "chip/imxrt_edma.h" +#include "hardware/imxrt_edma.h" /************************************************************************************ * Pre-processor Definitions @@ -145,7 +145,7 @@ struct imxrt_edma_xfrconfig_s int16_t doff; /* Sign-extended offset for current destination address. */ uint16_t iter; /* Major loop iteration count. */ uint8_t flags; /* See EDMA_CONFIG_* definitions */ - uint8_t ssize; /* Source data transfer size (see TCD_ATTR_SIZE_* definitions in chip/. */ + uint8_t ssize; /* Source data transfer size (see TCD_ATTR_SIZE_* definitions in rdware/. */ uint8_t dsize; /* Destination data transfer size. */ uint8_t ttype; /* Transfer type (see enum imxrt_edma_xfrtype_e). */ #ifdef CONFIG_IMXRT_EDMA_EMLIM @@ -231,7 +231,7 @@ extern "C" * * Input Parameters: * dmamux - DMAMUX configuration see DMAMUX channel configuration register - * bit-field definitions in chip/imxrt_dmamux.h. Settings include: + * bit-field definitions in hardware/imxrt_dmamux.h. Settings include: * * DMAMUX_CHCFG_SOURCE Chip-specific DMA source (required) * DMAMUX_CHCFG_AON DMA Channel Always Enable (optional) @@ -241,7 +241,7 @@ extern "C" * A value of zero will disable the DMAMUX channel. * dchpri - DCHPRI channel priority configuration. See DCHPRI channel * configuration register bit-field definitions in - * chip/imxrt_edma.h. Meaningful settings include: + * hardware/imxrt_edma.h. Meaningful settings include: * * EDMA_DCHPRI_CHPRI Channel Arbitration Priority * DCHPRI_DPA Disable Preempt Ability diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index b08780c525..3b4eeb7ee5 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -66,9 +66,9 @@ #include "up_arch.h" #include "chip.h" #include "imxrt_config.h" -#include "chip/imxrt_enet.h" -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_pinmux.h" +#include "hardware/imxrt_enet.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_pinmux.h" #include "imxrt_periphclks.h" #include "imxrt_gpio.h" #include "imxrt_enet.h" diff --git a/arch/arm/src/imxrt/imxrt_enet.h b/arch/arm/src/imxrt/imxrt_enet.h index 311fda56ad..ac63fb1e94 100644 --- a/arch/arm/src/imxrt/imxrt_enet.h +++ b/arch/arm/src/imxrt/imxrt_enet.h @@ -42,7 +42,7 @@ #include -#include "chip/imxrt_enet.h" +#include "hardware/imxrt_enet.h" #ifdef CONFIG_IMXRT_ENET diff --git a/arch/arm/src/imxrt/imxrt_gpio.c b/arch/arm/src/imxrt/imxrt_gpio.c index 0997c1fb63..35951e3e78 100644 --- a/arch/arm/src/imxrt/imxrt_gpio.c +++ b/arch/arm/src/imxrt/imxrt_gpio.c @@ -51,7 +51,7 @@ #include "up_arch.h" #include "imxrt_iomuxc.h" #include "imxrt_gpio.h" -#include "chip/imxrt_daisy.h" +#include "hardware/imxrt_daisy.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_gpio.h b/arch/arm/src/imxrt/imxrt_gpio.h index 3d44e475ba..825523836d 100644 --- a/arch/arm/src/imxrt/imxrt_gpio.h +++ b/arch/arm/src/imxrt/imxrt_gpio.h @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/imxrt_gpio.h" +#include "hardware/imxrt_gpio.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_hprtc.c b/arch/arm/src/imxrt/imxrt_hprtc.c index 71cffbcc47..9d2488a1e7 100644 --- a/arch/arm/src/imxrt/imxrt_hprtc.c +++ b/arch/arm/src/imxrt/imxrt_hprtc.c @@ -54,7 +54,7 @@ #include "up_arch.h" -#include "chip/imxrt_snvs.h" +#include "hardware/imxrt_snvs.h" #include "imxrt_periphclks.h" #include "imxrt_lpsrtc.h" #include "imxrt_hprtc.h" diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.c b/arch/arm/src/imxrt/imxrt_iomuxc.c index 3b7a15217f..89deb0c569 100644 --- a/arch/arm/src/imxrt/imxrt_iomuxc.c +++ b/arch/arm/src/imxrt/imxrt_iomuxc.c @@ -48,7 +48,7 @@ #include #include "up_arch.h" -#include "chip/imxrt_ccm.h" +#include "hardware/imxrt_ccm.h" #include "imxrt_periphclks.h" #include "imxrt_iomuxc.h" diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.h b/arch/arm/src/imxrt/imxrt_iomuxc.h index 994e9231be..890cc5b417 100644 --- a/arch/arm/src/imxrt/imxrt_iomuxc.h +++ b/arch/arm/src/imxrt/imxrt_iomuxc.h @@ -44,7 +44,7 @@ #include -#include "chip/imxrt_iomuxc.h" +#include "hardware/imxrt_iomuxc.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_lcd.c b/arch/arm/src/imxrt/imxrt_lcd.c index 815f08a2e1..884e54d744 100644 --- a/arch/arm/src/imxrt/imxrt_lcd.c +++ b/arch/arm/src/imxrt/imxrt_lcd.c @@ -58,7 +58,7 @@ #include "imxrt_gpio.h" #include "imxrt_iomuxc.h" -#include "chip/imxrt_pinmux.h" +#include "hardware/imxrt_pinmux.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_lcd.h b/arch/arm/src/imxrt/imxrt_lcd.h index a383f5fcf9..9561bc6546 100644 --- a/arch/arm/src/imxrt/imxrt_lcd.h +++ b/arch/arm/src/imxrt/imxrt_lcd.h @@ -44,7 +44,7 @@ * Included Files ****************************************************************************/ -#include "chip/imxrt_lcd.h" +#include "hardware/imxrt_lcd.h" #include diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c index 742d4bf143..a02dd63c97 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.c +++ b/arch/arm/src/imxrt/imxrt_lowputc.c @@ -45,10 +45,10 @@ #include "up_arch.h" -#include "chip/imxrt_iomuxc.h" -#include "chip/imxrt_pinmux.h" -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_lpuart.h" +#include "hardware/imxrt_iomuxc.h" +#include "hardware/imxrt_pinmux.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_lpuart.h" #include "imxrt_config.h" #include "imxrt_periphclks.h" #include "imxrt_iomuxc.h" diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c index b4dd258fc4..310055badb 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.c +++ b/arch/arm/src/imxrt/imxrt_lpi2c.c @@ -61,9 +61,9 @@ #include "imxrt_lpi2c.h" #include "imxrt_gpio.h" -#include "chip/imxrt_pinmux.h" -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_periphclks.h" +#include "hardware/imxrt_pinmux.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_periphclks.h" /* At least one I2C peripheral must be enabled */ diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.h b/arch/arm/src/imxrt/imxrt_lpi2c.h index af11de8d34..d229547c22 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.h +++ b/arch/arm/src/imxrt/imxrt_lpi2c.h @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "chip/imxrt_lpi2c.h" +#include "hardware/imxrt_lpi2c.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c index 4b34638135..58001ec3b8 100644 --- a/arch/arm/src/imxrt/imxrt_lpspi.c +++ b/arch/arm/src/imxrt/imxrt_lpspi.c @@ -86,10 +86,10 @@ #include "imxrt_lpspi.h" #include "imxrt_gpio.h" -#include "chip/imxrt_pinmux.h" -#include "chip/imxrt_lpspi.h" -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_periphclks.h" +#include "hardware/imxrt_pinmux.h" +#include "hardware/imxrt_lpspi.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_periphclks.h" #if defined(CONFIG_IMXRT_LPSPI1) || defined(CONFIG_IMXRT_LPSPI2) || \ defined(CONFIG_IMXRT_LPSPI3) || defined(CONFIG_IMXRT_LPSPI4) diff --git a/arch/arm/src/imxrt/imxrt_lpspi.h b/arch/arm/src/imxrt/imxrt_lpspi.h index 01368f90c8..e226639582 100644 --- a/arch/arm/src/imxrt/imxrt_lpspi.h +++ b/arch/arm/src/imxrt/imxrt_lpspi.h @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/imxrt_lpspi.h" +#include "hardware/imxrt_lpspi.h" /************************************************************************************ * Public Functions diff --git a/arch/arm/src/imxrt/imxrt_lpsrtc.c b/arch/arm/src/imxrt/imxrt_lpsrtc.c index 219c3734ee..32f67bd973 100644 --- a/arch/arm/src/imxrt/imxrt_lpsrtc.c +++ b/arch/arm/src/imxrt/imxrt_lpsrtc.c @@ -54,7 +54,7 @@ #include "up_arch.h" -#include "chip/imxrt_snvs.h" +#include "hardware/imxrt_snvs.h" #include "imxrt_periphclks.h" #include "imxrt_hprtc.h" #include "imxrt_lpsrtc.h" diff --git a/arch/arm/src/imxrt/imxrt_mpuinit.c b/arch/arm/src/imxrt/imxrt_mpuinit.c index 85b3a59116..ebfebadca6 100644 --- a/arch/arm/src/imxrt/imxrt_mpuinit.c +++ b/arch/arm/src/imxrt/imxrt_mpuinit.c @@ -46,7 +46,7 @@ #include "mpu.h" #include "barriers.h" -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_memorymap.h" #include "imxrt_mpuinit.h" diff --git a/arch/arm/src/imxrt/imxrt_ocotp.h b/arch/arm/src/imxrt/imxrt_ocotp.h index 646926cc1c..800083ae96 100644 --- a/arch/arm/src/imxrt/imxrt_ocotp.h +++ b/arch/arm/src/imxrt/imxrt_ocotp.h @@ -42,7 +42,7 @@ ****************************************************************************/ #include -#include "chip/imxrt_ocotp.h" +#include "hardware/imxrt_ocotp.h" #include #include diff --git a/arch/arm/src/imxrt/imxrt_periphclks.h b/arch/arm/src/imxrt/imxrt_periphclks.h index b259e85ac9..bde77d5bc1 100644 --- a/arch/arm/src/imxrt/imxrt_periphclks.h +++ b/arch/arm/src/imxrt/imxrt_periphclks.h @@ -42,7 +42,7 @@ #include #include -#include "chip/imxrt_ccm.h" +#include "hardware/imxrt_ccm.h" /******************************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c index 4020483159..bcb9857588 100644 --- a/arch/arm/src/imxrt/imxrt_serial.c +++ b/arch/arm/src/imxrt/imxrt_serial.c @@ -65,9 +65,9 @@ #include "up_arch.h" #include "up_internal.h" -#include "chip/imxrt_lpuart.h" +#include "hardware/imxrt_lpuart.h" #include "imxrt_gpio.h" -#include "chip/imxrt_pinmux.h" +#include "hardware/imxrt_pinmux.h" #include "imxrt_config.h" #include "imxrt_lowputc.h" diff --git a/arch/arm/src/imxrt/imxrt_timerisr.c b/arch/arm/src/imxrt/imxrt_timerisr.c index 817b9e1b96..616ca519cb 100644 --- a/arch/arm/src/imxrt/imxrt_timerisr.c +++ b/arch/arm/src/imxrt/imxrt_timerisr.c @@ -54,7 +54,7 @@ #include "up_arch.h" #include "chip.h" -#include "chip/imxrt_ccm.h" +#include "hardware/imxrt_ccm.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index 5de359050b..4b9e2150af 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -64,10 +64,10 @@ #include "imxrt_config.h" #include "imxrt_gpio.h" -#include "chip/imxrt_pinmux.h" -#include "chip/imxrt_ccm.h" -#include "chip/imxrt_periphclks.h" -#include "chip/imxrt_usdhc.h" +#include "hardware/imxrt_pinmux.h" +#include "hardware/imxrt_ccm.h" +#include "hardware/imxrt_periphclks.h" +#include "hardware/imxrt_usdhc.h" #ifdef CONFIG_IMXRT_USDHC diff --git a/arch/arm/src/imxrt/imxrt_usdhc.h b/arch/arm/src/imxrt/imxrt_usdhc.h index 983a66515b..d2e6fd5d7f 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.h +++ b/arch/arm/src/imxrt/imxrt_usdhc.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "chip/imxrt_usdhc.h" +#include "hardware/imxrt_usdhc.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/imxrt/imxrt_wdog.c b/arch/arm/src/imxrt/imxrt_wdog.c index 8f9f2410ed..c491e7b131 100644 --- a/arch/arm/src/imxrt/imxrt_wdog.c +++ b/arch/arm/src/imxrt/imxrt_wdog.c @@ -45,7 +45,7 @@ #include "up_arch.h" -#include "chip/imxrt_wdog.h" +#include "hardware/imxrt_wdog.h" #include "imxrt_config.h" #include /* Include last: has dependencies */ diff --git a/arch/arm/src/imxrt/imxrt_wdog.h b/arch/arm/src/imxrt/imxrt_wdog.h index 03ae7a8276..efed2de0ed 100644 --- a/arch/arm/src/imxrt/imxrt_wdog.h +++ b/arch/arm/src/imxrt/imxrt_wdog.h @@ -49,7 +49,7 @@ #include "up_internal.h" #include "chip.h" -#include "chip/imxrt_wdog.h" +#include "hardware/imxrt_wdog.h" /**************************************************************************** * Public Types diff --git a/arch/arm/src/imxrt/imxrt_xbar.h b/arch/arm/src/imxrt/imxrt_xbar.h index 6636cd9c16..24c615f89a 100644 --- a/arch/arm/src/imxrt/imxrt_xbar.h +++ b/arch/arm/src/imxrt/imxrt_xbar.h @@ -43,8 +43,8 @@ #include #include -#include "chip/imxrt_xbar.h" -#include "chip/imxrt_memorymap.h" +#include "hardware/imxrt_xbar.h" +#include "hardware/imxrt_memorymap.h" /************************************************************************************************************************************************** * Pre-processor Definitions @@ -114,7 +114,7 @@ #define IMXRT_SIDE(six) ((six) & IMXRT_XBARA_SIDE_MASK) >> IMXRT_XBARA_SIDE_SHIFTS /* Collect correct XBAR definitions from chip file */ -#include "chip/imxrt_xbar.h" +#include "hardware/imxrt_xbar.h" /************************************************************************************************************************************************** * Public Functions diff --git a/arch/arm/src/stm32l4/stm32l4_hsi48.c b/arch/arm/src/stm32l4/stm32l4_hsi48.c index 527076c1ae..28fa3aa7c0 100644 --- a/arch/arm/src/stm32l4/stm32l4_hsi48.c +++ b/arch/arm/src/stm32l4/stm32l4_hsi48.c @@ -41,7 +41,7 @@ #include "up_arch.h" #include "chip.h" -#include "hardware/stm32l4_rcc.h" +#include "stm32l4_rcc.h" #include "hardware/stm32l4_crs.h" #include "stm32l4_hsi48.h"