Rename arch/arm/src/samd2l2/chip to arch/arm/src/samd2l2/hardware.

2026-06-06 16:50:55 +08:00 · 2019-05-25 08:06:46 -06:00
parent d3679df0cc
commit 2ebc21b005
74 changed files with 266 additions and 266 deletions
@@ -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
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <matt@extent3d.com>
@@ -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 */
@@ -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 <alexvasiljev@gmail.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <matt@extent3d.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <matt@extent3d.com>
@@ -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 */
@@ -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 <matt@extent3d.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <alexvasiljev@gmail.com>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 <nuttx/config.h>

 #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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
@@ -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 <gnutt@nuttx.org>
@@ -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 */
--- a/Show More
+++ b/Show More