diff --git a/arch/arm/src/lpc54xx/chip.h b/arch/arm/src/lpc54xx/chip.h
index 9e67179d0da..e4ebd9c9e45 100644
--- a/arch/arm/src/lpc54xx/chip.h
+++ b/arch/arm/src/lpc54xx/chip.h
@@ -48,7 +48,7 @@
 
 #include <arch/irq.h>
 #include <arch/lpc54xx/chip.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /* The common ARMv7-M vector handling logic expects the following definition in this
  * file.  ARMV7M_PERIPHERAL_INTERRUPTS provides the number of supported external
diff --git a/arch/arm/src/lpc54xx/chip/lpc546x_memorymap.h b/arch/arm/src/lpc54xx/hardware/lpc546x_memorymap.h
similarity index 97%
rename from arch/arm/src/lpc54xx/chip/lpc546x_memorymap.h
rename to arch/arm/src/lpc54xx/hardware/lpc546x_memorymap.h
index c6878580f8c..bfc7f1a7984 100644
--- a/arch/arm/src/lpc54xx/chip/lpc546x_memorymap.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc546x_memorymap.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_MEMORYMAP_H
 
 /****************************************************************************************************
  * Included Files
@@ -141,5 +141,5 @@
 #define LPC54_CTIMER3_BASE   0x40048000  /* CTIMER3 */
 #define LPC54_CTIMER4_BASE   0x40049000  /* CTIMER4 */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_MEMORYMAP_H */
 
diff --git a/arch/arm/src/lpc54xx/chip/lpc546x_pinmux.h b/arch/arm/src/lpc54xx/hardware/lpc546x_pinmux.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc546x_pinmux.h
rename to arch/arm/src/lpc54xx/hardware/lpc546x_pinmux.h
index 5bfb7c66e13..f408950c16e 100644
--- a/arch/arm/src/lpc54xx/chip/lpc546x_pinmux.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc546x_pinmux.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_PINMUX_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_PINMUX_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_PINMUX_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_PINMUX_H
 
 /************************************************************************************
  * Included Files
@@ -904,4 +904,4 @@
 #define GPIO_UTICK_CAP3_3            (GPIO_ALT3 | GPIO_MODE_DIGITAL | GPIO_PORT3 | GPIO_PIN23) /* Type D+I */
 #define GPIO_UTICK_CAP3_5            (GPIO_ALT5 | GPIO_MODE_DIGITAL | GPIO_PORT5 | GPIO_PIN10)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC546X_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC546X_PINMUX_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_dma.h b/arch/arm/src/lpc54xx/hardware/lpc54_dma.h
similarity index 98%
rename from arch/arm/src/lpc54xx/chip/lpc54_dma.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_dma.h
index f79b531f881..e11d28053f8 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_dma.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_dma.h
@@ -33,15 +33,15 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_DMA_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_DMA_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_DMA_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_DMA_H
 
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -275,4 +275,4 @@ struct lpc54_dmachan_desc_s
   uint32_t link;      /* Link to next descriptor */
 };
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_DMA_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_DMA_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_emc.h b/arch/arm/src/lpc54xx/hardware/lpc54_emc.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_emc.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_emc.h
index 9a722b86b2d..f2b21af8340 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_emc.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_emc.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_EMC_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_EMC_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_EMC_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_EMC_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -340,4 +340,4 @@
 #define EMC_STATWAITTURN_MASK             (15 << EMC_STATWAITTURN_SHIFT)
 #  define EMC_STATWAITTURN(n)             ((uint32_t)((n)-1) << EMC_STATWAITTURN_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_EMC_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_EMC_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_ethernet.h b/arch/arm/src/lpc54xx/hardware/lpc54_ethernet.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_ethernet.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_ethernet.h
index a30cc0d6d72..7fb297e2b3f 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_ethernet.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_ethernet.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ETHERNET_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ETHERNET_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ETHERNET_H
 
 /************************************************************************************************************
  * Included Files
  ************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************************************
  * Pre-processor Definitions
@@ -863,4 +863,4 @@ struct enet_txdesc_s
   uint32_t ctrlstat;  /* TDES3 Control and status word */
 };
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ETHERNET_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_flexcomm.h b/arch/arm/src/lpc54xx/hardware/lpc54_flexcomm.h
similarity index 96%
rename from arch/arm/src/lpc54xx/chip/lpc54_flexcomm.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_flexcomm.h
index e1c5badc150..5e2045a63b3 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_flexcomm.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_flexcomm.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_FLEXCOMM_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_FLEXCOMM_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_FLEXCOMM_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_FLEXCOMM_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -113,4 +113,4 @@
 #define FLEXCOMM_PID_ID_SHIFT          (16)      /* Bits 15-31: Module ID for selected function */
 #define FLEXCOMM_PID_ID_MASK           (0xffff << FLEXCOMM_PID_ID_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_FLEXCOMM_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_FLEXCOMM_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_gint.h b/arch/arm/src/lpc54xx/hardware/lpc54_gint.h
similarity index 95%
rename from arch/arm/src/lpc54xx/chip/lpc54_gint.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_gint.h
index f0eb80db55d..abc8dd8dc94 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_gint.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_gint.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GINT_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GINT_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GINT_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GINT_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -87,4 +87,4 @@
 #define GINT_PORT_ENA0(n)              (1 << (n)) /* Enable port0 pin for group interrupt */
 #define GINT_PORT_ENA1(n)              (1 << (n)) /* Enable port1 pin for group interrupt */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GINT_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GINT_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_gpio.h b/arch/arm/src/lpc54xx/hardware/lpc54_gpio.h
similarity index 96%
rename from arch/arm/src/lpc54xx/chip/lpc54_gpio.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_gpio.h
index f9fbcc2a2bd..745c54a8bfa 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_gpio.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_gpio.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GPIO_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GPIO_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GPIO_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <stdint.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -105,4 +105,4 @@
 
 #define GPIO_PORT_BIT(n)            (1 << ((n) & 31))
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_GPIO_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_GPIO_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_i2c.h b/arch/arm/src/lpc54xx/hardware/lpc54_i2c.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_i2c.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_i2c.h
index 871f7959bc5..01178d2d2b8 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_i2c.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_i2c.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_I2C_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_I2C_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_I2C_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_I2C_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -415,4 +415,4 @@
 /* I2C module Identification */
 #define I2C_ID_
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_I2C_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_I2C_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_inputmux.h b/arch/arm/src/lpc54xx/hardware/lpc54_inputmux.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_inputmux.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_inputmux.h
index c90250e9c53..e6a71093814 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_inputmux.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_inputmux.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_INPUTMUX_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_INPUTMUX_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_INPUTMUX_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_INPUTMUX_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -295,4 +295,4 @@
 #  define MUX_FREQMEAS_TARGET_GPIOCLKA      (6 << MUX_FREQMEAS_TARGET_SHIFT) /* FREQME_GPIO_CLK_A */
 #  define MUX_FREQMEAS_TARGET_ PIOCLKB      (7 << MUX_FREQMEAS_TARGET_SHIFT) /* FREQME_GPIO_CLK_B */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_INPUTMUX_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_INPUTMUX_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_iocon.h b/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_iocon.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
index 4a04936ffa1..e57fc6e7a5c 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_iocon.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_iocon.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC548X_IOCON_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC548X_IOCON_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -375,4 +375,4 @@
 #define IOCON_PIO4_TYPEA_MASK (0x00000000) /* None */
 #define IOCON_PIO5_TYPEA_MASK (0x00000000) /* None */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC548X_IOCON_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC548X_IOCON_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_lcd.h b/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_lcd.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
index 57df5902690..e7373663928 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_lcd.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_lcd.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_LCD_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_LCD_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_LCD_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_LCD_H
 
 /************************************************************************************************
  * Included Files
  ************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************************
  * Pre-processor Definitions
@@ -332,4 +332,4 @@
 #define LCD_CRSR_INTSTAT_CRSRMIS        (1 << 0)  /* Bit 0: Cursor mask interrupt status */
                                                   /* Bits 1-31: Reserved */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_LCD_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_LCD_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_memorymap.h b/arch/arm/src/lpc54xx/hardware/lpc54_memorymap.h
similarity index 90%
rename from arch/arm/src/lpc54xx/chip/lpc54_memorymap.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_memorymap.h
index 42c7f82cfd4..7f7b9e27bcd 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_memorymap.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_memorymap.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_MEMORYMAP_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_MEMORYMAP_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -43,10 +43,10 @@
 #include <nuttx/config.h>
 
 #if defined(CONFIG_ARCH_FAMILY_LPC546XX)
-#  include "chip/lpc546x_memorymap.h"
+#  include "hardware/lpc546x_memorymap.h"
 #else
 #  error "Unsupported LPC54 family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_MEMORYMAP_H */
 
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_pinmux.h b/arch/arm/src/lpc54xx/hardware/lpc54_pinmux.h
similarity index 91%
rename from arch/arm/src/lpc54xx/chip/lpc54_pinmux.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_pinmux.h
index de259f200ed..493ff1dfee1 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_pinmux.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_pinmux.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINMUX_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINMUX_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINMUX_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINMUX_H
 
 /************************************************************************************
  * Included Files
@@ -44,10 +44,10 @@
 #include "lpc54_gpio.h"
 
 #if defined(CONFIG_ARCH_FAMILY_LPC546XX)
-#  include "chip/lpc546x_pinmux.h"
+#  include "hardware/lpc546x_pinmux.h"
 #else
 #  error "Unsupported LPC54 family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINMUX_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINMUX_H */
 
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_pint.h b/arch/arm/src/lpc54xx/hardware/lpc54_pint.h
similarity index 98%
rename from arch/arm/src/lpc54xx/chip/lpc54_pint.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_pint.h
index 6e0f03501c3..8131f453970 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_pint.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_pint.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINT_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINT_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINT_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINT_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -197,4 +197,4 @@
 #define PINT_PMCFG_CFG7_MASK      (7 << PINT_PMCFG_CFG7_SHIFT)
 #  define PINT_PMCFG_CFG7(n)      ((uint32_t)(n) << PINT_PMCFG_CFG7_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_PINT_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_PINT_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_rit.h b/arch/arm/src/lpc54xx/hardware/lpc54_rit.h
similarity index 95%
rename from arch/arm/src/lpc54xx/chip/lpc54_rit.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_rit.h
index 9c63be06ad8..5afda9c3e02 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_rit.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_rit.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RIT_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RIT_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RIT_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RIT_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -84,4 +84,4 @@
 /* LS 48-bit counter (Bits 0-31: 48-bit up counter) */
 /* MS 48-bit counter (Bits 32-47: 48-bit up counter) */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RIT_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RIT_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_rom.h b/arch/arm/src/lpc54xx/hardware/lpc54_rom.h
similarity index 96%
rename from arch/arm/src/lpc54xx/chip/lpc54_rom.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_rom.h
index 32f5a32c610..698c8b876d2 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_rom.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_rom.h
@@ -33,15 +33,15 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ROM_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ROM_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ROM_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ROM_H
 
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -110,4 +110,4 @@ typedef CODE unsigned int (*rng_read_t)(void);
 
 #define LPC54_RNG_READ ((rng_read_t)(lpc54_otg_vtable[LPC54_OTP_API_RNGREAD_OFFSET >> 2]))
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_ROM_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_ROM_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_rtc.h b/arch/arm/src/lpc54xx/hardware/lpc54_rtc.h
similarity index 95%
rename from arch/arm/src/lpc54xx/chip/lpc54_rtc.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_rtc.h
index 5a6f730cdd5..958dcab27f0 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_rtc.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_rtc.h
@@ -33,15 +33,15 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RTC_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RTC_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RTC_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RTC_H
 
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /********************************************************************************************
  * Pre-processor Definitions
@@ -93,4 +93,4 @@
 
 /* General purpose registers (32-bit value) */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_RTC_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_RTC_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h b/arch/arm/src/lpc54xx/hardware/lpc54_sdmmc.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_sdmmc.h
index 9c94ef728f0..4dd2844a7f0 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_sdmmc.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_sdmmc.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SDMMC_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SDMMC_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SDMMC_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SDMMC_H
 
 /************************************************************************************************
  * Included Files
  ************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************************
  * Pre-processor Definitions
@@ -398,4 +398,4 @@
 
 #define SDMMC_BACKENDPWRL                 (1 << 0)  /* Bit 0: Back-end Power control for card application. */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SDMMC_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_spi.h b/arch/arm/src/lpc54xx/hardware/lpc54_spi.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_spi.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_spi.h
index 21071fbb371..4a4a7da42f7 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_spi.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_spi.h
@@ -33,15 +33,15 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SPI_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SPI_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SPI_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SPI_H
 
 /****************************************************************************************************
  * Included Files
  ****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -402,4 +402,4 @@
 #define SPI_ID_ID_SHIFT               (15)      /* Bits 16-31: Unique module identifier for this IP block */
 #define SPI_ID_ID_MASK                (0xffff << SPI_ID_ID_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SPI_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SPI_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_syscon.h b/arch/arm/src/lpc54xx/hardware/lpc54_syscon.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_syscon.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_syscon.h
index 43e366139ac..a7e3ebb8567 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_syscon.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_syscon.h
@@ -33,15 +33,15 @@
  *
  ********************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SYSCON_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SYSCON_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SYSCON_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SYSCON_H
 
 /********************************************************************************************
  * Included Files
  ********************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -937,4 +937,4 @@
 /* Brown-Out Detect control */
 #define SYSCON_BODCTRL_
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_SYSCON_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_SYSCON_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_usart.h b/arch/arm/src/lpc54xx/hardware/lpc54_usart.h
similarity index 99%
rename from arch/arm/src/lpc54xx/chip/lpc54_usart.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_usart.h
index 494f8d268f0..09b20875d3b 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_usart.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_usart.h
@@ -33,15 +33,15 @@
  *
  *****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USART_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USART_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USART_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USART_H
 
 /*****************************************************************************************************
  * Included Files
  *****************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /*****************************************************************************************************
  * Pre-processor Definitions
@@ -417,4 +417,4 @@
 #define USART_ID_ID_SHIFT               (16)      /* Bits 16-31: ID Unique module identifier for this IP block */
 #define USART_ID_ID_MASKX               (0xffff << USART_ID_ID_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USART_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USART_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_usb0_ohci.h b/arch/arm/src/lpc54xx/hardware/lpc54_usb0_ohci.h
similarity index 96%
rename from arch/arm/src/lpc54xx/chip/lpc54_usb0_ohci.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_usb0_ohci.h
index 7e9d48f153d..f2b28c39704 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_usb0_ohci.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_usb0_ohci.h
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USB0_OHCI_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USB0_OHCI_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USB0_OHCI_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USB0_OHCI_H
 
 /************************************************************************************
  * Included Files
@@ -44,7 +44,7 @@
 #include <nuttx/usb/ohci.h>
 
 #include "chip.h"
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -126,4 +126,4 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_USB0_OHCI_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_USB0_OHCI_H */
diff --git a/arch/arm/src/lpc54xx/chip/lpc54_wwdt.h b/arch/arm/src/lpc54xx/hardware/lpc54_wwdt.h
similarity index 96%
rename from arch/arm/src/lpc54xx/chip/lpc54_wwdt.h
rename to arch/arm/src/lpc54xx/hardware/lpc54_wwdt.h
index c292304d308..25c7525f80b 100644
--- a/arch/arm/src/lpc54xx/chip/lpc54_wwdt.h
+++ b/arch/arm/src/lpc54xx/hardware/lpc54_wwdt.h
@@ -33,15 +33,15 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WWDT_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WWDT_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_WWDT_H
+#define __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_WWDT_H
 
 /************************************************************************************
  * Included Files
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -98,4 +98,4 @@
 #define WWDT_WINDOW_MASK            0x00ffffff /* Bits 0-23: Watchdog window value */
                                                /* Bits 24-31: Reserved */
 
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WWDT_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_HARDWARE_LPC54_WWDT_H */
diff --git a/arch/arm/src/lpc54xx/lpc546x_enableclk.h b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
index 95e1d5bd18f..8d95aed5361 100644
--- a/arch/arm/src/lpc54xx/lpc546x_enableclk.h
+++ b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "up_arch.h"
-#include <chip/lpc54_syscon.h>
+#include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc546x_power.h b/arch/arm/src/lpc54xx/lpc546x_power.h
index 8bce39b6301..2a76cb5ec8e 100644
--- a/arch/arm/src/lpc54xx/lpc546x_power.h
+++ b/arch/arm/src/lpc54xx/lpc546x_power.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "up_arch.h"
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_syscon.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc546x_reset.h b/arch/arm/src/lpc54xx/lpc546x_reset.h
index 20ce44619b9..f00eb0fe611 100644
--- a/arch/arm/src/lpc54xx/lpc546x_reset.h
+++ b/arch/arm/src/lpc54xx/lpc546x_reset.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <chip/lpc54_syscon.h>
+#include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
index cfd5a0719fe..d75660e8d1a 100644
--- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c
+++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
@@ -52,7 +52,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/lpc54_memorymap.h"
+#include "hardware/lpc54_memorymap.h"
 #include "lpc54_mpuinit.h"
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.c b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
index c513bd26edd..047742f00d2 100644
--- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c
+++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
@@ -55,7 +55,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_syscon.h"
 #include "lpc54_power.h"
 #include "lpc54_clockconfig.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_dma.c b/arch/arm/src/lpc54xx/lpc54_dma.c
index b21afdf436b..57f675e5016 100644
--- a/arch/arm/src/lpc54xx/lpc54_dma.c
+++ b/arch/arm/src/lpc54xx/lpc54_dma.c
@@ -50,8 +50,8 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/lpc54_inputmux.h"
-#include "chip/lpc54_dma.h"
+#include "hardware/lpc54_inputmux.h"
+#include "hardware/lpc54_dma.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_reset.h"
 #include "lpc54_dma.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_dma.h b/arch/arm/src/lpc54xx/lpc54_dma.h
index 36f938069df..b2a4de0969d 100644
--- a/arch/arm/src/lpc54xx/lpc54_dma.h
+++ b/arch/arm/src/lpc54xx/lpc54_dma.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/lpc54_dma.h"
+#include "hardware/lpc54_dma.h"
 
 #ifdef CONFIG_LPC54_DMA
 
diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c
index 8c9ed357eca..08cd0efd310 100644
--- a/arch/arm/src/lpc54xx/lpc54_emc.c
+++ b/arch/arm/src/lpc54xx/lpc54_emc.c
@@ -52,8 +52,8 @@
 
 #include "up_arch.h"
 
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_emc.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_emc.h"
 #include "lpc54_config.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_reset.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c
index 1f039902f19..bc453793538 100644
--- a/arch/arm/src/lpc54xx/lpc54_ethernet.c
+++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c
@@ -88,9 +88,9 @@
 #endif
 
 #include "up_arch.h"
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_pinmux.h"
-#include "chip/lpc54_ethernet.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_pinmux.h"
+#include "hardware/lpc54_ethernet.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_reset.h"
 #include "lpc54_gpio.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_gpio.c b/arch/arm/src/lpc54xx/lpc54_gpio.c
index b7794efcca9..192f3713862 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpio.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpio.c
@@ -48,8 +48,8 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "chip/lpc54_iocon.h"
-#include "chip/lpc54_gpio.h"
+#include "hardware/lpc54_iocon.h"
+#include "hardware/lpc54_gpio.h"
 #include "lpc54_gpio.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_gpio.h b/arch/arm/src/lpc54xx/lpc54_gpio.h
index 8f44f82c86a..3c64a4012ca 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpio.h
+++ b/arch/arm/src/lpc54xx/lpc54_gpio.h
@@ -49,8 +49,8 @@
 
 #include <arch/lpc54xx/chip.h>
 
-#include "chip/lpc54_gpio.h"
-#include "chip/lpc54_iocon.h"
+#include "hardware/lpc54_gpio.h"
+#include "hardware/lpc54_iocon.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc54_gpioirq.c b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
index 8a0a9749c9c..edb51ae21f9 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpioirq.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
@@ -46,9 +46,9 @@
 
 #include "up_arch.h"
 
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_inputmux.h"
-#include "chip/lpc54_pint.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_inputmux.h"
+#include "hardware/lpc54_pint.h"
 #include "lpc54_gpio.h"
 
 #ifdef CONFIG_LPC54_GPIOIRQ
diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
index 7de42790c64..a2fe53156ac 100644
--- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
@@ -66,10 +66,10 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/lpc54_pinmux.h"
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_flexcomm.h"
-#include "chip/lpc54_i2c.h"
+#include "hardware/lpc54_pinmux.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_flexcomm.h"
+#include "hardware/lpc54_i2c.h"
 #include "lpc54_config.h"
 #include "lpc54_clockconfig.h"
 #include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.h b/arch/arm/src/lpc54xx/lpc54_i2c_master.h
index fc9e80f662a..30e16f08a31 100644
--- a/arch/arm/src/lpc54xx/lpc54_i2c_master.h
+++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/i2c/i2c_master.h>
-#include "chip/lpc54_i2c.h"
+#include "hardware/lpc54_i2c.h"
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c
index 2b8b5aa262c..9c6ef8d3761 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.c
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.c
@@ -50,8 +50,8 @@
 #include <nuttx/video/fb.h>
 
 #include "up_arch.h"
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_pinmux.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_pinmux.h"
 #include "lpc54_config.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_gpio.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.h b/arch/arm/src/lpc54xx/lpc54_lcd.h
index 0ffb53ec813..c79929b6bb2 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.h
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.h
@@ -50,7 +50,7 @@
 
 #include <nuttx/nx/nxglib.h>
 
-#include "chip/lpc54_lcd.h"
+#include "hardware/lpc54_lcd.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c
index f6f41c96f11..d6c70127ae1 100644
--- a/arch/arm/src/lpc54xx/lpc54_lowputc.c
+++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c
@@ -51,11 +51,11 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/lpc54_memorymap.h"
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_flexcomm.h"
-#include "chip/lpc54_pinmux.h"
-#include "chip/lpc54_usart.h"
+#include "hardware/lpc54_memorymap.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_flexcomm.h"
+#include "hardware/lpc54_pinmux.h"
+#include "hardware/lpc54_usart.h"
 
 #include "lpc54_config.h"
 #include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_rng.c b/arch/arm/src/lpc54xx/lpc54_rng.c
index b06d521a463..c61224d47d5 100644
--- a/arch/arm/src/lpc54xx/lpc54_rng.c
+++ b/arch/arm/src/lpc54xx/lpc54_rng.c
@@ -46,7 +46,7 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
-#include "chip/lpc54_rom.h"
+#include "hardware/lpc54_rom.h"
 
 #if defined(CONFIG_LPC54_RNG)
 #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH)
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc.c b/arch/arm/src/lpc54xx/lpc54_rtc.c
index ba23c2ad84f..90494c0edd2 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc.c
@@ -54,7 +54,7 @@
 
 #include "up_arch.h"
 
-#include "chip/lpc54_rtc.h"
+#include "hardware/lpc54_rtc.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_rtc.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
index 8ebaac9f867..beef333cd0d 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
@@ -49,7 +49,7 @@
 
 #include "up_arch.h"
 
-#include "chip/lpc54_rtc.h"
+#include "hardware/lpc54_rtc.h"
 #include "lpc54_rtc.h"
 
 #ifdef CONFIG_RTC_DRIVER
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index 3b51f6a0e4e..e9564431eaf 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -69,8 +69,8 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "chip/lpc54_pinmux.h"
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_pinmux.h"
+#include "hardware/lpc54_syscon.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_gpio.h"
 #include "lpc54_sdmmc.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.h b/arch/arm/src/lpc54xx/lpc54_sdmmc.h
index a56fe2095bc..a4e76b447b3 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.h
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.h
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/lpc54_sdmmc.h"
+#include "hardware/lpc54_sdmmc.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c
index 996affee4ca..1fc746dc97e 100644
--- a/arch/arm/src/lpc54xx/lpc54_serial.c
+++ b/arch/arm/src/lpc54xx/lpc54_serial.c
@@ -59,7 +59,7 @@
 
 #include "chip.h"
 #include "lpc54_config.h"
-#include "chip/lpc54_usart.h"
+#include "hardware/lpc54_usart.h"
 #include "lpc54_clockconfig.h"
 #include "lpc54_lowputc.h"
 #include "lpc54_serial.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c
index 443bcb3333c..40ba2618e8d 100644
--- a/arch/arm/src/lpc54xx/lpc54_spi_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c
@@ -63,10 +63,10 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/lpc54_pinmux.h"
-#include "chip/lpc54_syscon.h"
-#include "chip/lpc54_flexcomm.h"
-#include "chip/lpc54_spi.h"
+#include "hardware/lpc54_pinmux.h"
+#include "hardware/lpc54_syscon.h"
+#include "hardware/lpc54_flexcomm.h"
+#include "hardware/lpc54_spi.h"
 #include "lpc54_config.h"
 #include "lpc54_enableclk.h"
 #include "lpc54_gpio.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_start.c b/arch/arm/src/lpc54xx/lpc54_start.c
index 89c818b1021..0506c71d1e8 100644
--- a/arch/arm/src/lpc54xx/lpc54_start.c
+++ b/arch/arm/src/lpc54xx/lpc54_start.c
@@ -47,7 +47,7 @@
 #include "up_internal.h"
 #include "nvic.h"
 
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_syscon.h"
 #include "lpc54_clockconfig.h"
 #include "lpc54_userspace.h"
 #include "lpc54_lowputc.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c
index 69ef5d2f301..6d054f75937 100644
--- a/arch/arm/src/lpc54xx/lpc54_tickless.c
+++ b/arch/arm/src/lpc54xx/lpc54_tickless.c
@@ -51,7 +51,7 @@
 
 #include "up_arch.h"
 #include "chip.h"
-#include "chip/lpc54_rit.h"
+#include "hardware/lpc54_rit.h"
 
 #ifdef CONFIG_SCHED_TICKLESS
 
diff --git a/arch/arm/src/lpc54xx/lpc54_timerisr.c b/arch/arm/src/lpc54xx/lpc54_timerisr.c
index b6664ff0a9b..8035d3c3a91 100644
--- a/arch/arm/src/lpc54xx/lpc54_timerisr.c
+++ b/arch/arm/src/lpc54xx/lpc54_timerisr.c
@@ -51,7 +51,7 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_syscon.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
index 6942426e642..0a0b8695219 100644
--- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
+++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
@@ -65,8 +65,8 @@
 #include "up_internal.h"
 
 #include "chip.h"
-#include "chip/lpc54_usb.h"
-#include "chip/lpc54_syscon.h"
+#include "hardware/lpc54_usb.h"
+#include "hardware/lpc54_syscon.h"
 #include "lpc54_gpio.h"
 #include "lpc54_ohciram.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.c b/arch/arm/src/lpc54xx/lpc54_wwdt.c
index 867b2220e73..015e53a36a9 100644
--- a/arch/arm/src/lpc54xx/lpc54_wwdt.c
+++ b/arch/arm/src/lpc54xx/lpc54_wwdt.c
@@ -49,7 +49,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "chip/lpc54_wwdt.h"
+#include "hardware/lpc54_wwdt.h"
 #include "lpc54_power.h"
 #include "lpc54_wdt.h"
 
diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.h b/arch/arm/src/lpc54xx/lpc54_wwdt.h
index baffd8c167e..e4f5122d9f2 100644
--- a/arch/arm/src/lpc54xx/lpc54_wwdt.h
+++ b/arch/arm/src/lpc54xx/lpc54_wwdt.h
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WDT_H
-#define __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WDT_H
+#ifndef __ARCH_ARM_SRC_LPC54XX_LPC54_WDT_H
+#define __ARCH_ARM_SRC_LPC54XX_LPC54_WDT_H
 
 /****************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/lpc54_wdt.h"
+#include "hardware/lpc54_wdt.h"
 
 #ifdef CONFIG_WATCHDOG
 
@@ -94,4 +94,4 @@ void lpc54_wwdt_initialize(FAR const char *devpath);
 
 #endif /* __ASSEMBLY__ */
 #endif /* CONFIG_WATCHDOG */
-#endif /* __ARCH_ARM_SRC_LPC54XX_CHIP_LPC54_WDT_H */
+#endif /* __ARCH_ARM_SRC_LPC54XX_LPC54_WDT_H */
diff --git a/configs/lpcxpresso-lpc54628/src/lpc54_sdram.c b/configs/lpcxpresso-lpc54628/src/lpc54_sdram.c
index febfbec82f9..5e50b8367c6 100644
--- a/configs/lpcxpresso-lpc54628/src/lpc54_sdram.c
+++ b/configs/lpcxpresso-lpc54628/src/lpc54_sdram.c
@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/lpc54_pinmux.h"
+#include "hardware/lpc54_pinmux.h"
 #include "lpc54_gpio.h"
 #include "lpc54_emc.h"
 #include "lpcxpresso-lpc54628.h"