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

2019-05-24 14:15:01 -06:00 · 2019-05-24 14:15:01 -06:00 · f46ad3f6a6
commit f46ad3f6a6
parent 8db1bae3a1
89 changed files with 246 additions and 246 deletions
--- a/arch/arm/src/imx6/hardware/imx_ccm.h
+++ b/arch/arm/src/imx6/hardware/imx_ccm.h
@ -45,7 +45,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/imx6/hardware/imx_gpio.h
+++ b/arch/arm/src/imx6/hardware/imx_gpio.h
@ -45,7 +45,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/imx6/hardware/imx_gpt.h
+++ b/arch/arm/src/imx6/hardware/imx_gpt.h
@ -45,7 +45,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/imx6/hardware/imx_iomuxc.h
+++ b/arch/arm/src/imx6/hardware/imx_iomuxc.h
@ -45,7 +45,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /* These definitions derive from specifications for the i.MX 6Quad/6Dual and require
 * review and modification in order to support other family members.
--- a/arch/arm/src/imx6/hardware/imx_src.h
+++ b/arch/arm/src/imx6/hardware/imx_src.h
@ -45,7 +45,7 @@
 ****************************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /****************************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/imx6/hardware/imx_uart.h
+++ b/arch/arm/src/imx6/hardware/imx_uart.h
@ -45,7 +45,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "hardware/imx_memory.map"
+#include "hardware/imx_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/chip.h
+++ b/arch/arm/src/lpc17xx/chip.h
@ -55,7 +55,7 @@
 * this file for the proper setup.
 */

-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/lpc176x_memorymap.h
+ * arch/arm/src/lpc17xx/hardware/lpc176x_memorymap.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@ -133,4 +133,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC176X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_MEMORYMAP_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc176x_pinconfig.h
+ * arch/arm/src/lpc17xx/hardware/lpc176x_pinconfig.h
 *
 *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H

 /************************************************************************************
 * Included Files
@ -231,4 +231,4 @@
 * Public Function Prototypes
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONFIG_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc176x_pinconn.h
+ * arch/arm/src/lpc17xx/hardware/lpc176x_pinconn.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -632,4 +632,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_PINCONN_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_PINCONN_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc176x_syscon.h
+ * arch/arm/src/lpc17xx/hardware/lpc176x_syscon.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -491,4 +491,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC176X_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC176X_SYSCON_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc178x_iocon.h
+ * arch/arm/src/lpc17xx/hardware/lpc178x_iocon.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Rommel Marcelo
@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H

 /************************************************************************************
 * Included Files
@ -44,7 +44,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -372,4 +372,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_IOCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_IOCON_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/lpc178x_memorymap.h
+ * arch/arm/src/lpc17xx/hardware/lpc178x_memorymap.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Authors: Rommel Marcelo
@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@ -155,4 +155,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC178X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_MEMORYMAP_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc178x_pinconfig.h
+ * arch/arm/src/lpc17xx/hardware/lpc178x_pinconfig.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Authors: Rommel Marcelo
@ -34,8 +34,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H

 /************************************************************************************
 * Included Files
@ -656,4 +656,4 @@
 * Public Function Prototypes
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_PINCONFIG_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h
@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc178x_syscon.h
+ * arch/arm/src/lpc17xx/hardware/lpc178x_syscon.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Authors: Rommel Marcelo
@ -34,8 +34,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H

 /****************************************************************************************************
 * Included Files
@ -44,7 +44,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /****************************************************************************************************
 * Pre-processor Definitions
@ -633,4 +633,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC178X_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC178X_SYSCON_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_adc.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_adc.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_adc.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_adc.h
 *
 *   Copyright (C) 2010, 2012, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -177,4 +177,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_ADC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_ADC_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_can.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_can.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_can.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_can.h
 *
 *   Copyright (C) 2010-2012, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -507,4 +507,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_CAN_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_CAN_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_dac.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_dac.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_dac.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_dac.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -94,4 +94,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_DAC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_DAC_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_eeprom.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_eeprom.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -183,4 +183,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EEPROM_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EEPROM_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_emc.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_emc.h
@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_emc
+ * arch/arm/src/lpc17xx/hardware/lpc17_emc
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ****************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H

 /****************************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /****************************************************************************************************
 * Pre-processor Definitions
@ -347,4 +347,4 @@
 * Public Functions
 ****************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_EMC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_EMC_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_ethernet.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_ethernet.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -594,4 +594,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_ETHERNET_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_gpdma.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_gpdma.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -594,4 +594,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_GPDMA_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_GPDMA_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_gpio.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_gpio.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_gpio.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_gpio.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -207,4 +207,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_CHIP_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_CHIP_GPIO_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_i2c.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_i2c.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_i2c.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_i2c.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -205,4 +205,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2C_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2C_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_i2s.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_i2s.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_i2s
+ * arch/arm/src/lpc17xx/hardware/lpc17_i2s
 *
 *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -187,4 +187,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_I2S_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_I2S_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_lcd.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_lcd.h
@ -1,5 +1,5 @@
 /************************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_lcd.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_lcd.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H

 /************************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************************
 * Pre-processor Definitions
@ -343,4 +343,4 @@
 * Public Functions
 ************************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_LCD_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_LCD_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_mcpwm.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_mcpwm.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -277,4 +277,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MCPWM_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MCPWM_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_memorymap.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_memorymap.h
 *
 *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H

 /************************************************************************************
 * Included Files
@ -49,9 +49,9 @@
 #include <arch/lpc17xx/chip.h>

 #if defined(LPC176x)
-#  include "chip/lpc176x_memorymap.h"
+#  include "hardware/lpc176x_memorymap.h"
 #elif defined(LPC178x)
-#  include "chip/lpc178x_memorymap.h"
+#  include "hardware/lpc178x_memorymap.h"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
@ -72,4 +72,4 @@
 * Public Function Prototypes
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_MEMORYMAP_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_pinconfig.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_pinconfig.h
 *
 *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H

 /************************************************************************************
 * Included Files
@ -49,9 +49,9 @@
 #include <arch/lpc17xx/chip.h>

 #if defined(LPC176x)
-#  include "chip/lpc176x_pinconfig.h"
+#  include "hardware/lpc176x_pinconfig.h"
 #elif defined(LPC178x)
-#  include "chip/lpc178x_pinconfig.h"
+#  include "hardware/lpc178x_pinconfig.h"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
@ -72,4 +72,4 @@
 * Public Function Prototypes
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONFIG_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONFIG_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_pinconn.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_pinconn.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H

 /************************************************************************************
 * Included Files
@ -49,9 +49,9 @@
 #include <arch/lpc17xx/chip.h>

 #if defined(LPC176x)
-#  include "chip/lpc176x_pinconn.h"
+#  include "hardware/lpc176x_pinconn.h"
 #elif defined(LPC178x)
-#  include "chip/lpc178x_iocon.h"
+#  include "hardware/lpc178x_iocon.h"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
@ -72,4 +72,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PINCONN_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PINCONN_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_pwm.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_pwm.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_pwm.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_pwm.h
 *
 *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -220,4 +220,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_PWM_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_PWM_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_qei.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_qei.h
@ -1,5 +1,5 @@
 /********************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_qei.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_qei.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ********************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H

 /********************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /********************************************************************************************
 * Pre-processor Definitions
@ -211,4 +211,4 @@
 * Public Functions
 ********************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_QEI_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_QEI_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_rit.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_rit.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_rit.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_rit.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -89,4 +89,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RIT_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RIT_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_rtc.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_rtc.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_rtc.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_rtc.h
 *
 *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -274,4 +274,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTC_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTC_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_rtcevmr.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_rtcevmr.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -140,4 +140,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_RTCEVMR_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_RTCEVMR_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_sdcard.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_sdcard.h
 *
 *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H

 /************************************************************************************
 * Pre-processor Definitions
@ -268,5 +268,5 @@
 * The FIFOs contain 16 entries on 16 sequential addresses.
 */

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SDCARD_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SDCARD_H */

--- a/arch/arm/src/lpc17xx/hardware/lpc17_spi.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_spi.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_spi.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_spi.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -138,4 +138,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SPI_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SPI_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_ssp.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_ssp.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_ssp.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_ssp.h
 *
 *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -182,4 +182,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SSP_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SSP_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_syscon.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_syscon.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_syscon.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_syscon.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H

 /************************************************************************************
 * Included Files
@ -49,9 +49,9 @@
 #include <arch/lpc17xx/chip.h>

 #if defined(LPC176x)
-#  include "chip/lpc176x_syscon.h"
+#  include "hardware/lpc176x_syscon.h"
 #elif defined(LPC178x)
-#  include "chip/lpc178x_syscon.h"
+#  include "hardware/lpc178x_syscon.h"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
@ -72,4 +72,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_SYSCON_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_timer.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_timer.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_timer.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_timer.h
 *
 *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -247,4 +247,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_TIMER_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_TIMER_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_uart.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_uart.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_uart.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_uart.h
 *
 *   Copyright (C) 2010, 2012-2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -411,4 +411,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_UART_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_UART_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_usb.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_usb.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_usb.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_usb.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H
-#define __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H

 /************************************************************************************
 * Included Files
@ -44,7 +44,7 @@
 #include <nuttx/usb/ohci.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -775,4 +775,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_CHIP_LPC17_USB_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_USB_H */
--- a/arch/arm/src/lpc17xx/hardware/lpc17_wdt.h
+++ b/arch/arm/src/lpc17xx/hardware/lpc17_wdt.h
@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/lpc17xx/chip/lpc17_wdt.h
+ * arch/arm/src/lpc17xx/hardware/lpc17_wdt.h
 *
 *   Copyright (C) 2010, 2013 Gregory Nutt. All rights reserved.
 *   Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
 *
 ************************************************************************************/

-#ifndef __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H
-#define __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H
+#ifndef __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H
+#define __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H

 /************************************************************************************
 * Included Files
@ -43,7 +43,7 @@
 #include <nuttx/config.h>

 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
@ -153,4 +153,4 @@
 * Public Functions
 ************************************************************************************/

-#endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_WDT_H */
+#endif /* __ARCH_ARM_SRC_LPC17XX_HARDWARE_LPC17_WDT_H */
--- a/arch/arm/src/lpc17xx/lpc176x_clockconfig.c
+++ b/arch/arm/src/lpc17xx/lpc176x_clockconfig.c
@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "lpc17_clockconfig.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx/lpc176x_rtc.c
@ -52,7 +52,7 @@
 #include "up_internal.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"

 #include "lpc17_rtc.h"

--- a/arch/arm/src/lpc17xx/lpc178x_clockconfig.c
+++ b/arch/arm/src/lpc17xx/lpc178x_clockconfig.c
@ -49,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "lpc17_clockconfig.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_adc.c
+++ b/arch/arm/src/lpc17xx/lpc17_adc.c
@ -63,7 +63,7 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_adc.h"

--- a/arch/arm/src/lpc17xx/lpc17_adc.h
+++ b/arch/arm/src/lpc17xx/lpc17_adc.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_adc.h"
+#include "hardware/lpc17_adc.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_allocateheap.c
+++ b/arch/arm/src/lpc17xx/lpc17_allocateheap.c
@ -52,7 +52,7 @@
 #include "up_arch.h"
 #include "up_internal.h"

-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"
 #include "lpc17_emacram.h"
 #include "lpc17_ohciram.h"
 #include "lpc17_mpuinit.h"
--- a/arch/arm/src/lpc17xx/lpc17_can.c
+++ b/arch/arm/src/lpc17xx/lpc17_can.c
@ -63,7 +63,7 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_can.h"

--- a/arch/arm/src/lpc17xx/lpc17_can.h
+++ b/arch/arm/src/lpc17xx/lpc17_can.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_can.h"
+#include "hardware/lpc17_can.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_clockconfig.c
+++ b/arch/arm/src/lpc17xx/lpc17_clockconfig.c
@ -56,9 +56,9 @@
 #include <arch/lpc17xx/chip.h>

 #if defined(LPC176x)
-#  include "chip/lpc176x_clockconfig.c"
+#  include "hardware/lpc176x_clockconfig.c"
 #elif defined(LPC178x)
-#  include "chip/lpc178x_clockconfig.c"
+#  include "hardware/lpc178x_clockconfig.c"
 #else
 #  error "Unrecognized LPC17xx family"
 #endif
--- a/arch/arm/src/lpc17xx/lpc17_dac.c
+++ b/arch/arm/src/lpc17xx/lpc17_dac.c
@ -62,8 +62,8 @@

 #include "chip.h"

-#include "chip/lpc17_syscon.h"
-#include "chip/lpc17_pinconfig.h"
+#include "hardware/lpc17_syscon.h"
+#include "hardware/lpc17_pinconfig.h"
 #include "lpc17_gpio.h"
 #include "lpc17_dac.h"

--- a/arch/arm/src/lpc17xx/lpc17_dac.h
+++ b/arch/arm/src/lpc17xx/lpc17_dac.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_dac.h"
+#include "hardware/lpc17_dac.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_emacram.h
+++ b/arch/arm/src/lpc17xx/lpc17_emacram.h
@ -42,8 +42,8 @@

 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc17_ethernet.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_ethernet.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_emc.c
+++ b/arch/arm/src/lpc17xx/lpc17_emc.c
@ -45,7 +45,7 @@

 #include "up_arch.h"

-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_emc.h"

--- a/arch/arm/src/lpc17xx/lpc17_emc.h
+++ b/arch/arm/src/lpc17xx/lpc17_emc.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_emc.h"
+#include "hardware/lpc17_emc.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.c
@ -65,7 +65,7 @@

 #include "up_arch.h"
 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_ethernet.h"
 #include "lpc17_emacram.h"
--- a/arch/arm/src/lpc17xx/lpc17_ethernet.h
+++ b/arch/arm/src/lpc17xx/lpc17_ethernet.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_ethernet.h"
+#include "hardware/lpc17_ethernet.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_gpdma.c
+++ b/arch/arm/src/lpc17xx/lpc17_gpdma.c
@ -55,7 +55,7 @@

 #include "chip.h"

-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpdma.h"

 #ifdef CONFIG_LPC17_GPDMA
--- a/arch/arm/src/lpc17xx/lpc17_gpdma.h
+++ b/arch/arm/src/lpc17xx/lpc17_gpdma.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_gpdma.h"
+#include "hardware/lpc17_gpdma.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_gpio.h
+++ b/arch/arm/src/lpc17xx/lpc17_gpio.h
@ -49,9 +49,9 @@

 #include <arch/lpc17xx/chip.h>

-#include "chip/lpc17_gpio.h"
-#include "chip/lpc17_pinconn.h"
-#include "chip/lpc17_pinconfig.h"
+#include "hardware/lpc17_gpio.h"
+#include "hardware/lpc17_pinconn.h"
+#include "hardware/lpc17_pinconfig.h"

 /* Include the GPIO definitions for the selected LPC17xx family. */

--- a/arch/arm/src/lpc17xx/lpc17_i2c.c
+++ b/arch/arm/src/lpc17xx/lpc17_i2c.c
@ -70,7 +70,7 @@
 #include "up_internal.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_i2c.h"

--- a/arch/arm/src/lpc17xx/lpc17_i2c.h
+++ b/arch/arm/src/lpc17xx/lpc17_i2c.h
@ -42,7 +42,7 @@

 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/lpc17_i2c.h"
+#include "hardware/lpc17_i2c.h"

 /****************************************************************************
 * Public Function Prototypes
--- a/arch/arm/src/lpc17xx/lpc17_i2s.h
+++ b/arch/arm/src/lpc17xx/lpc17_i2s.h
@ -41,7 +41,7 @@
 ****************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_i2s.h"
+#include "hardware/lpc17_i2s.h"

 /****************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_lcd.c
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.c
@ -48,7 +48,7 @@
 #include <arch/board/board.h>

 #include "up_arch.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_lcd.h"

--- a/arch/arm/src/lpc17xx/lpc17_lcd.h
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.h
@ -46,7 +46,7 @@

 #include <nuttx/nx/nxglib.h>

-#include "chip/lpc17_lcd.h"
+#include "hardware/lpc17_lcd.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_lowputc.c
+++ b/arch/arm/src/lpc17xx/lpc17_lowputc.c
@ -47,8 +47,8 @@
 #include "up_internal.h"
 #include "up_arch.h"

-#include "chip/lpc17_syscon.h"
-#include "chip/lpc17_uart.h"
+#include "hardware/lpc17_syscon.h"
+#include "hardware/lpc17_uart.h"

 #include "lpc17_gpio.h"
 #include "lpc17_lowputc.h"
--- a/arch/arm/src/lpc17xx/lpc17_mcpwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_mcpwm.c
@ -54,9 +54,9 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_pwm.h"
-#include "chip/lpc176x_pinconfig.h"
+#include "hardware/lpc176x_pinconfig.h"
 #include "lpc17_gpio.h"
 #include "lpc176x_gpio.h"

--- a/arch/arm/src/lpc17xx/lpc17_ohciram.h
+++ b/arch/arm/src/lpc17xx/lpc17_ohciram.h
@ -42,7 +42,7 @@

 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/lpc17_memorymap.h"
+#include "hardware/lpc17_memorymap.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_pwm.c
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.c
@ -54,9 +54,9 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_pwm.h"
-#include "chip/lpc176x_pinconfig.h"
+#include "hardware/lpc176x_pinconfig.h"
 #include "lpc17_gpio.h"
 #include "lpc176x_gpio.h"

--- a/arch/arm/src/lpc17xx/lpc17_pwm.h
+++ b/arch/arm/src/lpc17xx/lpc17_pwm.h
@ -41,8 +41,8 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_pwm.h"
-#include "chip/lpc17_mcpwm.h"
+#include "hardware/lpc17_pwm.h"
+#include "hardware/lpc17_mcpwm.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_qei.h
+++ b/arch/arm/src/lpc17xx/lpc17_qei.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_qei.h"
+#include "hardware/lpc17_qei.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_rit.h
+++ b/arch/arm/src/lpc17xx/lpc17_rit.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_rit.h"
+#include "hardware/lpc17_rit.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_rtc.h
+++ b/arch/arm/src/lpc17xx/lpc17_rtc.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_rtc.h"
+#include "hardware/lpc17_rtc.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.c
@ -65,8 +65,8 @@
 #include "lpc17_gpio.h"
 #include "lpc17_sdcard.h"

-#include "chip/lpc17_syscon.h"
-#include "chip/lpc17_pinconfig.h"
+#include "hardware/lpc17_syscon.h"
+#include "hardware/lpc17_pinconfig.h"

 #ifdef CONFIG_LPC17_SDCARD

--- a/arch/arm/src/lpc17xx/lpc17_sdcard.h
+++ b/arch/arm/src/lpc17xx/lpc17_sdcard.h
@ -45,7 +45,7 @@
 #include <stdbool.h>

 #include "chip.h"
-#include "chip/lpc17_sdcard.h"
+#include "hardware/lpc17_sdcard.h"

 /************************************************************************************
 * Public Functions
--- a/arch/arm/src/lpc17xx/lpc17_serial.c
+++ b/arch/arm/src/lpc17xx/lpc17_serial.c
@ -62,7 +62,7 @@
 #include "up_internal.h"

 #include "chip.h"
-#include "chip/lpc17_uart.h"
+#include "hardware/lpc17_uart.h"
 #include "lpc17_gpio.h"
 #include "lpc17_serial.h"

--- a/arch/arm/src/lpc17xx/lpc17_serial.h
+++ b/arch/arm/src/lpc17xx/lpc17_serial.h
@ -43,8 +43,8 @@
 #include <nuttx/config.h>
 #include <arch/board/board.h>

-#include "chip/lpc17_uart.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_uart.h"
+#include "hardware/lpc17_syscon.h"

 #include "lpc17_gpio.h"

--- a/arch/arm/src/lpc17xx/lpc17_spi.c
+++ b/arch/arm/src/lpc17xx/lpc17_spi.c
@ -56,7 +56,7 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_spi.h"

--- a/arch/arm/src/lpc17xx/lpc17_spi.h
+++ b/arch/arm/src/lpc17xx/lpc17_spi.h
@ -44,7 +44,7 @@

 #include <nuttx/spi/spi.h>

-#include "chip/lpc17_spi.h"
+#include "hardware/lpc17_spi.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_ssp.c
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.c
@ -55,7 +55,7 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_ssp.h"

--- a/arch/arm/src/lpc17xx/lpc17_ssp.h
+++ b/arch/arm/src/lpc17xx/lpc17_ssp.h
@ -44,7 +44,7 @@

 #include <nuttx/spi/spi.h>

-#include "chip/lpc17_ssp.h"
+#include "hardware/lpc17_ssp.h"

 #if defined(CONFIG_LPC17_SSP0) || defined(CONFIG_LPC17_SSP1)

--- a/arch/arm/src/lpc17xx/lpc17_timer.c
+++ b/arch/arm/src/lpc17xx/lpc17_timer.c
@ -54,9 +54,9 @@
 #include "up_arch.h"

 #include "chip.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_timer.h"
-#include "chip/lpc176x_pinconfig.h"
+#include "hardware/lpc176x_pinconfig.h"
 #include "lpc17_gpio.h"
 #include "lpc176x_gpio.h"

--- a/arch/arm/src/lpc17xx/lpc17_timer.h
+++ b/arch/arm/src/lpc17xx/lpc17_timer.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_timer.h"
+#include "hardware/lpc17_timer.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/arch/arm/src/lpc17xx/lpc17_usbdev.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbdev.c
@ -60,8 +60,8 @@
 #include "up_internal.h"

 #include "chip.h"
-#include "chip/lpc17_usb.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_usb.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_gpdma.h"

--- a/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/arch/arm/src/lpc17xx/lpc17_usbhost.c
@ -66,8 +66,8 @@
 #include "up_internal.h"

 #include "chip.h"
-#include "chip/lpc17_usb.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_usb.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_gpio.h"
 #include "lpc17_ohciram.h"

--- a/arch/arm/src/lpc17xx/lpc17_wdt.h
+++ b/arch/arm/src/lpc17xx/lpc17_wdt.h
@ -41,7 +41,7 @@
 ************************************************************************************/

 #include <nuttx/config.h>
-#include "chip/lpc17_wdt.h"
+#include "hardware/lpc17_wdt.h"

 /************************************************************************************
 * Pre-processor Definitions
--- a/configs/open1788/src/lpc17_sdraminitialize.c
+++ b/configs/open1788/src/lpc17_sdraminitialize.c
@ -47,7 +47,7 @@

 #include "up_arch.h"
 #include "up_internal.h"
-#include "chip/lpc17_syscon.h"
+#include "hardware/lpc17_syscon.h"
 #include "lpc17_emc.h"

 #include "open1788.h"