diff --git a/arch/arm/src/samd2l2/chip.h b/arch/arm/src/samd2l2/chip.h index 9e877a5d8f9..d49ae704ef6 100644 --- a/arch/arm/src/samd2l2/chip.h +++ b/arch/arm/src/samd2l2/chip.h @@ -55,11 +55,11 @@ */ #if defined(CONFIG_ARCH_FAMILY_SAMD20) -# include "chip/samd20_memorymap.h" +# include "hardware/samd20_memorymap.h" #elif defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd21_memorymap.h" +# include "hardware/samd21_memorymap.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml21_memorymap.h" +# include "hardware/saml21_memorymap.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/chip/samd20_memorymap.h b/arch/arm/src/samd2l2/hardware/samd20_memorymap.h similarity index 96% rename from arch/arm/src/samd2l2/chip/samd20_memorymap.h rename to arch/arm/src/samd2l2/hardware/samd20_memorymap.h index c34efc1e7d6..5a22a5361fe 100644 --- a/arch/arm/src/samd2l2/chip/samd20_memorymap.h +++ b/arch/arm/src/samd2l2/hardware/samd20_memorymap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd20_memorymap.h + * arch/arm/src/samd2l2/hardware/samd20_memorymap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_MEMORYMAP_H /******************************************************************************************** * Included Files @@ -124,4 +124,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_MEMORYMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/samd20_pinmap.h b/arch/arm/src/samd2l2/hardware/samd20_pinmap.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd20_pinmap.h rename to arch/arm/src/samd2l2/hardware/samd20_pinmap.h index be59294046d..a28f2ebf58a 100644 --- a/arch/arm/src/samd2l2/chip/samd20_pinmap.h +++ b/arch/arm/src/samd2l2/hardware/samd20_pinmap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd20_pinmap.h + * arch/arm/src/samd2l2/hardware/samd20_pinmap.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_PINMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_PINMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_PINMAP_H /******************************************************************************************** * Included Files @@ -362,4 +362,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD20_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD20_PINMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/samd21_memorymap.h b/arch/arm/src/samd2l2/hardware/samd21_memorymap.h similarity index 96% rename from arch/arm/src/samd2l2/chip/samd21_memorymap.h rename to arch/arm/src/samd2l2/hardware/samd21_memorymap.h index 17f23d86eb9..e52a2fab42a 100644 --- a/arch/arm/src/samd2l2/chip/samd21_memorymap.h +++ b/arch/arm/src/samd2l2/hardware/samd21_memorymap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd21_memorymap.h + * arch/arm/src/samd2l2/hardware/samd21_memorymap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_MEMORYMAP_H /******************************************************************************************** * Included Files @@ -129,4 +129,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_MEMORYMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/samd21_pinmap.h b/arch/arm/src/samd2l2/hardware/samd21_pinmap.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd21_pinmap.h rename to arch/arm/src/samd2l2/hardware/samd21_pinmap.h index a9a6ccd089e..a5ef79376e3 100644 --- a/arch/arm/src/samd2l2/chip/samd21_pinmap.h +++ b/arch/arm/src/samd2l2/hardware/samd21_pinmap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd21_pinmap.h + * arch/arm/src/samd2l2/hardware/samd21_pinmap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_PINMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_PINMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_PINMAP_H /******************************************************************************************** * Included Files @@ -413,4 +413,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD21_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD21_PINMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_ac.h b/arch/arm/src/samd2l2/hardware/samd_ac.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_ac.h rename to arch/arm/src/samd2l2/hardware/samd_ac.h index ea66654bbb6..a4a7b616350 100644 --- a/arch/arm/src/samd2l2/chip/samd_ac.h +++ b/arch/arm/src/samd2l2/hardware/samd_ac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_ac.h + * arch/arm/src/samd2l2/hardware/samd_ac.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Matt Thompson @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_AC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_AC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_AC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_AC_H /******************************************************************************************** * Included Files @@ -206,4 +206,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_AC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_AC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_adc.h b/arch/arm/src/samd2l2/hardware/samd_adc.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_adc.h rename to arch/arm/src/samd2l2/hardware/samd_adc.h index 6a081835d44..4cdba8819cb 100644 --- a/arch/arm/src/samd2l2/chip/samd_adc.h +++ b/arch/arm/src/samd2l2/hardware/samd_adc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_adc.h + * arch/arm/src/samd2l2/hardware/samd_adc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Alexander Vasiljev @@ -36,8 +36,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_ADC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_ADC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_ADC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_ADC_H /******************************************************************************************** * Included Files @@ -274,4 +274,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_ADC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_ADC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_dac.h b/arch/arm/src/samd2l2/hardware/samd_dac.h similarity index 97% rename from arch/arm/src/samd2l2/chip/samd_dac.h rename to arch/arm/src/samd2l2/hardware/samd_dac.h index 813ae97e915..2eed6a11ffa 100644 --- a/arch/arm/src/samd2l2/chip/samd_dac.h +++ b/arch/arm/src/samd2l2/hardware/samd_dac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_dac.h + * arch/arm/src/samd2l2/hardware/saml_dac.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DAC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DAC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DAC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DAC_H /******************************************************************************************** * Included Files @@ -133,4 +133,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DAC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DAC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_dmac.h b/arch/arm/src/samd2l2/hardware/samd_dmac.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd_dmac.h rename to arch/arm/src/samd2l2/hardware/samd_dmac.h index 7e5db664a74..bdf1c363168 100644 --- a/arch/arm/src/samd2l2/chip/samd_dmac.h +++ b/arch/arm/src/samd2l2/hardware/samd_dmac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_dmac.h + * arch/arm/src/samd2l2/hardware/samd_dmac.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DMAC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DMAC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DMAC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DMAC_H /******************************************************************************************** * Included Files @@ -396,4 +396,4 @@ struct dma_desc_s * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_DMAC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_DMAC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_eic.h b/arch/arm/src/samd2l2/hardware/samd_eic.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_eic.h rename to arch/arm/src/samd2l2/hardware/samd_eic.h index 8f02bfc531e..a03b682715b 100644 --- a/arch/arm/src/samd2l2/chip/samd_eic.h +++ b/arch/arm/src/samd2l2/hardware/samd_eic.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_eic.h + * arch/arm/src/samd2l2/hardware/samd_eic.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EIC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EIC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EIC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EIC_H /******************************************************************************************** * Included Files @@ -187,4 +187,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EIC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EIC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_evsys.h b/arch/arm/src/samd2l2/hardware/samd_evsys.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd_evsys.h rename to arch/arm/src/samd2l2/hardware/samd_evsys.h index 43745cc922c..50c6cdd6d47 100644 --- a/arch/arm/src/samd2l2/chip/samd_evsys.h +++ b/arch/arm/src/samd2l2/hardware/samd_evsys.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_evsys.h + * arch/arm/src/samd2l2/hardware/samd_evsys.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EVSYS_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EVSYS_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EVSYS_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EVSYS_H /******************************************************************************************** * Included Files @@ -353,4 +353,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_EVSYS_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_EVSYS_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_fuses.h b/arch/arm/src/samd2l2/hardware/samd_fuses.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_fuses.h rename to arch/arm/src/samd2l2/hardware/samd_fuses.h index 990f5f6f48b..7efe168b58c 100644 --- a/arch/arm/src/samd2l2/chip/samd_fuses.h +++ b/arch/arm/src/samd2l2/hardware/samd_fuses.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_fuses.h + * arch/arm/src/samd2l2/hardware/samd_fuses.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,8 +44,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_FUSES_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_FUSES_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_FUSES_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_FUSES_H /******************************************************************************************** * Included Files @@ -295,4 +295,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_FUSES_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_FUSES_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_gclk.h b/arch/arm/src/samd2l2/hardware/samd_gclk.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_gclk.h rename to arch/arm/src/samd2l2/hardware/samd_gclk.h index 54f957e6178..77ce4c3371d 100644 --- a/arch/arm/src/samd2l2/chip/samd_gclk.h +++ b/arch/arm/src/samd2l2/hardware/samd_gclk.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_gclk.h + * arch/arm/src/samd2l2/hardware/samd_gclk.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_GCLK_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_GCLK_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_GCLK_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_GCLK_H /******************************************************************************************** * Included Files @@ -256,4 +256,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_GCLK_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_GCLK_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_i2c_master.h b/arch/arm/src/samd2l2/hardware/samd_i2c_master.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_i2c_master.h rename to arch/arm/src/samd2l2/hardware/samd_i2c_master.h index 62b5b2d8956..a3eebb8b00d 100644 --- a/arch/arm/src/samd2l2/chip/samd_i2c_master.h +++ b/arch/arm/src/samd2l2/hardware/samd_i2c_master.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_i2c_master.h + * arch/arm/src/samd2l2/hardware/samd_i2c_master.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_MASTER_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_MASTER_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_MASTER_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_MASTER_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/samd_sercom.h" +#include "hardware/samd_sercom.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) @@ -338,4 +338,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_MASTER_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_MASTER_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_i2c_slave.h b/arch/arm/src/samd2l2/hardware/samd_i2c_slave.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_i2c_slave.h rename to arch/arm/src/samd2l2/hardware/samd_i2c_slave.h index d944ff2d79d..5be25f2a1b9 100644 --- a/arch/arm/src/samd2l2/chip/samd_i2c_slave.h +++ b/arch/arm/src/samd2l2/hardware/samd_i2c_slave.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_i2c_slave.h + * arch/arm/src/samd2l2/hardware/samd_i2c_slave.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_SLAVE_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_SLAVE_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_SLAVE_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_SLAVE_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/samd_sercom.h" +#include "hardware/samd_sercom.h" #ifdef CONFIG_ARCH_FAMILY_SAMD20 @@ -300,4 +300,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2C_SLAVE_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2C_SLAVE_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_i2s.h b/arch/arm/src/samd2l2/hardware/samd_i2s.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_i2s.h rename to arch/arm/src/samd2l2/hardware/samd_i2s.h index 4a273612ac4..572e38faf88 100644 --- a/arch/arm/src/samd2l2/chip/samd_i2s.h +++ b/arch/arm/src/samd2l2/hardware/samd_i2s.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_i2s.h + * arch/arm/src/samd2l2/hardware/samd_i2s.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Matt Thompson @@ -36,8 +36,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2S_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2S_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2S_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2S_H /******************************************************************************************** * Included Files @@ -200,4 +200,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_I2S_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_I2S_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_nvmctrl.h b/arch/arm/src/samd2l2/hardware/samd_nvmctrl.h similarity index 97% rename from arch/arm/src/samd2l2/chip/samd_nvmctrl.h rename to arch/arm/src/samd2l2/hardware/samd_nvmctrl.h index 3204074404b..88be8178161 100644 --- a/arch/arm/src/samd2l2/chip/samd_nvmctrl.h +++ b/arch/arm/src/samd2l2/hardware/samd_nvmctrl.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_nvmctrl.h + * arch/arm/src/samd2l2/hardware/samd_nvmctrl.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_NVMCTRL_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_NVMCTRL_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_NVMCTRL_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_NVMCTRL_H /******************************************************************************************** * Included Files @@ -184,4 +184,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_NVMCTRL_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_NVMCTRL_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_pm.h b/arch/arm/src/samd2l2/hardware/samd_pm.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_pm.h rename to arch/arm/src/samd2l2/hardware/samd_pm.h index 71208157b43..75f4e79f3c0 100644 --- a/arch/arm/src/samd2l2/chip/samd_pm.h +++ b/arch/arm/src/samd2l2/hardware/samd_pm.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_pm.h + * arch/arm/src/samd2l2/hardware/samd_pm.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PM_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PM_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PM_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PM_H /******************************************************************************************** * Included Files @@ -261,4 +261,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PM_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PM_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_port.h b/arch/arm/src/samd2l2/hardware/samd_port.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd_port.h rename to arch/arm/src/samd2l2/hardware/samd_port.h index 729d0ca4f31..abb771a299f 100644 --- a/arch/arm/src/samd2l2/chip/samd_port.h +++ b/arch/arm/src/samd2l2/hardware/samd_port.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_port.h + * arch/arm/src/samd2l2/hardware/samd_port.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PORT_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PORT_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PORT_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PORT_H /******************************************************************************************** * Included Files @@ -331,4 +331,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_PORT_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_PORT_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_sercom.h b/arch/arm/src/samd2l2/hardware/samd_sercom.h similarity index 95% rename from arch/arm/src/samd2l2/chip/samd_sercom.h rename to arch/arm/src/samd2l2/hardware/samd_sercom.h index 3ab4675f962..ef76104d484 100644 --- a/arch/arm/src/samd2l2/chip/samd_sercom.h +++ b/arch/arm/src/samd2l2/hardware/samd_sercom.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_sercom.h + * arch/arm/src/samd2l2/hardware/samd_sercom.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SERCOM_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SERCOM_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SERCOM_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SERCOM_H /******************************************************************************************** * Included Files @@ -96,4 +96,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SERCOM_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SERCOM_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_spi.h b/arch/arm/src/samd2l2/hardware/samd_spi.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_spi.h rename to arch/arm/src/samd2l2/hardware/samd_spi.h index 152d099b3f7..fc3047c5008 100644 --- a/arch/arm/src/samd2l2/chip/samd_spi.h +++ b/arch/arm/src/samd2l2/hardware/samd_spi.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_spi.h + * arch/arm/src/samd2l2/hardware/samd_spi.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SPI_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SPI_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SPI_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SPI_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/samd_sercom.h" +#include "hardware/samd_sercom.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) @@ -303,4 +303,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SPI_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SPI_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_sysctrl.h b/arch/arm/src/samd2l2/hardware/samd_sysctrl.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd_sysctrl.h rename to arch/arm/src/samd2l2/hardware/samd_sysctrl.h index 3f29dd530b8..29b7777ea4e 100644 --- a/arch/arm/src/samd2l2/chip/samd_sysctrl.h +++ b/arch/arm/src/samd2l2/hardware/samd_sysctrl.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_sysctrl.h + * arch/arm/src/samd2l2/hardware/samd_sysctrl.h * * Copyright (C) 2014, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SYSCTRL_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SYSCTRL_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SYSCTRL_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SYSCTRL_H /******************************************************************************************** * Included Files @@ -432,4 +432,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_SYSCTRL_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_SYSCTRL_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_tc.h b/arch/arm/src/samd2l2/hardware/samd_tc.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_tc.h rename to arch/arm/src/samd2l2/hardware/samd_tc.h index 5934710ab09..99aca04d4e0 100644 --- a/arch/arm/src/samd2l2/chip/samd_tc.h +++ b/arch/arm/src/samd2l2/hardware/samd_tc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_tc.h + * arch/arm/src/samd2l2/hardware/samd_tc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Matt Thompson @@ -36,8 +36,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TC_H /******************************************************************************************** * Included Files @@ -251,4 +251,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_tcc.h b/arch/arm/src/samd2l2/hardware/samd_tcc.h similarity index 99% rename from arch/arm/src/samd2l2/chip/samd_tcc.h rename to arch/arm/src/samd2l2/hardware/samd_tcc.h index e5b30afeb7e..7a9ebaa22f6 100644 --- a/arch/arm/src/samd2l2/chip/samd_tcc.h +++ b/arch/arm/src/samd2l2/hardware/samd_tcc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_tcc.h + * arch/arm/src/samd2l2/hardware/samd_tcc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Matt Thompson @@ -36,8 +36,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TCC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TCC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TCC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TCC_H /******************************************************************************************** * Included Files @@ -460,4 +460,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_TCC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_TCC_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_usart.h b/arch/arm/src/samd2l2/hardware/samd_usart.h similarity index 98% rename from arch/arm/src/samd2l2/chip/samd_usart.h rename to arch/arm/src/samd2l2/hardware/samd_usart.h index ad28185c174..bdfba56578f 100644 --- a/arch/arm/src/samd2l2/chip/samd_usart.h +++ b/arch/arm/src/samd2l2/hardware/samd_usart.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_usart.h + * arch/arm/src/samd2l2/hardware/samd_usart.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -39,8 +39,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_USART_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_USART_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_USART_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_USART_H /******************************************************************************************** * Included Files @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "chip/samd_sercom.h" +#include "hardware/samd_sercom.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) @@ -391,4 +391,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAMD_USART_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAMD_USART_H */ diff --git a/arch/arm/src/samd2l2/chip/samd_wdt.h b/arch/arm/src/samd2l2/hardware/samd_wdt.h similarity index 97% rename from arch/arm/src/samd2l2/chip/samd_wdt.h rename to arch/arm/src/samd2l2/hardware/samd_wdt.h index 6173fa32f1b..bbb704423e3 100644 --- a/arch/arm/src/samd2l2/chip/samd_wdt.h +++ b/arch/arm/src/samd2l2/hardware/samd_wdt.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd_wdt.h + * arch/arm/src/samd2l2/hardware/samd_wdt.h * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAM_WDT_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAM_WDT_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAM_WDT_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAM_WDT_H /******************************************************************************************** * Included Files @@ -159,4 +159,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAMD20 || CONFIG_ARCH_FAMILY_SAMD21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAM_WDT_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAM_WDT_H */ diff --git a/arch/arm/src/samd2l2/chip/saml21_memorymap.h b/arch/arm/src/samd2l2/hardware/saml21_memorymap.h similarity index 96% rename from arch/arm/src/samd2l2/chip/saml21_memorymap.h rename to arch/arm/src/samd2l2/hardware/saml21_memorymap.h index 5721e9e6c6a..2aa3c2d87d4 100644 --- a/arch/arm/src/samd2l2/chip/saml21_memorymap.h +++ b/arch/arm/src/samd2l2/hardware/saml21_memorymap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml21_memorymap.h + * arch/arm/src/samd2l2/hardware/saml21_memorymap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_MEMORYMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_MEMORYMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_MEMORYMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_MEMORYMAP_H /******************************************************************************************** * Included Files @@ -139,4 +139,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_MEMORYMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_MEMORYMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/saml21_pinmap.h b/arch/arm/src/samd2l2/hardware/saml21_pinmap.h similarity index 99% rename from arch/arm/src/samd2l2/chip/saml21_pinmap.h rename to arch/arm/src/samd2l2/hardware/saml21_pinmap.h index 63061a4cc7d..dbee0d2712c 100644 --- a/arch/arm/src/samd2l2/chip/saml21_pinmap.h +++ b/arch/arm/src/samd2l2/hardware/saml21_pinmap.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/samd20_pinmap.h + * arch/arm/src/samd2l2/hardware/samd20_pinmap.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_PINMAP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_PINMAP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_PINMAP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_PINMAP_H /******************************************************************************************** * Included Files @@ -466,4 +466,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML21_PINMAP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML21_PINMAP_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_adc.h b/arch/arm/src/samd2l2/hardware/saml_adc.h similarity index 96% rename from arch/arm/src/samd2l2/chip/saml_adc.h rename to arch/arm/src/samd2l2/hardware/saml_adc.h index e48edcfd735..48aaf7a3889 100644 --- a/arch/arm/src/samd2l2/chip/saml_adc.h +++ b/arch/arm/src/samd2l2/hardware/saml_adc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_adc.h + * arch/arm/src/samd2l2/hardware/saml_adc.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Alexander Vasiljev @@ -36,8 +36,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_ADC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_ADC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_ADC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_ADC_H /******************************************************************************************** * Included Files @@ -103,4 +103,4 @@ #define SAM_ADC_CALIB (SAM_ADC_BASE + SAM_ADC_CALIB_OFFSET) #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_ADC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_ADC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_aes.h b/arch/arm/src/samd2l2/hardware/saml_aes.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_aes.h rename to arch/arm/src/samd2l2/hardware/saml_aes.h index 30b3890aa5a..3b1610f6bbd 100644 --- a/arch/arm/src/samd2l2/chip/saml_aes.h +++ b/arch/arm/src/samd2l2/hardware/saml_aes.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_aes.h + * arch/arm/src/samd2l2/hardware/saml_aes.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_AES_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_AES_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_AES_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_AES_H /******************************************************************************************** * Included Files @@ -208,4 +208,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_AES_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_AES_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_dac.h b/arch/arm/src/samd2l2/hardware/saml_dac.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_dac.h rename to arch/arm/src/samd2l2/hardware/saml_dac.h index fcaa32c3152..4e5919f9ad8 100644 --- a/arch/arm/src/samd2l2/chip/saml_dac.h +++ b/arch/arm/src/samd2l2/hardware/saml_dac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_dac.h + * arch/arm/src/samd2l2/hardware/saml_dac.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DAC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DAC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DAC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DAC_H /******************************************************************************************** * Included Files @@ -176,4 +176,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DAC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DAC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_dmac.h b/arch/arm/src/samd2l2/hardware/saml_dmac.h similarity index 99% rename from arch/arm/src/samd2l2/chip/saml_dmac.h rename to arch/arm/src/samd2l2/hardware/saml_dmac.h index dab81f8e669..c747b97f532 100644 --- a/arch/arm/src/samd2l2/chip/saml_dmac.h +++ b/arch/arm/src/samd2l2/hardware/saml_dmac.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_dmac.h + * arch/arm/src/samd2l2/hardware/saml_dmac.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DMAC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DMAC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DMAC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DMAC_H /******************************************************************************************** * Included Files @@ -386,4 +386,4 @@ struct dma_desc_s ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_DMAC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_DMAC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_eic.h b/arch/arm/src/samd2l2/hardware/saml_eic.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_eic.h rename to arch/arm/src/samd2l2/hardware/saml_eic.h index 2419f72e8c3..ec9d6f7e23b 100644 --- a/arch/arm/src/samd2l2/chip/saml_eic.h +++ b/arch/arm/src/samd2l2/hardware/saml_eic.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_eic.h + * arch/arm/src/samd2l2/hardware/saml_eic.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EIC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EIC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EIC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EIC_H /******************************************************************************************** * Included Files @@ -204,4 +204,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EIC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EIC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_evsys.h b/arch/arm/src/samd2l2/hardware/saml_evsys.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_evsys.h rename to arch/arm/src/samd2l2/hardware/saml_evsys.h index 49e0d55427c..896bbbbfefb 100644 --- a/arch/arm/src/samd2l2/chip/saml_evsys.h +++ b/arch/arm/src/samd2l2/hardware/saml_evsys.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_evsys.h + * arch/arm/src/samd2l2/hardware/saml_evsys.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EVSYS_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EVSYS_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EVSYS_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EVSYS_H /******************************************************************************************** * Included Files @@ -257,4 +257,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_EVSYS_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_EVSYS_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_fuses.h b/arch/arm/src/samd2l2/hardware/saml_fuses.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_fuses.h rename to arch/arm/src/samd2l2/hardware/saml_fuses.h index 2a18802b5d8..a6e7b130f79 100644 --- a/arch/arm/src/samd2l2/chip/saml_fuses.h +++ b/arch/arm/src/samd2l2/hardware/saml_fuses.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/sam_fuses.h + * arch/arm/src/samd2l2/hardware/sam_fuses.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_FUSES_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_FUSES_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_FUSES_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_FUSES_H /******************************************************************************************** * Included Files @@ -203,4 +203,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_FUSES_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_FUSES_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_gclk.h b/arch/arm/src/samd2l2/hardware/saml_gclk.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_gclk.h rename to arch/arm/src/samd2l2/hardware/saml_gclk.h index 37bb6c510a5..384b9280b60 100644 --- a/arch/arm/src/samd2l2/chip/saml_gclk.h +++ b/arch/arm/src/samd2l2/hardware/saml_gclk.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_gclk.h + * arch/arm/src/samd2l2/hardware/saml_gclk.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_GCLK_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_GCLK_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_GCLK_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_GCLK_H /******************************************************************************************** * Included Files @@ -191,4 +191,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_GCLK_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_GCLK_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_i2c_master.h b/arch/arm/src/samd2l2/hardware/saml_i2c_master.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_i2c_master.h rename to arch/arm/src/samd2l2/hardware/saml_i2c_master.h index 5a0ca665266..e841bb69c44 100644 --- a/arch/arm/src/samd2l2/chip/saml_i2c_master.h +++ b/arch/arm/src/samd2l2/hardware/saml_i2c_master.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_i2c_master.h + * arch/arm/src/samd2l2/hardware/saml_i2c_master.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_MASTER_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_MASTER_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_MASTER_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_MASTER_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/saml_sercom.h" +#include "hardware/saml_sercom.h" #ifdef CONFIG_ARCH_FAMILY_SAML21 @@ -272,4 +272,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_MASTER_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_MASTER_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_i2c_slave.h b/arch/arm/src/samd2l2/hardware/saml_i2c_slave.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_i2c_slave.h rename to arch/arm/src/samd2l2/hardware/saml_i2c_slave.h index 67554f3da07..22bf0f6655d 100644 --- a/arch/arm/src/samd2l2/chip/saml_i2c_slave.h +++ b/arch/arm/src/samd2l2/hardware/saml_i2c_slave.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_i2c_slave.h + * arch/arm/src/samd2l2/hardware/saml_i2c_slave.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_SLAVE_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_SLAVE_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_SLAVE_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_SLAVE_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/saml_sercom.h" +#include "hardware/saml_sercom.h" #ifdef CONFIG_ARCH_FAMILY_SAML21 @@ -212,4 +212,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_I2C_SLAVE_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_I2C_SLAVE_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_mclk.h b/arch/arm/src/samd2l2/hardware/saml_mclk.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_mclk.h rename to arch/arm/src/samd2l2/hardware/saml_mclk.h index 36f858282cb..c58522f69e5 100644 --- a/arch/arm/src/samd2l2/chip/saml_mclk.h +++ b/arch/arm/src/samd2l2/hardware/saml_mclk.h @@ -1,5 +1,5 @@ /************************************************************************************ - * arch/arm/src/samd2l2/chip/saml_mclk.h + * arch/arm/src/samd2l2/hardware/saml_mclk.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_MCLK_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_MCLK_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_MCLK_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_MCLK_H /************************************************************************************ * Included Files @@ -213,4 +213,4 @@ ************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_MCLK_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_MCLK_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_nvmctrl.h b/arch/arm/src/samd2l2/hardware/saml_nvmctrl.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_nvmctrl.h rename to arch/arm/src/samd2l2/hardware/saml_nvmctrl.h index 3e6eccf962c..25d2edf7c26 100644 --- a/arch/arm/src/samd2l2/chip/saml_nvmctrl.h +++ b/arch/arm/src/samd2l2/hardware/saml_nvmctrl.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_nvmctrl.h + * arch/arm/src/samd2l2/hardware/saml_nvmctrl.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_NVMCTRL_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_NVMCTRL_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_NVMCTRL_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_NVMCTRL_H /******************************************************************************************** * Included Files @@ -173,4 +173,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_NVMCTRL_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_NVMCTRL_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_opamp.h b/arch/arm/src/samd2l2/hardware/saml_opamp.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_opamp.h rename to arch/arm/src/samd2l2/hardware/saml_opamp.h index a06773a958a..eb1254ec46a 100644 --- a/arch/arm/src/samd2l2/chip/saml_opamp.h +++ b/arch/arm/src/samd2l2/hardware/saml_opamp.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_opamp.h + * arch/arm/src/samd2l2/hardware/saml_opamp.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OPAMP_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OPAMP_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OPAMP_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OPAMP_H /******************************************************************************************** * Included Files @@ -150,4 +150,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OPAMP_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OPAMP_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_osc32kctrl.h b/arch/arm/src/samd2l2/hardware/saml_osc32kctrl.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_osc32kctrl.h rename to arch/arm/src/samd2l2/hardware/saml_osc32kctrl.h index 16443d5e043..dba992f5ef4 100644 --- a/arch/arm/src/samd2l2/chip/saml_osc32kctrl.h +++ b/arch/arm/src/samd2l2/hardware/saml_osc32kctrl.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_osc32kctrl.h + * arch/arm/src/samd2l2/hardware/saml_osc32kctrl.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSC32KCTRL_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSC32KCTRL_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSC32KCTRL_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSC32KCTRL_H /******************************************************************************************** * Included Files @@ -161,4 +161,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSC32KCTRL_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSC32KCTRL_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_oscctrl.h b/arch/arm/src/samd2l2/hardware/saml_oscctrl.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_oscctrl.h rename to arch/arm/src/samd2l2/hardware/saml_oscctrl.h index 08cb54b7f80..c37e8d43b05 100644 --- a/arch/arm/src/samd2l2/chip/saml_oscctrl.h +++ b/arch/arm/src/samd2l2/hardware/saml_oscctrl.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_oscctrl.h + * arch/arm/src/samd2l2/hardware/saml_oscctrl.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSCCTRL_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSCCTRL_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSCCTRL_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSCCTRL_H /******************************************************************************************** * Included Files @@ -302,4 +302,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_OSCCTRL_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_OSCCTRL_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_pm.h b/arch/arm/src/samd2l2/hardware/saml_pm.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_pm.h rename to arch/arm/src/samd2l2/hardware/saml_pm.h index 04a170c88de..d765e3bb7bb 100644 --- a/arch/arm/src/samd2l2/chip/saml_pm.h +++ b/arch/arm/src/samd2l2/hardware/saml_pm.h @@ -1,5 +1,5 @@ /**************************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_pm.h + * arch/arm/src/samd2l2/hardware/saml_pm.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ****************************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PM_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PM_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PM_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PM_H /**************************************************************************************************** * Included Files @@ -147,4 +147,4 @@ ****************************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PM_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PM_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_port.h b/arch/arm/src/samd2l2/hardware/saml_port.h similarity index 99% rename from arch/arm/src/samd2l2/chip/saml_port.h rename to arch/arm/src/samd2l2/hardware/saml_port.h index fd62b70cdc1..60b4908f57b 100644 --- a/arch/arm/src/samd2l2/chip/saml_port.h +++ b/arch/arm/src/samd2l2/hardware/saml_port.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_port.h + * arch/arm/src/samd2l2/hardware/saml_port.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PORT_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PORT_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PORT_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PORT_H /******************************************************************************************** * Included Files @@ -451,4 +451,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_PORT_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_PORT_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_rstc.h b/arch/arm/src/samd2l2/hardware/saml_rstc.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_rstc.h rename to arch/arm/src/samd2l2/hardware/saml_rstc.h index 5f294b874b9..7a923f0e3df 100644 --- a/arch/arm/src/samd2l2/chip/saml_rstc.h +++ b/arch/arm/src/samd2l2/hardware/saml_rstc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_rstc.h + * arch/arm/src/samd2l2/hardware/saml_rstc.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_RSTC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_RSTC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_RSTC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_RSTC_H /******************************************************************************************** * Included Files @@ -142,4 +142,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_RSTC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_RSTC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_sercom.h b/arch/arm/src/samd2l2/hardware/saml_sercom.h similarity index 93% rename from arch/arm/src/samd2l2/chip/saml_sercom.h rename to arch/arm/src/samd2l2/hardware/saml_sercom.h index fc9cfa327ac..d5d193d042c 100644 --- a/arch/arm/src/samd2l2/chip/saml_sercom.h +++ b/arch/arm/src/samd2l2/hardware/saml_sercom.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_sercom.h + * arch/arm/src/samd2l2/hardware/saml_sercom.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SERCOM_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SERCOM_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SERCOM_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SERCOM_H /******************************************************************************************** * Included Files @@ -64,4 +64,4 @@ * Public Functions ********************************************************************************************/ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SERCOM_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SERCOM_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_spi.h b/arch/arm/src/samd2l2/hardware/saml_spi.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_spi.h rename to arch/arm/src/samd2l2/hardware/saml_spi.h index b675d8cefa7..30b0306e82e 100644 --- a/arch/arm/src/samd2l2/chip/saml_spi.h +++ b/arch/arm/src/samd2l2/hardware/saml_spi.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_spi.h + * arch/arm/src/samd2l2/hardware/saml_spi.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SPI_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SPI_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SPI_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SPI_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/saml_sercom.h" +#include "hardware/saml_sercom.h" #ifdef CONFIG_ARCH_FAMILY_SAML21 @@ -248,4 +248,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SPI_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SPI_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_supc.h b/arch/arm/src/samd2l2/hardware/saml_supc.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_supc.h rename to arch/arm/src/samd2l2/hardware/saml_supc.h index e87a9f697a8..0fd6fbd3722 100644 --- a/arch/arm/src/samd2l2/chip/saml_supc.h +++ b/arch/arm/src/samd2l2/hardware/saml_supc.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_supc.h + * arch/arm/src/samd2l2/hardware/saml_supc.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SUPC_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SUPC_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SUPC_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SUPC_H /******************************************************************************************** * Included Files @@ -260,4 +260,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_SUPC_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_SUPC_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_trng.h b/arch/arm/src/samd2l2/hardware/saml_trng.h similarity index 95% rename from arch/arm/src/samd2l2/chip/saml_trng.h rename to arch/arm/src/samd2l2/hardware/saml_trng.h index a9e99662302..c2c09d5b4fd 100644 --- a/arch/arm/src/samd2l2/chip/saml_trng.h +++ b/arch/arm/src/samd2l2/hardware/saml_trng.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_trng.h + * arch/arm/src/samd2l2/hardware/saml_trng.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_TRNG_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_TRNG_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_TRNG_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_TRNG_H /******************************************************************************************** * Included Files @@ -99,4 +99,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_TRNG_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_TRNG_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_usart.h b/arch/arm/src/samd2l2/hardware/saml_usart.h similarity index 98% rename from arch/arm/src/samd2l2/chip/saml_usart.h rename to arch/arm/src/samd2l2/hardware/saml_usart.h index db05661e64c..c77987f6f99 100644 --- a/arch/arm/src/samd2l2/chip/saml_usart.h +++ b/arch/arm/src/samd2l2/hardware/saml_usart.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_usart.h + * arch/arm/src/samd2l2/hardware/saml_usart.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USART_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USART_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USART_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USART_H /******************************************************************************************** * Included Files @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "chip/saml_sercom.h" +#include "hardware/saml_sercom.h" #ifdef CONFIG_ARCH_FAMILY_SAML21 @@ -276,4 +276,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USART_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USART_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_usb.h b/arch/arm/src/samd2l2/hardware/saml_usb.h similarity index 99% rename from arch/arm/src/samd2l2/chip/saml_usb.h rename to arch/arm/src/samd2l2/hardware/saml_usb.h index 979151efc37..77639436924 100644 --- a/arch/arm/src/samd2l2/chip/saml_usb.h +++ b/arch/arm/src/samd2l2/hardware/saml_usb.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_usb.h + * arch/arm/src/samd2l2/hardware/saml_usb.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -38,8 +38,8 @@ ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USB_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USB_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USB_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USB_H /******************************************************************************************** * Included Files @@ -633,4 +633,4 @@ struct usbhost_pipedesc_s ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_USB_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_USB_H */ diff --git a/arch/arm/src/samd2l2/chip/saml_wdt.h b/arch/arm/src/samd2l2/hardware/saml_wdt.h similarity index 97% rename from arch/arm/src/samd2l2/chip/saml_wdt.h rename to arch/arm/src/samd2l2/hardware/saml_wdt.h index c8a3c075dc8..9ec3bb9714b 100644 --- a/arch/arm/src/samd2l2/chip/saml_wdt.h +++ b/arch/arm/src/samd2l2/hardware/saml_wdt.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/arm/src/samd2l2/chip/saml_wdt.h + * arch/arm/src/samd2l2/hardware/saml_wdt.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -37,8 +37,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_WDT_H -#define __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_WDT_H +#ifndef __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_WDT_H +#define __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_WDT_H /******************************************************************************************** * Included Files @@ -162,4 +162,4 @@ ********************************************************************************************/ #endif /* CONFIG_ARCH_FAMILY_SAML21 */ -#endif /* __ARCH_ARM_SRC_SAMD2L2_CHIP_SAML_WDT_H */ +#endif /* __ARCH_ARM_SRC_SAMD2L2_HARDWARE_SAML_WDT_H */ diff --git a/arch/arm/src/samd2l2/sam_ac.h b/arch/arm/src/samd2l2/sam_ac.h index 4ff28952496..96793bb3581 100644 --- a/arch/arm/src/samd2l2/sam_ac.h +++ b/arch/arm/src/samd2l2/sam_ac.h @@ -49,9 +49,9 @@ #include "sam_port.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_ac.h" +# include "hardware/samd_ac.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_ac.h" +# include "hardware/saml_ac.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_adc.h b/arch/arm/src/samd2l2/sam_adc.h index 4d1c0c121a1..68ab6d2020e 100644 --- a/arch/arm/src/samd2l2/sam_adc.h +++ b/arch/arm/src/samd2l2/sam_adc.h @@ -49,9 +49,9 @@ #include "sam_port.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_adc.h" +# include "hardware/samd_adc.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_adc.h" +# include "hardware/saml_adc.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_dac.h b/arch/arm/src/samd2l2/sam_dac.h index 981b5777e47..be4c76e082c 100644 --- a/arch/arm/src/samd2l2/sam_dac.h +++ b/arch/arm/src/samd2l2/sam_dac.h @@ -49,9 +49,9 @@ #include "sam_port.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_dac.h" +# include "hardware/samd_dac.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_dac.h" +# include "hardware/saml_dac.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_dmac.h b/arch/arm/src/samd2l2/sam_dmac.h index 49eea2a9768..985a6f94a97 100644 --- a/arch/arm/src/samd2l2/sam_dmac.h +++ b/arch/arm/src/samd2l2/sam_dmac.h @@ -46,14 +46,14 @@ #include "chip.h" -#include "chip/sam_dmac.h" +#include "hardware/sam_dmac.h" #ifdef CONFIG_SAMD2L2_DMAC #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_dmac.h" +# include "hardware/samd_dmac.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_dmac.h" +# include "hardware/saml_dmac.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_eic.h b/arch/arm/src/samd2l2/sam_eic.h index 4b732287b90..d1cffca0828 100644 --- a/arch/arm/src/samd2l2/sam_eic.h +++ b/arch/arm/src/samd2l2/sam_eic.h @@ -49,9 +49,9 @@ #include "sam_port.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_eic.h" +# include "hardware/samd_eic.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_eic.h" +# include "hardware/saml_eic.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_evsys.h b/arch/arm/src/samd2l2/sam_evsys.h index 17f6836e164..eee072ce36c 100644 --- a/arch/arm/src/samd2l2/sam_evsys.h +++ b/arch/arm/src/samd2l2/sam_evsys.h @@ -49,9 +49,9 @@ #include "sam_port.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_evsys.h" +# include "hardware/samd_evsys.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_evsys.h" +# include "hardware/saml_evsys.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_fuses.h b/arch/arm/src/samd2l2/sam_fuses.h index 69b6fa6d5a2..327068cdcfb 100644 --- a/arch/arm/src/samd2l2/sam_fuses.h +++ b/arch/arm/src/samd2l2/sam_fuses.h @@ -45,9 +45,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_fuses.h" +# include "hardware/samd_fuses.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_fuses.h" +# include "hardware/saml_fuses.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_gclk.h b/arch/arm/src/samd2l2/sam_gclk.h index 25e0d11c6e1..6fffa73572c 100644 --- a/arch/arm/src/samd2l2/sam_gclk.h +++ b/arch/arm/src/samd2l2/sam_gclk.h @@ -48,9 +48,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_gclk.h" +# include "hardware/samd_gclk.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_gclk.h" +# include "hardware/saml_gclk.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_i2c_master.h b/arch/arm/src/samd2l2/sam_i2c_master.h index 8831f0adfc7..76637a84bbd 100644 --- a/arch/arm/src/samd2l2/sam_i2c_master.h +++ b/arch/arm/src/samd2l2/sam_i2c_master.h @@ -45,9 +45,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_i2c_master.h" +# include "hardware/samd_i2c_master.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_i2c_master.h" +# include "hardware/saml_i2c_master.h" #endif /**************************************************************************** diff --git a/arch/arm/src/samd2l2/sam_i2c_slave.h b/arch/arm/src/samd2l2/sam_i2c_slave.h index a4d2d427733..c1574305f01 100644 --- a/arch/arm/src/samd2l2/sam_i2c_slave.h +++ b/arch/arm/src/samd2l2/sam_i2c_slave.h @@ -45,9 +45,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_i2c_slave.h" +# include "hardware/samd_i2c_slave.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_i2c_slave.h" +# include "hardware/saml_i2c_slave.h" #endif /**************************************************************************** diff --git a/arch/arm/src/samd2l2/sam_pinmap.h b/arch/arm/src/samd2l2/sam_pinmap.h index b9d380e9ccb..819b5fa36de 100644 --- a/arch/arm/src/samd2l2/sam_pinmap.h +++ b/arch/arm/src/samd2l2/sam_pinmap.h @@ -43,11 +43,11 @@ #include #if defined(CONFIG_ARCH_FAMILY_SAMD20) -# include "chip/samd20_pinmap.h" +# include "hardware/samd20_pinmap.h" #elif defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd21_pinmap.h" +# include "hardware/samd21_pinmap.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml21_pinmap.h" +# include "hardware/saml21_pinmap.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_pm.h b/arch/arm/src/samd2l2/sam_pm.h index 829318c07af..dd3a29e8611 100644 --- a/arch/arm/src/samd2l2/sam_pm.h +++ b/arch/arm/src/samd2l2/sam_pm.h @@ -45,9 +45,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_pm.h" +# include "hardware/samd_pm.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_pm.h" +# include "hardware/saml_pm.h" #endif /**************************************************************************** diff --git a/arch/arm/src/samd2l2/sam_port.h b/arch/arm/src/samd2l2/sam_port.h index 2510b8c52da..defc45c16a1 100644 --- a/arch/arm/src/samd2l2/sam_port.h +++ b/arch/arm/src/samd2l2/sam_port.h @@ -52,9 +52,9 @@ #include "chip.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_port.h" +# include "hardware/samd_port.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_port.h" +# include "hardware/saml_port.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_sercom.h b/arch/arm/src/samd2l2/sam_sercom.h index 24fefa2e17e..01ae4d94ba7 100644 --- a/arch/arm/src/samd2l2/sam_sercom.h +++ b/arch/arm/src/samd2l2/sam_sercom.h @@ -49,9 +49,9 @@ #include "sam_periphclks.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_sercom.h" +# include "hardware/samd_sercom.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_sercom.h" +# include "hardware/saml_sercom.h" #else # error Unrecognized SAMD/L architecture #endif diff --git a/arch/arm/src/samd2l2/sam_spi.h b/arch/arm/src/samd2l2/sam_spi.h index 9a19bd7c5ae..3af38668fe8 100644 --- a/arch/arm/src/samd2l2/sam_spi.h +++ b/arch/arm/src/samd2l2/sam_spi.h @@ -48,9 +48,9 @@ #include "sam_config.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_spi.h" +# include "hardware/samd_spi.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_spi.h" +# include "hardware/saml_spi.h" #endif #ifdef SAMD2L2_HAVE_SPI diff --git a/arch/arm/src/samd2l2/sam_usart.h b/arch/arm/src/samd2l2/sam_usart.h index 71dc436d8a4..ebabab88ba8 100644 --- a/arch/arm/src/samd2l2/sam_usart.h +++ b/arch/arm/src/samd2l2/sam_usart.h @@ -50,9 +50,9 @@ #include "up_arch.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) -# include "chip/samd_usart.h" +# include "hardware/samd_usart.h" #elif defined(CONFIG_ARCH_FAMILY_SAML21) -# include "chip/saml_usart.h" +# include "hardware/saml_usart.h" #endif #include "sam_config.h" diff --git a/arch/arm/src/samd2l2/sam_usb.h b/arch/arm/src/samd2l2/sam_usb.h index c6c54c33d2b..9fdc48809f9 100644 --- a/arch/arm/src/samd2l2/sam_usb.h +++ b/arch/arm/src/samd2l2/sam_usb.h @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "chip/saml_usb.h" +#include "hardware/saml_usb.h" /***************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/samd2l2/samd_clockconfig.c b/arch/arm/src/samd2l2/samd_clockconfig.c index c6607dc1c77..3056334f7e3 100644 --- a/arch/arm/src/samd2l2/samd_clockconfig.c +++ b/arch/arm/src/samd2l2/samd_clockconfig.c @@ -56,10 +56,10 @@ #include "up_arch.h" -#include "chip/samd_pm.h" -#include "chip/samd_sysctrl.h" -#include "chip/samd_gclk.h" -#include "chip/samd_nvmctrl.h" +#include "hardware/samd_pm.h" +#include "hardware/samd_sysctrl.h" +#include "hardware/samd_gclk.h" +#include "hardware/samd_nvmctrl.h" #include "sam_fuses.h" #include "sam_gclk.h" diff --git a/arch/arm/src/samd2l2/samd_periphclks.h b/arch/arm/src/samd2l2/samd_periphclks.h index 6faefbb6135..69226e0d332 100644 --- a/arch/arm/src/samd2l2/samd_periphclks.h +++ b/arch/arm/src/samd2l2/samd_periphclks.h @@ -42,7 +42,7 @@ #include -#include "chip/samd_pm.h" +#include "hardware/samd_pm.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) diff --git a/arch/arm/src/samd2l2/saml_clockconfig.c b/arch/arm/src/samd2l2/saml_clockconfig.c index c75521ebd78..2d26c7c53c9 100644 --- a/arch/arm/src/samd2l2/saml_clockconfig.c +++ b/arch/arm/src/samd2l2/saml_clockconfig.c @@ -56,12 +56,12 @@ #include "up_arch.h" -#include "chip/saml_pm.h" -#include "chip/saml_supc.h" -#include "chip/saml_oscctrl.h" -#include "chip/saml_osc32kctrl.h" -#include "chip/saml_gclk.h" -#include "chip/saml_nvmctrl.h" +#include "hardware/saml_pm.h" +#include "hardware/saml_supc.h" +#include "hardware/saml_oscctrl.h" +#include "hardware/saml_osc32kctrl.h" +#include "hardware/saml_gclk.h" +#include "hardware/saml_nvmctrl.h" #include "sam_gclk.h" #include diff --git a/arch/arm/src/samd2l2/saml_periphclks.h b/arch/arm/src/samd2l2/saml_periphclks.h index 3e223305719..62b9aace1ee 100644 --- a/arch/arm/src/samd2l2/saml_periphclks.h +++ b/arch/arm/src/samd2l2/saml_periphclks.h @@ -42,7 +42,7 @@ #include -#include "chip/saml_mclk.h" +#include "hardware/saml_mclk.h" #ifdef CONFIG_ARCH_FAMILY_SAML21