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

arch/arm/src/samv7/chip.h

@@ -48,7 +48,7 @@
 
 #include <arch/irq.h>
 #include <arch/samv7/chip.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /* If the common ARMv7-M vector handling logic is used, then it expects
  * the following definition in this file that provides the number of

arch/arm/src/samv7/hardware/sam_afec.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_afec.h
+ * arch/arm/src/samv7/hardware/sam_afec.h
  * Analog-Front-End Controller (AFEC) definitions for the SAMV71
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_AFEC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_AFEC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_AFEC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_AFEC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -567,4 +567,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_AFEC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_AFEC_H */

arch/arm/src/samv7/hardware/sam_chipid.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_chipid.h
+ * arch/arm/src/samv7/hardware/sam_chipid.h
  * CHIPID Register Definitions for the SAMV7
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_CHIPID_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_CHIPID_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_CHIPID_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_CHIPID_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -183,4 +183,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_CHIPID_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_CHIPID_H */

arch/arm/src/samv7/hardware/sam_dacc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_dacc.h
+ * arch/arm/src/samv7/hardware/sam_dacc.h
  * Digital-to-Analog Converter Controller (DACC) for the SAMV7
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_DACC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_DACC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_DACC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_DACC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -223,4 +223,4 @@
 #define DACC_WPSR_WPVSRC_SHIFT      (8)
 #define DACC_WPSR_WPVSRC_MASK       (0xffu << DACC_WPSR_WPVSRC_SHIFT) /* Write Protection Violation Source */
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_DACC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_DACC_H */

arch/arm/src/samv7/hardware/sam_eefc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_eefc.h
+ * arch/arm/src/samv7/hardware/sam_eefc.h
  * Enhanced Embedded Flash Controller (EEFC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EEFC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EEFC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EEFC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EEFC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -163,4 +163,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EEFC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EEFC_H */

arch/arm/src/samv7/hardware/sam_emac.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_emac.h
+ * arch/arm/src/samv7/hardware/sam_emac.h
  * This is the form of the EMAC interface used the SAMV7.
  * This is referred as GMAC in the documentation even though it does not support
  * Gibabit Ethernet.
@@ -36,8 +36,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EMAC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EMAC_H
 
 /************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NEMAC > 0
 
@@ -1043,4 +1043,4 @@ struct emac_txdesc_s
 };
 
 #endif /* SAMV7_NEMAC > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_EMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_EMAC_H */

arch/arm/src/samv7/hardware/sam_hsmci.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_hsmci.h
+ * arch/arm/src/samv7/hardware/sam_hsmci.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_HSMCI_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_HSMCI_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NHSMCI4 > 0
 
@@ -363,4 +363,4 @@
  ****************************************************************************************/
 
 #endif /* SAMV7_NHSMCI4 > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_HSMCI_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_HSMCI_H */

arch/arm/src/samv7/hardware/sam_matrix.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_matrix.h
+ * arch/arm/src/samv7/hardware/sam_matrix.h
  * Bux matrix definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MATRIX_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MATRIX_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MATRIX_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MATRIX_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -332,4 +332,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MATRIX_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MATRIX_H */

arch/arm/src/samv7/hardware/sam_mcan.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_mcan.h
+ * arch/arm/src/samv7/hardware/sam_mcan.h
  * Controller Area Network (MCAN) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MCAN_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MCAN_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MCAN_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MCAN_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -810,4 +810,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MCAN_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MCAN_H */

arch/arm/src/samv7/hardware/sam_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_memorymap.h
+ * arch/arm/src/samv7/hardware/sam_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -43,11 +43,11 @@
 #include <nuttx/config.h>
 
 #if defined(CONFIG_ARCH_CHIP_SAMV71)
-#  include "chip/samv71_memorymap.h"
+#  include "hardware/samv71_memorymap.h"
 #elif defined(CONFIG_ARCH_CHIP_SAME70)
-#  include "chip/same70_memorymap.h"
+#  include "hardware/same70_memorymap.h"
 #else
 #  error Unrecognized SAMV7 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_MEMORYMAP_H */

arch/arm/src/samv7/hardware/sam_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_pinmap.h
+ * arch/arm/src/samv7/hardware/sam_pinmap.h
  *
  *   Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PINMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PINMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -43,12 +43,12 @@
 #include <nuttx/config.h>
 
 #if defined(CONFIG_ARCH_CHIP_SAMV71)
-#  include "chip/samv71_pinmap.h"
+#  include "hardware/samv71_pinmap.h"
 #elif defined(CONFIG_ARCH_CHIP_SAME70)
-#  include "chip/same70_pinmap.h"
+#  include "hardware/same70_pinmap.h"
 #else
 #  error Unrecognized SAMV7 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PINMAP_H */
 

arch/arm/src/samv7/hardware/sam_pio.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam4e_pio.h
+ * arch/arm/src/samv7/hardware/sam4e_pio.h
  * Parallel Input/Output (PIO) Controller definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM4E_PIO_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM4E_PIO_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NPIO > 0
 
@@ -591,4 +591,4 @@
  ****************************************************************************************/
 
 #endif /* SAMV7_NPIO > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM4E_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4E_PIO_H */

arch/arm/src/samv7/hardware/sam_pmc.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/samv7/chip/sam_pmc.h
+ * arch/arm/src/samv7/hardware/sam_pmc.h
  * Power Management Controller (PMC) for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PMC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PMC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PMC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PMC_H
 
 /********************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -463,4 +463,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_PMC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_PMC_H */

arch/arm/src/samv7/hardware/sam_qspi.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_qspi.h
+ * arch/arm/src/samv7/hardware/sam_qspi.h
  * Quad SPI (QSPI) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_QSPI_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_QSPI_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_QSPI_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_QSPI_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NQSPI > 0
 
@@ -271,4 +271,4 @@
  ****************************************************************************************/
 
 #endif /* SAMV7_NQSPI > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_QSPI_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_QSPI_H */

arch/arm/src/samv7/hardware/sam_rstc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv71/chip/sam_rstc.h
+ * arch/arm/src/samv7/hardware/sam_rstc.h
  * Reset Controller (RSTC) definitions for the SAMV71
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RSTC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RSTC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RSTC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RSTC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -107,4 +107,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RSTC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RSTC_H */

arch/arm/src/samv7/hardware/sam_rtc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_rtc.h
+ * arch/arm/src/samv7/hardware/sam_rtc.h
  * Real-time Clock (RTC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RTC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RTC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RTC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RTC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -267,4 +267,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_RTC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_RTC_H */

arch/arm/src/samv7/hardware/sam_sdramc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_sdramc.h
+ * arch/arm/src/samv7/hardware/sam_sdramc.h
  * SDRAM Controler (SDRAMC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SDRAMC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SDRAMC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SDRAMC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SDRAMC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -204,4 +204,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SDRAMC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SDRAMC_H */

arch/arm/src/samv7/hardware/sam_smc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/ssamv7/chip/sam_smc.h
+ * arch/arm/src/samv7/hardware/sam_smc.h
  * Static Memory Controller (SMC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SMC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SMC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SMC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SMC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -210,4 +210,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SMC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SMC_H */

arch/arm/src/samv7/hardware/sam_spi.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_spi.h
+ * arch/arm/src/samv7/hardware/sam_spi.h
  * Serial Peripheral Interface (SPI) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SPI_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SPI_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NSPI > 0
 
@@ -229,4 +229,4 @@
  ****************************************************************************************/
 
 #endif /* SAMV7_NSPI > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SPI_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SPI_H */

arch/arm/src/samv7/hardware/sam_ssc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_ssc.h
+ * arch/arm/src/samv7/hardware/sam_ssc.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SSC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SSC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SSC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SSC_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NSSC > 0
 
@@ -315,4 +315,4 @@
 #define SSC_WPSR_WPVSRC_MASK       (0xffff << SSC_WPSR_WPVSRC_SHIFT)
 
 #endif /* SAMV7_NSSC > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SSC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SSC_H */

arch/arm/src/samv7/hardware/sam_supc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_supc.h
+ * arch/arm/src/samv7/hardware/sam_supc.h
  * Supply Controller (SUPC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SUPC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SUPC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SUPC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SUPC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -182,4 +182,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SUPC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SUPC_H */

arch/arm/src/samv7/hardware/sam_sysc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_sysc.h
+ * arch/arm/src/samv7/hardware/sam_sysc.h
  * Supply Controller (SYSC) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SYSC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SYSC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SYSC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SYSC_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -78,4 +78,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_SYSC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_SYSC_H */

arch/arm/src/samv7/hardware/sam_tc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_tc.h
+ * arch/arm/src/samv7/hardware/sam_tc.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -638,4 +638,4 @@
 #define TC_WPMR_WPKEY_MASK       (0xffffff << TC_WPMR_WPKEY_SHIFT)
 #  define TC_WPMR_WPKEY          (0x54494d << TC_WPMR_WPKEY_SHIFT) /* "TIM" in ASCII */
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TC_H */

arch/arm/src/samv7/hardware/sam_trng.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_trng.h
+ * arch/arm/src/samv7/hardware/sam_trng.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TRNG_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TRNG_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TRNG_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TRNG_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -82,4 +82,4 @@
 
 /* Output Data Register (32-bit output data) */
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TRNG_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TRNG_H */

arch/arm/src/samv7/hardware/sam_twihs.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_twihs.h
+ * arch/arm/src/samv7/hardware/sam_twihs.h
  * Two-wire Interface (TWIHS) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TWIHS_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TWIHS_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TWIHS_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TWIHS_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #if SAMV7_NTWIHS > 0
 
@@ -303,4 +303,4 @@
  ****************************************************************************************/
 
 #endif /* SAMV7_NTWIHS > 0 */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_TWIHS_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_TWIHS_H */

arch/arm/src/samv7/hardware/sam_uart.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/samv7/chip/sam_uart.h
+ * arch/arm/src/samv7/hardware/sam_uart.h
  * Universal Asynchronous Receiver Transmitter (UART) and Universal Synchronous Asynchronous
  * Receiver Transmitter (USART) definitions for the SAMV71.
  *
@@ -35,8 +35,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UART_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UART_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UART_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UART_H
 
 /************************************************************************************************
  * Included Files
@@ -45,7 +45,7 @@
 #include <nuttx/config.h>
 
 #include "arch/samv7/chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************************
  * Pre-processor Definitions
@@ -571,4 +571,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UART_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UART_H */

arch/arm/src/samv7/hardware/sam_usbhs.h

@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * arch/arm/src/samv7/chip/sam_usbhs.h
+ * arch/arm/src/samv7/hardware/sam_usbhs.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -36,8 +36,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_USBHS_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_USBHS_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_USBHS_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_USBHS_H
 
 /************************************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************************************
  * Pre-processor Definitions
@@ -802,4 +802,4 @@ struct usbhs_dtd_s
  * Public Functions
  ************************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_USBHS_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_USBHS_H */

arch/arm/src/samv7/hardware/sam_utmi.h

@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * arch/arm/src/samv7/chip/sam_utmi.h
+ * arch/arm/src/samv7/hardware/sam_utmi.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -36,8 +36,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UTMI_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UTMI_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UTMI_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UTMI_H
 
 /************************************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************************************
  * Pre-processor Definitions
@@ -89,4 +89,4 @@
  * Public Functions
  ************************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_UTMI_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_UTMI_H */

arch/arm/src/samv7/hardware/sam_wdt.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/samv7/chip/sam_wdt.h
+ * arch/arm/src/samv7/hardware/sam_wdt.h
  * Watchdog Timer (WDT) definitions for the SAMV71
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_WDT_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_WDT_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_WDT_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_WDT_H
 
 /****************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -114,4 +114,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_WDT_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_WDT_H */

arch/arm/src/samv7/hardware/sam_xdmac.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/sam_xdmac.h
+ * arch/arm/src/samv7/hardware/sam_xdmac.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAM_XDMAC_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAM_XDMAC_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_XDMAC_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_XDMAC_H
 
 /************************************************************************************
  * Included Files
@@ -460,4 +460,4 @@ struct chnext_view3_s
   uint32_t cdus; /* Destination Microblock Stride */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM_XDMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM_XDMAC_H */

arch/arm/src/samv7/hardware/same70_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/samv7/chip/same70_memorymap.h
+ * arch/arm/src/samv7/hardware/same70_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAME70_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAME70_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAME70_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAME70_MEMORYMAP_H
 
 /************************************************************************************************
  * Included Files
@@ -198,4 +198,4 @@ extern "C"
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM4S_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4S_MEMORYMAP_H */

arch/arm/src/samv7/hardware/same70_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/same70_pinmap.h
+ * arch/arm/src/samv7/hardware/same70_pinmap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAME70_PINMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAME70_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAME70_PINMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAME70_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -567,4 +567,4 @@ extern "C"
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAME70_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAME70_PINMAP_H */

arch/arm/src/samv7/hardware/samv71_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/samv7/chip/samv71_memorymap.h
+ * arch/arm/src/samv7/hardware/samv71_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAMV71_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAMV71_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAMV71_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAMV71_MEMORYMAP_H
 
 /************************************************************************************************
  * Included Files
@@ -198,4 +198,4 @@ extern "C"
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAM4S_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAM4S_MEMORYMAP_H */

arch/arm/src/samv7/hardware/samv71_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/samv7/chip/samv71_pinmap.h
+ * arch/arm/src/samv7/hardware/samv71_pinmap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMV7_CHIP_SAMV71_PINMAP_H
-#define __ARCH_ARM_SRC_SAMV7_CHIP_SAMV71_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMV7_HARDWARE_SAMV71_PINMAP_H
+#define __ARCH_ARM_SRC_SAMV7_HARDWARE_SAMV71_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -573,4 +573,4 @@ extern "C"
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_SAMV7_CHIP_SAMV71_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMV7_HARDWARE_SAMV71_PINMAP_H */

arch/arm/src/samv7/sam_clockconfig.c

@@ -49,12 +49,12 @@
 #include "up_internal.h"
 
 #include "sam_clockconfig.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_eefc.h"
-#include "chip/sam_wdt.h"
-#include "chip/sam_supc.h"
-#include "chip/sam_matrix.h"
-#include "chip/sam_utmi.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_eefc.h"
+#include "hardware/sam_wdt.h"
+#include "hardware/sam_supc.h"
+#include "hardware/sam_matrix.h"
+#include "hardware/sam_utmi.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/samv7/sam_dac.c

@@ -55,9 +55,9 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/sam_dacc.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_dacc.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_pinmap.h"
 
 #include "sam_gpio.h"
 #include "sam_xdmac.h"

arch/arm/src/samv7/sam_dac.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/analog/dac.h>
-#include "chip/sam_dacc.h"
+#include "hardware/sam_dacc.h"
 
 #if defined(CONFIG_SAMV7_DAC0) || defined(CONFIG_SAMV7_DAC1)
 

arch/arm/src/samv7/sam_emac.c

@@ -84,8 +84,8 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/sam_pinmap.h"
-#include "chip/sam_chipid.h"
+#include "hardware/sam_pinmap.h"
+#include "hardware/sam_chipid.h"
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
 #include "sam_ethernet.h"

arch/arm/src/samv7/sam_ethernet.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <arch/samv7/chip.h>
 
-#include "chip/sam_emac.h"
+#include "hardware/sam_emac.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/samv7/sam_gpio.c

@@ -53,8 +53,8 @@
 #include "up_arch.h"
 
 #include "sam_gpio.h"
-#include "chip/sam_pio.h"
-#include "chip/sam_matrix.h"
+#include "hardware/sam_pio.h"
+#include "hardware/sam_matrix.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/samv7/sam_gpioirq.c

@@ -55,8 +55,8 @@
 
 #include "sam_gpio.h"
 #include "sam_periphclks.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_pio.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_pio.h"
 
 #ifdef CONFIG_SAMV7_GPIO_IRQ
 

arch/arm/src/samv7/sam_hsmci.c

@@ -65,10 +65,10 @@
 #include "sam_xdmac.h"
 #include "sam_periphclks.h"
 #include "sam_hsmci.h"
-#include "chip/sam_xdmac.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_hsmci.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_xdmac.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_hsmci.h"
+#include "hardware/sam_pinmap.h"
 
 #ifdef CONFIG_SAMV7_HSMCI
 

arch/arm/src/samv7/sam_hsmci_clkdiv.c

@@ -48,7 +48,7 @@
 #include <arch/board/board.h>
 
 #include "chip.h"
-#include "chip/sam_hsmci.h"
+#include "hardware/sam_hsmci.h"
 #include "sam_hsmci.h"
 
 #ifdef CONFIG_SAMV7_HSMCI0

arch/arm/src/samv7/sam_lowputc.c

@@ -52,9 +52,9 @@
 #include "sam_periphclks.h"
 #include "sam_lowputc.h"
 
-#include "chip/sam_uart.h"
-#include "chip/sam_pinmap.h"
-#include "chip/sam_matrix.h"
+#include "hardware/sam_uart.h"
+#include "hardware/sam_pinmap.h"
+#include "hardware/sam_matrix.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/samv7/sam_mcan.c

@@ -61,8 +61,8 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/sam_matrix.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_matrix.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_periphclks.h"
 #include "sam_gpio.h"
 #include "sam_mcan.h"

arch/arm/src/samv7/sam_mcan.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_mcan.h"
+#include "hardware/sam_mcan.h"
 
 #include <nuttx/can/can.h>
 

arch/arm/src/samv7/sam_mpuinit.c

@@ -46,7 +46,7 @@
 #include "mpu.h"
 #include "barriers.h"
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #include "sam_mpuinit.h"
 

arch/arm/src/samv7/sam_pck.c

@@ -45,7 +45,7 @@
 
 #include <arch/board/board.h>
 
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 
 #include "up_arch.h"
 #include "sam_gpio.h"

arch/arm/src/samv7/sam_pck.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_pmc.h"
+#include "hardware/sam_pmc.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/samv7/sam_progmem.c

@@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "barriers.h"
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 #include "sam_progmem.h"