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

arch/arm/src/sama5/chip.h

@@ -46,7 +46,7 @@
 #  include <arch/sama5/chip.h>
 #endif
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/_sama5d2x_memorymap.h
+ * arch/arm/src/sama5/hardware/_sama5d2x_memorymap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -884,4 +884,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_MEMORYMAP_H */

arch/arm/src/sama5/hardware/_sama5d2x_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d2x_pinmap.h
+ * arch/arm/src/sama5/hardware/_sama5d2x_pinmap.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PINMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PINMAP_H
 
 /************************************************************************************************************
  * Included Files
@@ -801,4 +801,4 @@
 #define PIO_UTMI_RXERR       (PIO_PERIPHC | PIO_CFG_DEFAULT | PIO_PORT_PIOD | PIO_PIN8)
 #define PIO_UTMI_RXVAL       (PIO_PERIPHC | PIO_CFG_DEFAULT | PIO_PORT_PIOD | PIO_PIN7)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PINMAP_H */

arch/arm/src/sama5/hardware/_sama5d2x_pio.h

@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PIO_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PIO_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
@@ -334,4 +334,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D2X_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D2X_PIO_H */

arch/arm/src/sama5/hardware/_sama5d3x4x_pio.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d3x4x_pio.h
+ * arch/arm/src/sama5/hardware/_sama5d3x4x_pio.h
  * Parallel Input/Output (PIO) Controller definitions for the SAMA5D3x and SAMA5D4x
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3DX4X_PIO_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3DX4X_PIO_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
@@ -645,4 +645,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3DX4X_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3DX4X_PIO_H */

arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/_sama5d3x_memorymap.h
+ * arch/arm/src/sama5/hardware/_sama5d3x_memorymap.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -808,4 +808,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MEMORYMAP_H */

arch/arm/src/sama5/hardware/_sama5d3x_mpddrc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d3x_mpddrc.h
+ * arch/arm/src/sama5/hardware/_sama5d3x_mpddrc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MPDDRC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MPDDRC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -402,4 +402,4 @@
 #define MPDDRC_WPSR_WPVSRC_SHIFT        (8)       /* Bits 8-23: Write Protection Violation Source */
 #define MPDDRC_WPSR_WPVSRC_MASK         (0xffff << MPDDRC_WPSR_WPVSRC_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_MPDDRC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_MPDDRC_H */

arch/arm/src/sama5/hardware/_sama5d3x_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d3x_pinmap.h
+ * arch/arm/src/sama5/hardware/_sama5d3x_pinmap.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_PINMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_PINMAP_H
 
 /************************************************************************************************************
  * Included Files
@@ -410,4 +410,4 @@
 #define PIO_USART3_SCK    (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN15) /* Type: EBI */
 #define PIO_USART3_TXD    (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN19) /* Type: EBI */
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D3X_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D3X_PINMAP_H */

arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/_sama5d4x_memorymap.h
+ * arch/arm/src/sama5/hardware/_sama5d4x_memorymap.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -802,4 +802,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MEMORYMAP_H */

arch/arm/src/sama5/hardware/_sama5d4x_mpddrc.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d4x_mpddrc.h
+ * arch/arm/src/sama5/hardware/_sama5d4x_mpddrc.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MPDDRC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MPDDRC_H
 
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -687,4 +687,4 @@
 #define MPDDRC_DLL_SAD_ADDCNT_MASK           (0xff < MPDDRC_DLL_SAD_ADDCNT_SHIFT)
 #  define MPDDRC_DLL_SAD_ADDCNT(n)           ((uint32_t)(n) < MPDDRC_DLL_SAD_ADDCNT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_MPDDRC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_MPDDRC_H */

arch/arm/src/sama5/hardware/_sama5d4x_pinmap.h

@@ -1,5 +1,5 @@
 /************************************************************************************************************
- * arch/arm/src/sama5/chip/_sama5d4x_pinmap.h
+ * arch/arm/src/sama5/hardware/_sama5d4x_pinmap.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_PINMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_PINMAP_H
 
 /************************************************************************************************************
  * Included Files
@@ -473,4 +473,4 @@
 #define PIO_USART4_SCK    (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN25)
 #define PIO_USART4_TXD    (PIO_PERIPHB | PIO_CFG_DEFAULT | PIO_PORT_PIOE | PIO_PIN27)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP__SAMA5D4X_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE__SAMA5D4X_PINMAP_H */

arch/arm/src/sama5/hardware/sam_adc.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_adc.h
+ * arch/arm/src/sama5/hardware/sam_adc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ADC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ADC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ADC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ADC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -603,4 +603,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ADC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ADC_H */

arch/arm/src/sama5/hardware/sam_aic.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_aic.h
+ * arch/arm/src/sama5/hardware/sam_aic.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AIC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AIC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AIC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AIC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -231,4 +231,4 @@
 #define AIC_WPSR_WPVSRC_SHIFT  (8)       /* Bits 8-23: Write Protect Violation Source */
 #define AIC_WPSR_WPVSRC_MASK   (0x0000ffff << AIC_WPSR_WPVSRC_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AIC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AIC_H */

arch/arm/src/sama5/hardware/sam_aximx.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_aximx.h
+ * arch/arm/src/sama5/hardware/sam_aximx.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AXIMX_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AXIMX_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AXIMX_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AXIMX_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include <arch/sama5/chip.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -73,4 +73,4 @@
 #  define AXIMX_REMAP_REMAP1   (1 << 1) /* Remap State 1 */
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_AXIMX_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_AXIMX_H */

arch/arm/src/sama5/hardware/sam_bsc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_bsc.h
+ * arch/arm/src/sama5/hardware/sam_bsc.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_BSC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_BSC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_BSC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_BSC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -64,4 +64,4 @@
 #define BSC_CR_BOOTKEY_MASK  (0xffff << BSC_CR_BOOTKEY_SHIFT)
 #  define BSC_CR_BOOTKEY     (0x6683 << BSC_CR_BOOTKEY_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_BSC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_BSC_H */

arch/arm/src/sama5/hardware/sam_can.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_can.h
+ * arch/arm/src/sama5/hardware/sam_can.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_CAN_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_CAN_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_CAN_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_CAN_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -374,4 +374,4 @@
 #define CAN_MCR_MACR             (1 << 22) /* Bit 22: Abort Request for Mailbox n */
 #define CAN_MCR_MTCR             (1 << 23) /* Bit 23: Mailbox Transfer Command */
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_CAN_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_CAN_H */

arch/arm/src/sama5/hardware/sam_dbgu.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sama5/chip/sam3u_uart.h
+ * arch/arm/src/sama5/hardware/sam3u_uart.h
  * Debug Unit (DBGU) definitions for the SAMA5D3
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DBGU_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DBGU_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DBGU_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DBGU_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
@@ -264,4 +264,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DBGU_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DBGU_H */

arch/arm/src/sama5/hardware/sam_dmac.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_dmac.h
+ * arch/arm/src/sama5/hardware/sam_dmac.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DMAC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DMAC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DMAC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DMAC_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -839,4 +839,4 @@ struct dma_crc16_linklist_s
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_DMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_DMAC_H */

arch/arm/src/sama5/hardware/sam_ehci.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sama5/chip/sam_ehci.h
+ * arch/arm/src/sama5/hardware/sam_ehci.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EHCI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EHCI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EHCI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EHCI_H
 
 /****************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/usb/ohci.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -93,4 +93,4 @@
  * Public Functions
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EHCI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EHCI_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_emac.h
+ * arch/arm/src/sama5/hardware/sam_emac.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMAC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMAC_H
 
 /************************************************************************************
  * Included Files
@@ -50,9 +50,9 @@
  */
 
 #if defined(CONFIG_SAMA5_EMACA)
-#  include "chip/sam_emaca.h"
+#  include "hardware/sam_emaca.h"
 #elif defined(CONFIG_SAMA5_EMACB)
-#  include "chip/sam_emacb.h"
+#  include "hardware/sam_emacb.h"
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMAC_H */

arch/arm/src/sama5/hardware/sam_emaca.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_emaca.h
+ * arch/arm/src/sama5/hardware/sam_emaca.h
  * This is the form of the EMAC interface used the SAMA5D3
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,15 +34,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACA_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACA_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -454,4 +454,4 @@ struct emac_txdesc_s
   uint32_t status;   /* TX status and controls */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACA_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACA_H */

arch/arm/src/sama5/hardware/sam_emacb.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_emacb.h
+ * arch/arm/src/sama5/hardware/sam_emacb.h
  * This is the form of the EMAC interface used the SAMA5D4 (and also the SAM43).
  * This is referred as GMAC in the documentation even though it does not support
  * Gibabit Ethernet.
@@ -36,15 +36,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACB_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACB_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -789,4 +789,4 @@ struct emac_txdesc_s
   uint32_t status;   /* TX status and controls */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_EMACB_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_EMACB_H */

arch/arm/src/sama5/hardware/sam_flexcom.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_flexcom.h
+ * arch/arm/src/sama5/hardware/sam_flexcom.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -114,14 +114,14 @@
 
 /* Flexcom USART Register Definitions ***********************************************/
 
-#include "chip/sam_flexcom_usart.h"
+#include "hardware/sam_flexcom_usart.h"
 
 /* Flexcom SPI Register Definitions *************************************************/
 
-#include "chip/sam_flexcom_spi.h"
+#include "hardware/sam_flexcom_spi.h"
 
 /* Flexcom TWI Register Definitions *************************************************/
 
-#include "chip/sam_flexcom_twi.h"
+#include "hardware/sam_flexcom_twi.h"
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_H */

arch/arm/src/sama5/hardware/sam_flexcom_spi.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_flexcom_spi.h
+ * arch/arm/src/sama5/hardware/sam_flexcom_spi.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_SPI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_SPI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_SPI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -55,4 +55,4 @@
 
 /* Flexcom SPI Register Bit Field Definitions ***************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_SPI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_SPI_H */

arch/arm/src/sama5/hardware/sam_flexcom_twi.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_flexcom_twi.h
+ * arch/arm/src/sama5/hardware/sam_flexcom_twi.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_TWI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_TWI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_TWI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_TWI_H
 
 /************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -55,4 +55,4 @@
 
 /* Flexcom TWI Register Bit Field Definitions ***************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_TWI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_TWI_H */

arch/arm/src/sama5/hardware/sam_flexcom_usart.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sama5/chip/sam3u_uart.h
+ * arch/arm/src/sama5/hardware/sam3u_uart.h
  * Universal Synchronous Asynchronous Receiver Transmitter (FLEXUS) definitions for the SAMA5D2
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_FLEXUS_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_FLEXUS_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_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
@@ -577,4 +577,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_FLEXCOM_FLEXUS_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_FLEXCOM_FLEXUS_H */

arch/arm/src/sama5/hardware/sam_gmac.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_gmac.h
+ * arch/arm/src/sama5/hardware/sam_gmac.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GMAC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GMAC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -1011,4 +1011,4 @@ struct gmac_txdesc_s
   uint32_t status;   /* TX status and controls */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GMAC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GMAC_H */

arch/arm/src/sama5/hardware/sam_gpbr.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_gpbr.h
+ * arch/arm/src/sama5/hardware/sam_gpbr.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GPBR_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GPBR_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GPBR_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GPBR_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -65,4 +65,4 @@
 /* GPBR Register Bit Definitions ****************************************************/
 /* All GPBR registers hold user-defined, 32-bit values */
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_GPBR_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_GPBR_H */

arch/arm/src/sama5/hardware/sam_hsmc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_hsmc.h
+ * arch/arm/src/sama5/hardware/sam_hsmc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -637,4 +637,4 @@
 #define NFCDATA_ADDT_CYCLE4_MASK      (0xff << NFCDATA_ADDT_CYCLE4_SHIFT)
 #  define NFCDATA_ADDT_CYCLE4(n)      ((uint32_t)(n) << NFCDATA_ADDT_CYCLE4_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMC_H */

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

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_hsmci.h
+ * arch/arm/src/sama5/hardware/sam_hsmci.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMCI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMCI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMCI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMCI_H
 
 /****************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************************
  * Pre-processor Definitions
@@ -373,4 +373,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_HSMCI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_HSMCI_H */

arch/arm/src/sama5/hardware/sam_isi.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_isi.h
+ * arch/arm/src/sama5/hardware/sam_isi.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ISI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ISI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ISI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ISI_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -341,4 +341,4 @@ struct isi_dscr_s
   uint32_t dscr;  /* Next descriptor address */
 };
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_ISI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_ISI_H */

arch/arm/src/sama5/hardware/sam_lcdc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_lcdc.h
+ * arch/arm/src/sama5/hardware/sam_lcdc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_LCDC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_LCDC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_LCDC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_LCDC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -1993,4 +1993,4 @@ struct sam_dscr_s
 };
 #define SIZEOF_SAM_DSCR_S 16
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_LCDC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_LCDC_H */

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

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_matrix.h
+ * arch/arm/src/sama5/hardware/sam_matrix.h
  * Bux matrix definitions for the SAMA5
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MATRIX_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MATRIX_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MATRIX_H
+#define __ARCH_ARM_SRC_SAMA5_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
@@ -1006,4 +1006,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MATRIX_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MATRIX_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_memorymap.h
+ * arch/arm/src/sama5/hardware/sam_memorymap.h
  *
  *   Copyright (C) 2013-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MEMORYMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MEMORYMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -44,13 +44,13 @@
 #include <arch/sama5/chip.h>
 
 #if defined(ATSAMA5D2)
-#  include "chip/_sama5d2x_memorymap.h"
+#  include "hardware/_sama5d2x_memorymap.h"
 #elif defined(ATSAMA5D3)
-#  include "chip/_sama5d3x_memorymap.h"
+#  include "hardware/_sama5d3x_memorymap.h"
 #elif defined(ATSAMA5D4)
-#  include "chip/_sama5d4x_memorymap.h"
+#  include "hardware/_sama5d4x_memorymap.h"
 #else
 #  error Unrecognized SAMA5 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MEMORYMAP_H */

arch/arm/src/sama5/hardware/sam_mpddrc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_mpddrc.h
+ * arch/arm/src/sama5/hardware/sam_mpddrc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MPDDRC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MPDDRC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MPDDRC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MPDDRC_H
 
 /************************************************************************************
  * Included Files
@@ -44,11 +44,11 @@
 #include <arch/sama5/chip.h>
 
 #if defined(ATSAMA5D3)
-#  include "chip/_sama5d3x_mpddrc.h"
+#  include "hardware/_sama5d3x_mpddrc.h"
 #elif defined(ATSAMA5D4)
-#  include "chip/_sama5d4x_mpddrc.h"
+#  include "hardware/_sama5d4x_mpddrc.h"
 #else
 #  error Unrecognized SAMA5 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_MPDDRC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_MPDDRC_H */

arch/arm/src/sama5/hardware/sam_ohci.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/sama5/chip/sam_ohci.h
+ * arch/arm/src/sama5/hardware/sam_ohci.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_OHCI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_OHCI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_OHCI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_OHCI_H
 
 /****************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/usb/ohci.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -109,4 +109,4 @@
  * Public Functions
  ****************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_OHCI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_OHCI_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_pinmap.h
+ * arch/arm/src/sama5/hardware/sam_pinmap.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PINMAP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PINMAP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PINMAP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -44,13 +44,13 @@
 #include <arch/sama5/chip.h>
 
 #if defined(ATSAMA5D2)
-#  include "chip/_sama5d2x_pinmap.h"
+#  include "hardware/_sama5d2x_pinmap.h"
 #elif defined(ATSAMA5D3)
-#  include "chip/_sama5d3x_pinmap.h"
+#  include "hardware/_sama5d3x_pinmap.h"
 #elif defined(ATSAMA5D4)
-#  include "chip/_sama5d4x_pinmap.h"
+#  include "hardware/_sama5d4x_pinmap.h"
 #else
 #  error Unrecognized SAMA5 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PINMAP_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_pio.h
+ * arch/arm/src/sama5/hardware/sam_pio.h
  *
  *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIO_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIO_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIO_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIO_H
 
 /************************************************************************************
  * Included Files
@@ -44,11 +44,11 @@
 #include <arch/sama5/chip.h>
 
 #if defined(ATSAMA5D2)
-#  include "chip/_sama5d2x_pio.h"
+#  include "hardware/_sama5d2x_pio.h"
 #elif defined(ATSAMA5D3) || defined(ATSAMA5D4)
-#  include "chip/_sama5d3x4x_pio.h"
+#  include "hardware/_sama5d3x4x_pio.h"
 #else
 #  error Unrecognized SAMA5 architecture
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIO_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIO_H */

arch/arm/src/sama5/hardware/sam_pit.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_pit.h
+ * arch/arm/src/sama5/hardware/sam_pit.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIT_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIT_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIT_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIT_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -82,4 +82,4 @@
 #define PIT_PICNT_SHIFT     (20) /* Bits 20-31: Periodic Interval Counter */
 #define PIT_PICNT_MASK      (0xfff << PIT_PIVR_PICNT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PIT_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PIT_H */

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

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/sama5/chip/sam_pmc.h
+ * arch/arm/src/sama5/hardware/sam_pmc.h
  * Power Management Controller (PMC) for the SAMA5
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PMC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PMC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PMC_H
+#define __ARCH_ARM_SRC_SAMA5_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
@@ -680,4 +680,4 @@
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PMC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PMC_H */

arch/arm/src/sama5/hardware/sam_pwm.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_pwm.h
+ * arch/arm/src/sama5/hardware/sam_pwm.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PWM_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PWM_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PWM_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PWM_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -750,4 +750,4 @@
 #  define PWM_CMUPD_CPOLINVUP      (1 << 13) /* Bit 13: Channel Polarity Inversion Update */
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_PWM_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_PWM_H */

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

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5d/chip/sam_rtc.h
+ * arch/arm/src/sama5/hardware/sam_rtc.h
  * Real-time Clock (RTC) definitions for the SAMA5D3
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RTC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RTC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_RTC_H
+#define __ARCH_ARM_SRC_SAMA5_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
@@ -348,4 +348,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RTC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_RTC_H */

arch/arm/src/sama5/hardware/sam_rxlp.h

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sama5/chip/sam_RXLP.h
+ * arch/arm/src/sama5/hardware/sam_RXLP.h
  * Low Power Asynchronous Receiver (RXLP) definitions for the SAMA5D3
  * and SAMAD4
  *
@@ -35,8 +35,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RXLP_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RXLP_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_RXLP_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_RXLP_H
 
 /************************************************************************************************
  * Included Files
@@ -45,7 +45,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************************
  * Pre-processor Definitions
@@ -131,4 +131,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_RXLP_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_RXLP_H */

arch/arm/src/sama5/hardware/sam_sckc.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_sckc.h
+ * arch/arm/src/sama5/hardware/sam_sckc.h
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SCKC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SCKC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SCKC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SCKC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -66,4 +66,4 @@
 
 #define SCKC_CR_OSCSEL        (1 << 3)  /* Bit 3:  Slow Clock Selector */
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SCKC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SCKC_H */

arch/arm/src/sama5/hardware/sam_sfr.h

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_sfr.h
+ * arch/arm/src/sama5/hardware/sam_sfr.h
  *
  *   Copyright (C) 2013-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SFR_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SFR_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SFR_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SFR_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -310,4 +310,4 @@
 #    define SFR_QSPICLK_3p3V        (1 << 0)  /* Bit 0: 1=3.3V */
 #endif
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SFR_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SFR_H */

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

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_spi.h
+ * arch/arm/src/sama5/hardware/sam_spi.h
  * Serial Peripheral Interface (SPI) definitions for the SAMA5
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SPI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SPI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SPI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SPI_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
@@ -238,4 +238,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SPI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SPI_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_ssc.h
+ * arch/arm/src/sama5/hardware/sam_ssc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SSC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SSC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SSC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SSC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -304,4 +304,4 @@
 #define SSC_WPSR_WPVSRC_SHIFT      (8)       /* Bits 8-23: Write Protect Violation Source */
 #define SSC_WPSR_WPVSRC_MASK       (0xffff << SSC_WPSR_WPVSRC_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_SSC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_SSC_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_tc.h
+ * arch/arm/src/sama5/hardware/sam_tc.h
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TC_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TC_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TC_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TC_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -642,4 +642,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_SAMA5_CHIP_SAM_TC_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TC_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/sama5/chip/sam_trng.h
+ * arch/arm/src/sama5/hardware/sam_trng.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TRNG_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TRNG_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TRNG_H
+#define __ARCH_ARM_SRC_SAMA5_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_SAMA5_CHIP_SAM_TRNG_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TRNG_H */

arch/arm/src/sama5/hardware/sam_twi.h

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_twi.h
+ * arch/arm/src/sama5/hardware/sam_twi.h
  * Two-wire Interface (TWI) definitions for the SAMA5
  *
  *   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TWI_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TWI_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TWI_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TWI_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
@@ -239,4 +239,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_TWI_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_TWI_H */

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

@@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/sama5/chip/sam_uart.h
+ * arch/arm/src/sama5/hardware/sam_uart.h
  * Universal Asynchronous Receiver Transmitter (UART) for the SAMA5D2, SAMA5D3, and SAMA5D4 and
  * Universal Synchronous Asynchronous Receiver Transmitter (USART) definitions for the SAMA5D3
  * and SAMAD4
@@ -36,8 +36,8 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UART_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UART_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UART_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UART_H
 
 /************************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************************
  * Pre-processor Definitions
@@ -572,4 +572,4 @@
  * Public Functions
  ************************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UART_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UART_H */

arch/arm/src/sama5/hardware/sam_udphs.h

@@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/sama5/chip/sam_udphs.h
+ * arch/arm/src/sama5/hardware/sam_udphs.h
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -36,8 +36,8 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UDPHS_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UDPHS_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UDPHS_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UDPHS_H
 
 /********************************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -478,4 +478,4 @@ struct udphs_dtd_s
  * Public Functions
  ********************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_UDPHS_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_UDPHS_H */

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

@@ -1,5 +1,5 @@
 /****************************************************************************************
- * arch/arm/src/sama5/chip/sam_wdt.h
+ * arch/arm/src/sama5/hardware/sam_wdt.h
  * Watchdog Timer (WDT) definitions for the SAMA5D3
  *
  *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_SAMA5_CHIP_SAM_WDT_H
-#define __ARCH_ARM_SRC_SAMA5_CHIP_SAM_WDT_H
+#ifndef __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_WDT_H
+#define __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_WDT_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
@@ -111,4 +111,4 @@
  * Public Functions
  ****************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_SAMA5_CHIP_SAM_WDT_H */
+#endif /* __ARCH_ARM_SRC_SAMA5_HARDWARE_SAM_WDT_H */

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

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

arch/arm/src/sama5/sam_adc.c

@@ -71,9 +71,9 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/sam_adc.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_adc.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_pinmap.h"
 
 #include "sam_periphclks.h"
 #include "sam_memories.h"

arch/arm/src/sama5/sam_adc.h

@@ -44,7 +44,7 @@
 
 #include <nuttx/analog/adc.h>
 
-#include "chip/sam_adc.h"
+#include "hardware/sam_adc.h"
 
 #ifdef CONFIG_SAMA5_ADC
 

arch/arm/src/sama5/sam_boot.c

@@ -57,9 +57,9 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/sam_wdt.h"
-#include "chip/sam_aximx.h"
-#include "chip/sam_sfr.h"
+#include "hardware/sam_wdt.h"
+#include "hardware/sam_aximx.h"
+#include "hardware/sam_sfr.h"
 
 #include "sam_clockconfig.h"
 #include "sam_memorymap.h"

arch/arm/src/sama5/sam_can.c

@@ -66,7 +66,7 @@
 #include "up_arch.h"
 
 
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_periphclks.h"
 #include "sam_pio.h"
 #include "sam_can.h"

arch/arm/src/sama5/sam_can.h

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

arch/arm/src/sama5/sam_clockconfig.c

@@ -51,8 +51,8 @@
 
 #include "sam_periphclks.h"
 #include "sam_clockconfig.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_sfr.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_sfr.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_dbgu.c

@@ -59,8 +59,8 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_dbgu.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_dbgu.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
 #include "sam_dbgu.h"
 

arch/arm/src/sama5/sam_dmac.c

@@ -57,8 +57,8 @@
 #include "sam_dmac.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_dmac.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_dmac.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_ehci.c

@@ -65,8 +65,8 @@
 #include "sam_periphclks.h"
 #include "sam_memories.h"
 #include "sam_usbhost.h"
-#include "chip/sam_sfr.h"
-#include "chip/sam_ehci.h"
+#include "hardware/sam_sfr.h"
+#include "hardware/sam_ehci.h"
 
 #ifdef CONFIG_SAMA5_EHCI
 

arch/arm/src/sama5/sam_emaca.c

@@ -79,7 +79,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"

arch/arm/src/sama5/sam_emacb.c

@@ -93,7 +93,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"

arch/arm/src/sama5/sam_ethernet.h

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

arch/arm/src/sama5/sam_flexcom_serial.c

@@ -63,7 +63,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_flexcom.h"
+#include "hardware/sam_flexcom.h"
 #include "sam_config.h"
 #include "sam_dbgu.h"
 #include "sam_serial.h"

arch/arm/src/sama5/sam_gmac.c

@@ -76,7 +76,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"

arch/arm/src/sama5/sam_hsmci.c

@@ -66,10 +66,10 @@
 #include "sam_periphclks.h"
 #include "sam_memories.h"
 #include "sam_hsmci.h"
-#include "chip/sam_dmac.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_hsmci.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_dmac.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_hsmci.h"
+#include "hardware/sam_pinmap.h"
 
 #if defined(CONFIG_SAMA5_HSMCI0) || defined(CONFIG_SAMA5_HSMCI1) || \
     defined(CONFIG_SAMA5_HSMCI2)

arch/arm/src/sama5/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"
 
 #if defined(CONFIG_SAMA5_HSMCI0) || defined(CONFIG_SAMA5_HSMCI1) || \

arch/arm/src/sama5/sam_irq.c

@@ -57,10 +57,10 @@
 #include "mmu.h"
 #include "cp15_cacheops.h"
 #include "sctlr.h"
-#include "chip/sam_aic.h"
-#include "chip/sam_matrix.h"
-#include "chip/sam_aximx.h"
-#include "chip/sam_sfr.h"
+#include "hardware/sam_aic.h"
+#include "hardware/sam_matrix.h"
+#include "hardware/sam_aximx.h"
+#include "hardware/sam_sfr.h"
 
 #include "sam_irq.h"
 

arch/arm/src/sama5/sam_irq.h

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

arch/arm/src/sama5/sam_isi.h

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

arch/arm/src/sama5/sam_lcd.c

@@ -59,8 +59,8 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "chip/sam_lcdc.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_lcdc.h"
+#include "hardware/sam_pinmap.h"
 #include "sam_pio.h"
 #include "sam_periphclks.h"
 #include "sam_memories.h"

arch/arm/src/sama5/sam_lcd.h

@@ -46,7 +46,7 @@
 
 #include <nuttx/nx/nxglib.h>
 
-#include "chip/sam_lcdc.h"
+#include "hardware/sam_lcdc.h"
 
 #ifdef CONFIG_SAMA5_LCDC
 

arch/arm/src/sama5/sam_lowputc.c

@@ -52,10 +52,10 @@
 #include "sam_dbgu.h"
 #include "sam_lowputc.h"
 
-#include "chip/sam_uart.h"
-#include "chip/sam_flexcom.h"
-#include "chip/sam_dbgu.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_uart.h"
+#include "hardware/sam_flexcom.h"
+#include "hardware/sam_dbgu.h"
+#include "hardware/sam_pinmap.h"
 
 #include <arch/board/board.h>
 

arch/arm/src/sama5/sam_nand.h

@@ -52,7 +52,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "chip/sam_hsmc.h"
+#include "hardware/sam_hsmc.h"
 
 #include "sam_dmac.h"
 

arch/arm/src/sama5/sam_ohci.c

@@ -69,9 +69,9 @@
 #include "sam_periphclks.h"
 #include "sam_memories.h"
 #include "sam_usbhost.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_sfr.h"
-#include "chip/sam_ohci.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_sfr.h"
+#include "hardware/sam_ohci.h"
 
 #ifdef CONFIG_SAMA5_OHCI
 

arch/arm/src/sama5/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_pio.h"

arch/arm/src/sama5/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/sama5/sam_pio.h

@@ -48,7 +48,7 @@
 
 #include <arch/sama5/chip.h>
 
-#include "chip/sam_memorymap.h"
+#include "hardware/sam_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_pioirq.c

@@ -53,8 +53,8 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/sam_pio.h"
-#include "chip/sam_pmc.h"
+#include "hardware/sam_pio.h"
+#include "hardware/sam_pmc.h"
 
 #include "sam_pio.h"
 #include "sam_periphclks.h"

arch/arm/src/sama5/sam_pmc.c

@@ -52,10 +52,10 @@
 #include "chip.h"
 
 #ifdef CONFIG_ARCH_HAVE_SDIO
-#  include "chip/sam_hsmci.h"
+#  include "hardware/sam_hsmci.h"
 #endif
 
-#include "chip/sam_pmc.h"
+#include "hardware/sam_pmc.h"
 #include "sam_pmc.h"
 
 /****************************************************************************

arch/arm/src/sama5/sam_pwm.c

@@ -49,7 +49,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/drivers/pwm.h>
 
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pinmap.h"
 #include <arch/board/board.h>
 
 #include "up_internal.h"

arch/arm/src/sama5/sam_pwm.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_pwm.h"
+#include "hardware/sam_pwm.h"
 
 #ifdef CONFIG_SAMA5_PWM
 

arch/arm/src/sama5/sam_rtc.h

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

arch/arm/src/sama5/sam_sckc.h

@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/sam_sckc.h"
+#include "hardware/sam_sckc.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_serial.c

@@ -63,7 +63,7 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/sam_uart.h"
+#include "hardware/sam_uart.h"
 #include "sam_config.h"
 #include "sam_dbgu.h"
 #include "sam_serial.h"

arch/arm/src/sama5/sam_spi.c

@@ -72,9 +72,9 @@
 #include "sam_memories.h"
 #include "sam_periphclks.h"
 #include "sam_spi.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_spi.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_spi.h"
+#include "hardware/sam_pinmap.h"
 
 #if defined(CONFIG_SAMA5_SPI0) || defined(CONFIG_SAMA5_SPI1)
 

arch/arm/src/sama5/sam_ssc.c

@@ -69,9 +69,9 @@
 #include "sam_memories.h"
 #include "sam_periphclks.h"
 #include "sam_ssc.h"
-#include "chip/sam_pmc.h"
-#include "chip/sam_ssc.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_ssc.h"
+#include "hardware/sam_pinmap.h"
 
 #if defined(CONFIG_SAMA5_SSC0) || defined(CONFIG_SAMA5_SSC1)
 

arch/arm/src/sama5/sam_ssc.h

@@ -44,7 +44,7 @@
 #include <nuttx/audio/i2s.h>
 
 #include "chip.h"
-#include "chip/sam_ssc.h"
+#include "hardware/sam_ssc.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_tc.c

@@ -63,8 +63,8 @@
 
 #include "up_arch.h"
 #include "sam_periphclks.h"
-#include "chip/sam_pinmap.h"
-#include "chip/sam_pmc.h"
+#include "hardware/sam_pinmap.h"
+#include "hardware/sam_pmc.h"
 #include "sam_pio.h"
 #include "sam_tc.h"
 

arch/arm/src/sama5/sam_tc.h

@@ -46,7 +46,7 @@
 #include <debug.h>
 
 #include "chip.h"
-#include "chip/sam_tc.h"
+#include "hardware/sam_tc.h"
 
 #if defined(CONFIG_SAMA5_TC0) || defined(CONFIG_SAMA5_TC1) || defined(CONFIG_SAMA5_TC2)
 

arch/arm/src/sama5/sam_timerisr.c

@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 #include "sam_periphclks.h"
-#include "chip/sam_pit.h"
+#include "hardware/sam_pit.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/sama5/sam_trng.h

@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/sam_trng.h"
+#include "hardware/sam_trng.h"
 
 #if defined(CONFIG_DEV_RANDOM) && defined(CONFIG_SAMA5_TRNG)
 

arch/arm/src/sama5/sam_tsd.c

@@ -72,7 +72,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "chip/sam_adc.h"
+#include "hardware/sam_adc.h"
 #include "sam_adc.h"
 #include "sam_tsd.h"
 

arch/arm/src/sama5/sam_tsd.h

@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/sam_adc.h"
+#include "hardware/sam_adc.h"
 
 #if defined(CONFIG_SAMA5_ADC) && defined(CONFIG_SAMA5_TSD)
 

arch/arm/src/sama5/sam_twi.c

@@ -65,8 +65,8 @@
 
 #include "up_arch.h"
 
-#include "chip/sam_pmc.h"
-#include "chip/sam_pinmap.h"
+#include "hardware/sam_pmc.h"
+#include "hardware/sam_pinmap.h"
 
 #include "sam_periphclks.h"
 #include "sam_pio.h"

arch/arm/src/sama5/sam_twi.h

@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/sam_twi.h"
+#include "hardware/sam_twi.h"
 
 /****************************************************************************
  * Public Function Prototypes

arch/arm/src/sama5/sam_udphs.c

@@ -69,7 +69,7 @@
 
 #include "sam_periphclks.h"
 #include "sam_memories.h"
-#include "chip/sam_udphs.h"
+#include "hardware/sam_udphs.h"
 #include "sam_udphs.h"
 
 #if defined(CONFIG_USBDEV) && defined(CONFIG_SAMA5_UDPHS)