diff --git a/arch/arm/src/stm32h7/chip.h b/arch/arm/src/stm32h7/chip.h
index dd898463352..7326b8eb959 100644
--- a/arch/arm/src/stm32h7/chip.h
+++ b/arch/arm/src/stm32h7/chip.h
@@ -48,8 +48,8 @@
 
 #include <arch/irq.h>
 #include <arch/stm32h7/chip.h>
-#include "chip/stm32_pinmap.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_pinmap.h"
+#include "hardware/stm32_memorymap.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/chip/stm32_bdma.h b/arch/arm/src/stm32h7/hardware/stm32_bdma.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32_bdma.h
rename to arch/arm/src/stm32h7/hardware/stm32_bdma.h
index e6b3fe52753..b989a460a5b 100644
--- a/arch/arm/src/stm32h7/chip/stm32_bdma.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_bdma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_bdma.h
+ * arch/arm/src/stm32h7/hardware/stm32_bdma.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_BDMA_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_BDMA_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_BDMA_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_BDMA_H
 
 /************************************************************************************
  * Included Files
@@ -260,4 +260,4 @@
 #define BDMA_CNDTR_NDT_SHIFT       (0)       /* Bits 15-0: Number of data to Transfer */
 #define BDMA_CNDTR_NDT_MASK        (0xffff << BDMA_CNDTR_NDT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_BDMA_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_BDMA_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_dma.h b/arch/arm/src/stm32h7/hardware/stm32_dma.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32_dma.h
rename to arch/arm/src/stm32h7/hardware/stm32_dma.h
index ceeb5121160..94d7ed754ae 100644
--- a/arch/arm/src/stm32h7/chip/stm32_dma.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_dma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_dma.h
+ * arch/arm/src/stm32h7/hardware/stm32_dma.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMA_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMA_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMA_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMA_H
 
 /************************************************************************************
  * Included Files
@@ -373,4 +373,4 @@
 #define DMA_SFCR_FEIE             (1 << 7)  /* Bit 7:  FIFO error interrupt enable */
                                             /* Bits 8-31: Reserved */
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMA_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMA_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_dmamux.h b/arch/arm/src/stm32h7/hardware/stm32_dmamux.h
similarity index 97%
rename from arch/arm/src/stm32h7/chip/stm32_dmamux.h
rename to arch/arm/src/stm32h7/hardware/stm32_dmamux.h
index 10b6642e290..2e533e92119 100644
--- a/arch/arm/src/stm32h7/chip/stm32_dmamux.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_dmamux.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_dmamux.h
+ * arch/arm/src/stm32h7/hardware/stm32_dmamux.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMAMUX_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMAMUX_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMAMUX_H
 
 /************************************************************************************
  * Included Files
@@ -203,9 +203,9 @@
 /* Import DMAMUX map */
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_dmamux.h"
+#  include "hardware/stm32h7x3xx_dmamux.h"
 #else
 #  error "Unsupported STM32 H7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_DMAMUX_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_ethernet.h b/arch/arm/src/stm32h7/hardware/stm32_ethernet.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32_ethernet.h
rename to arch/arm/src/stm32h7/hardware/stm32_ethernet.h
index 4f1dfe5f155..c82dc805978 100644
--- a/arch/arm/src/stm32h7/chip/stm32_ethernet.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_ethernet.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_ethernet.h
+ * arch/arm/src/stm32h7/hardware/stm32_ethernet.h
  *
  *   Authors: Jukka Laitinen <jukka.laitinen@iki.fi>
  *
@@ -32,8 +32,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_ETHERNET_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_ETHERNET_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_ETHERNET_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_ETHERNET_H
 
 /****************************************************************************************************
  * Included Files
@@ -673,4 +673,4 @@ struct eth_desc_s
 
 #endif /* __ASSEMBLY__ */
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_ETHERNET_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_ETHERNET_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_exti.h b/arch/arm/src/stm32h7/hardware/stm32_exti.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32_exti.h
rename to arch/arm/src/stm32h7/hardware/stm32_exti.h
index 716572fd5fc..e115c2b63dd 100644
--- a/arch/arm/src/stm32h7/chip/stm32_exti.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_exti.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_exti.h
+ * arch/arm/src/stm32h7/hardware/stm32_exti.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_EXTI_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_EXTI_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_EXTI_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_EXTI_H
 
 /************************************************************************************
  * Included Files
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 
 /* Content of this file requires verification before it is used with other
  * families
@@ -246,4 +246,4 @@
 #define EXTI_EVENT_HSECSS           87  /* HSECSS interrupt */
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_EXTI_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_EXTI_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_flash.h b/arch/arm/src/stm32h7/hardware/stm32_flash.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_flash.h
rename to arch/arm/src/stm32h7/hardware/stm32_flash.h
index 131503038ff..d32488465a0 100644
--- a/arch/arm/src/stm32h7/chip/stm32_flash.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_flash.h
+ * arch/arm/src/stm32h7/hardware/stm32_flash.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_FLASH_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_FLASH_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_FLASH_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_flash.h"
+#  include "hardware/stm32h7x3xx_flash.h"
 #else
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_FLASH_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_gpio.h b/arch/arm/src/stm32h7/hardware/stm32_gpio.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_gpio.h
rename to arch/arm/src/stm32h7/hardware/stm32_gpio.h
index 12d11946499..e9aec1d858d 100644
--- a/arch/arm/src/stm32h7/chip/stm32_gpio.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_gpio.h
+ * arch/arm/src/stm32h7/hardware/stm32_gpio.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_GPIO_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_GPIO_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_gpio.h"
+#  include "hardware/stm32h7x3xx_gpio.h"
 #else
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_GPIO_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_i2c.h b/arch/arm/src/stm32h7/hardware/stm32_i2c.h
similarity index 90%
rename from arch/arm/src/stm32h7/chip/stm32_i2c.h
rename to arch/arm/src/stm32h7/hardware/stm32_i2c.h
index 2e9428e5f33..f2681236f57 100644
--- a/arch/arm/src/stm32h7/chip/stm32_i2c.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_i2c.h
+ * arch/arm/src/stm32h7/hardware/stm32_i2c.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_I2C_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_I2C_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_I2C_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_I2C_H
 
 /************************************************************************************
  * Included Files
@@ -46,9 +46,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_i2c.h"
+#  include "hardware/stm32h7x3xx_i2c.h"
 #else
 #  error "Unsupported STM32 H7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_I2C_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_mdma.h b/arch/arm/src/stm32h7/hardware/stm32_mdma.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32_mdma.h
rename to arch/arm/src/stm32h7/hardware/stm32_mdma.h
index 49e63d79c3f..2c3d86934d5 100644
--- a/arch/arm/src/stm32h7/chip/stm32_mdma.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_mdma.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_mdma.h
+ * arch/arm/src/stm32h7/hardware/stm32_mdma.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MDMA_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MDMA_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MDMA_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MDMA_H
 
 /************************************************************************************
  * Included Files
@@ -644,4 +644,4 @@
 #define MDMA_TSEL_SBUS            (16) /* Bit 16: Source BUS select */
 #define MDMA_TSEL_DBUS            (17) /* Bit 16: Destination BUS select */
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MDMA_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MDMA_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_memorymap.h b/arch/arm/src/stm32h7/hardware/stm32_memorymap.h
similarity index 88%
rename from arch/arm/src/stm32h7/chip/stm32_memorymap.h
rename to arch/arm/src/stm32h7/hardware/stm32_memorymap.h
index a9b42df39f4..1148a82591d 100644
--- a/arch/arm/src/stm32h7/chip/stm32_memorymap.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_memorymap.h
+ * arch/arm/src/stm32h7/hardware/stm32_memorymap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -45,9 +45,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_memorymap.h"
+#  include "hardware/stm32h7x3xx_memorymap.h"
 #else
 #  error "Unsupported STM32 H7 memory map"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_otg.h b/arch/arm/src/stm32h7/hardware/stm32_otg.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32_otg.h
rename to arch/arm/src/stm32h7/hardware/stm32_otg.h
index 9fb727138aa..d6b6fbfe185 100644
--- a/arch/arm/src/stm32h7/chip/stm32_otg.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_otg.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_otg.h
+ * arch/arm/src/stm32h7/hardware/stm32_otg.h
  * based on stm32f7/chip/stm32_otg.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
-#define __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_OTG_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_OTG_H
 
 /************************************************************************************
  * Included Files
@@ -929,4 +929,4 @@
 #define OTG_PCGCCTL_SUSP              (1 << 7)  /* Bit 7: PHY Suspended */
                                                 /* Bits 7-31: Reserved */
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32_OTG_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_OTG_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_pinmap.h b/arch/arm/src/stm32h7/hardware/stm32_pinmap.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_pinmap.h
rename to arch/arm/src/stm32h7/hardware/stm32_pinmap.h
index d4676dc5041..51c9aaeb57c 100644
--- a/arch/arm/src/stm32h7/chip/stm32_pinmap.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_pinmap.h
+ * arch/arm/src/stm32h7/hardware/stm32_pinmap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PINMAP_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PINMAP_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -44,10 +44,10 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_pinmap.h"
+#  include "hardware/stm32h7x3xx_pinmap.h"
 #else
 #  error "Unsupported STM32 H7 Pin map"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PINMAP_H */
 
diff --git a/arch/arm/src/stm32h7/chip/stm32_pwr.h b/arch/arm/src/stm32h7/hardware/stm32_pwr.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_pwr.h
rename to arch/arm/src/stm32h7/hardware/stm32_pwr.h
index 64d7bbe07d4..39e7de5487e 100644
--- a/arch/arm/src/stm32h7/chip/stm32_pwr.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_pwr.h
+ * arch/arm/src/stm32h7/hardware/stm32_pwr.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PWR_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PWR_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PWR_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_pwr.h"
+#  include "hardware/stm32h7x3xx_pwr.h"
 #else
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_PWR_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_rcc.h b/arch/arm/src/stm32h7/hardware/stm32_rcc.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_rcc.h
rename to arch/arm/src/stm32h7/hardware/stm32_rcc.h
index a6bedbe8fc2..a9584396a25 100644
--- a/arch/arm/src/stm32h7/chip/stm32_rcc.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_rcc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_rcc.h
+ * arch/arm/src/stm32h7/hardware/stm32_rcc.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_RCC_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_RCC_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_RCC_H
 
 /************************************************************************************
  * Included Files
@@ -45,9 +45,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_rcc.h"
+#  include "hardware/stm32h7x3xx_rcc.h"
 #else
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_RCC_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_sdmmc.h b/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h
similarity index 91%
rename from arch/arm/src/stm32h7/chip/stm32_sdmmc.h
rename to arch/arm/src/stm32h7/hardware/stm32_sdmmc.h
index e258ac9d7c9..752b226086a 100644
--- a/arch/arm/src/stm32h7/chip/stm32_sdmmc.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_sdmmc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_sdmmc.h
+ * arch/arm/src/stm32h7/hardware/stm32_sdmmc.h
  *
  *   Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SDMMC_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SDMMC_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SDMMC_H
 
 /************************************************************************************
  * Included Files
@@ -51,4 +51,4 @@
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SDMMC_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_spi.h b/arch/arm/src/stm32h7/hardware/stm32_spi.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_spi.h
rename to arch/arm/src/stm32h7/hardware/stm32_spi.h
index 8eab3d9167d..29f8ad73c7b 100644
--- a/arch/arm/src/stm32h7/chip/stm32_spi.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_spi.h
+ * arch/arm/src/stm32h7/hardware/stm32_spi.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SPI_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SPI_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_spi.h"
+#  include "hardware/stm32h7x3xx_spi.h"
 #else
 #  error "Unsupported STM32 H7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SPI_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_syscfg.h b/arch/arm/src/stm32h7/hardware/stm32_syscfg.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_syscfg.h
rename to arch/arm/src/stm32h7/hardware/stm32_syscfg.h
index bbd13bbf307..fdab6b1d387 100644
--- a/arch/arm/src/stm32h7/chip/stm32_syscfg.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_syscfg.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_syscfg.h
+ * arch/arm/src/stm32h7/hardware/stm32_syscfg.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SYSCFG_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_syscfg.h"
+#  include "hardware/stm32h7x3xx_syscfg.h"
 #else
 #  error "Unsupported STM32 H7 part"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_SYSCFG_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_tim.h b/arch/arm/src/stm32h7/hardware/stm32_tim.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_tim.h
rename to arch/arm/src/stm32h7/hardware/stm32_tim.h
index 0be2ea2592c..bed1c75eb83 100644
--- a/arch/arm/src/stm32h7/chip/stm32_tim.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_tim.h
+ * arch/arm/src/stm32h7/hardware/stm32_tim.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_TIM_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_TIM_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_TIM_H
 
 /****************************************************************************
  * Included Files
@@ -45,9 +45,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_tim.h"
+#  include "hardware/stm32h7x3xx_tim.h"
 #else
 #  error "Unsupported STM32 H7 sub family"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_TIM_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32_uart.h b/arch/arm/src/stm32h7/hardware/stm32_uart.h
similarity index 89%
rename from arch/arm/src/stm32h7/chip/stm32_uart.h
rename to arch/arm/src/stm32h7/hardware/stm32_uart.h
index 998c5861bc1..7929e07b304 100644
--- a/arch/arm/src/stm32h7/chip/stm32_uart.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32_uart.h
+ * arch/arm/src/stm32h7/hardware/stm32_uart.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32_UART_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32_UART_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_UART_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_UART_H
 
 /************************************************************************************
  * Included Files
@@ -44,9 +44,9 @@
 #include "chip.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
-#  include "chip/stm32h7x3xx_uart.h"
+#  include "hardware/stm32h7x3xx_uart.h"
 #else
 #  error "Unsupported STM32 H7 memory map"
 #endif
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32_UART_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_dmamux.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_dmamux.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_dmamux.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_dmamux.h
index 5d7bd9bcbac..04c4e7d95af 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_dmamux.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_dmamux.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_dmamux.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_dmamux.h
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_DMAMUX_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_DMAMUX_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_DMAMUX_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_DMAMUX_H
 
 /************************************************************************************
  * Included Files
@@ -501,4 +501,4 @@
 #define DMAMAP_BDMA_SAI4B          DMAMAP_MAP(BDMA, DMAMUX2_SAI4B)
 #define DMAMAP_BDMA_ADC3           DMAMAP_MAP(BDMA, DMAMUX2_ADC3)
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_DMAMUX_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_DMAMUX_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_flash.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_flash.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_flash.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_flash.h
index e2f389c516d..703ad400380 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_flash.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_flash.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_flash.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_flash.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_FLASH_H
-#define __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_FLASH_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_FLASH_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_FLASH_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -261,4 +261,4 @@
 
 /* TODO: Flash CRC End Address Register (CRCSEDDR) */
 
-#endif /* __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_FLASH_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_FLASH_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_gpio.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_gpio.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h
index 78168e2059f..78f8087928a 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_gpio.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_gpio.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_gpio.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_GPIO_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_GPIO_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_GPIO_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_GPIO_H
 
 /************************************************************************************
  * Included Files
@@ -400,4 +400,4 @@
 #define GPIO_AFRH15_MASK           (15 << GPIO_AFRH15_SHIFT)
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_GPIO_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_GPIO_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_i2c.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_i2c.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
index f51aeb7c1e0..d9b7990fc20 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_i2c.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_i2c.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_i2c.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -260,4 +260,4 @@
 
 #define I2C_TXDR_MASK             (0xff)
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_I2C_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_I2C_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_memorymap.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_memorymap.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_memorymap.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_memorymap.h
index 804fda6b1b0..6f2c5361dee 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_memorymap.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_memorymap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm3fr2/chip/stm32h7x3xx_memorymap.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_memorymap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_MEMORYMAP_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_MEMORYMAP_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_MEMORYMAP_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_MEMORYMAP_H
 
 /************************************************************************************
  * Included Files
@@ -234,4 +234,4 @@
 #define STM32_SYSMEM_UID       0x1ff1e800
 #define STM32_DEBUGMCU_BASE    0xe00e1000
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_MEMORYMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_MEMORYMAP_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_pinmap.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_pinmap.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h
index af262258a38..dd2fd742519 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_pinmap.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h76xx77xx_pinmap.h
+ * arch/arm/src/stm32h7/hardware/stm32h76xx77xx_pinmap.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32_CHIP_STM32H7X3XX_PINMAP_H
-#define __ARCH_ARM_SRC_STM32_CHIP_STM32H7X3XX_PINMAP_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PINMAP_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PINMAP_H
 
 /************************************************************************************
  * Included Files
@@ -1479,4 +1479,4 @@
 #define GPIO_UART8_TX_2           (GPIO_ALT|GPIO_AF8|GPIO_SPEED_100MHz|GPIO_PUSHPULL|GPIO_PULLUP|GPIO_PORTJ|GPIO_PIN8)
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32_CHIP_STM32H7X3XX_PINMAP_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PINMAP_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_pwr.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pwr.h
similarity index 96%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_pwr.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_pwr.h
index 5e466a1f2be..7192cd1325c 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_pwr.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_pwr.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_pwr.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_pwr.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_PWR_H
-#define __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_PWR_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PWR_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PWR_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -130,4 +130,4 @@
 
 /* Power wakeup enable and polarity register (WKUPEPR) */
 
-#endif /* __ARCH_ARM_SRC_STM327_CHIP_STM32H7X3XX_PWR_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_PWR_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_rcc.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_rcc.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_rcc.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_rcc.h
index 133174586a0..6691fa5642d 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_rcc.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_rcc.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_rcc.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_rcc.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_RCC_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_RCC_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_RCC_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_RCC_H
 
 /****************************************************************************************************
  * Included Files
@@ -1123,4 +1123,4 @@
 #define RCC_BDCR_RTCEN                  (1 << 15) /* Bit 15: RTC clock enable */
 #define RCC_BDCR_BDRST                  (1 << 16) /* Bit 16: Backup domain software reset */
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_RCC_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_RCC_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_sdmmc.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_sdmmc.h
similarity index 98%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_sdmmc.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_sdmmc.h
index 99fc5adcef2..0f165c54130 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_sdmmc.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_sdmmc.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_sdmmc.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_sdmmc.h
  *
  *   Copyright (C) 2009, 2011-2016, 2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SDMMC_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SDMMC_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SDMMC_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SDMMC_H
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -243,4 +243,4 @@
 #define STM32_SDMMC_FIFOCNT_SHIFT             (0)
 #define STM32_SDMMC_FIFOCNT_MASK              (0x0ffffff << STM32_SDMMC_FIFOCNT_SHIFT)
 
-#endif /* __ARCH_ARM_SRC_STM32F7_CHIP_STM32H7X3XX_SDMMC_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SDMMC_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_spi.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_spi.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h
index 3f68dc45710..adc8e857806 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_spi.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_spi.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_spi.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Mateusz Szafoni <raiden00@railab.me>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SPI_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SPI_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SPI_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SPI_H
 
 /************************************************************************************
  * Included Files
@@ -451,4 +451,4 @@
 
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SPI_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SPI_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_syscfg.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_syscfg.h
similarity index 97%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_syscfg.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_syscfg.h
index c2a8e547ba1..fed8d8390d8 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_syscfg.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_syscfg.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_syscfg.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_syscfg.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SYSCFG_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SYSCFG_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SYSCFG_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SYSCFG_H
 
 /****************************************************************************************************
  * Included Files
@@ -43,7 +43,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
 
@@ -210,4 +210,4 @@
 #define SYSCFG_UR17_
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_SYSCFG_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_SYSCFG_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_tim.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_tim.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_tim.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_tim.h
index b2211da4a8c..8804d1d3dba 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_tim.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_tim.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_tim.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_tim.h
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -35,8 +35,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_TIM_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_TIM_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_TIM_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_TIM_H
 
 /****************************************************************************************************
  * Pre-processor Definitions
@@ -1145,4 +1145,4 @@
 
 #define BTIM_EGR_UG               (1 << 0)  /* Bit 0: Update generation */
 
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_TIM_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_TIM_H */
diff --git a/arch/arm/src/stm32h7/chip/stm32h7x3xx_uart.h b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h
similarity index 99%
rename from arch/arm/src/stm32h7/chip/stm32h7x3xx_uart.h
rename to arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h
index fc93b15c6eb..0d51cb4b8b5 100644
--- a/arch/arm/src/stm32h7/chip/stm32h7x3xx_uart.h
+++ b/arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h
@@ -1,5 +1,5 @@
 /************************************************************************************
- * arch/arm/src/stm32h7/chip/stm32h7x3xx_uart.h
+ * arch/arm/src/stm32h7/hardware/stm32h7x3xx_uart.h
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_UART_H
-#define __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_UART_H
+#ifndef __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_UART_H
+#define __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_UART_H
 
 /************************************************************************************
  * Included Files
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 #include "chip.h"
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 
 #if defined(CONFIG_STM32H7_STM32H7X3XX)
 
@@ -423,4 +423,4 @@
 # define USART_PRESC_DIV256       (11 << USART_PRESC_SHIFT) /* Input clock divided by 256 */
 
 #endif /* CONFIG_STM32H7_STM32H7X3XX */
-#endif /* __ARCH_ARM_SRC_STM32H7_CHIP_STM32H7X3XX_UART_H */
+#endif /* __ARCH_ARM_SRC_STM32H7_HARDWARE_STM32H7X3XX_UART_H */
diff --git a/arch/arm/src/stm32h7/stm32_allocateheap.c b/arch/arm/src/stm32h7/stm32_allocateheap.c
index 5b81a89b343..cbc1456d614 100644
--- a/arch/arm/src/stm32h7/stm32_allocateheap.c
+++ b/arch/arm/src/stm32h7/stm32_allocateheap.c
@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/stm32_memorymap.h"
+#include "hardware/stm32_memorymap.h"
 #include "stm32_mpuinit.h"
 // TODO: #include "stm32_dtcm.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_dma.c b/arch/arm/src/stm32h7/stm32_dma.c
index 8fba91912e0..d26758e5c55 100644
--- a/arch/arm/src/stm32h7/stm32_dma.c
+++ b/arch/arm/src/stm32h7/stm32_dma.c
@@ -53,9 +53,9 @@
 #include "up_internal.h"
 #include "sched/sched.h"
 #include "stm32_dma.h"
-#include "chip/stm32_bdma.h"
-#include "chip/stm32_mdma.h"
-#include "chip/stm32_dmamux.h"
+#include "hardware/stm32_bdma.h"
+#include "hardware/stm32_mdma.h"
+#include "hardware/stm32_dmamux.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_dma.h b/arch/arm/src/stm32h7/stm32_dma.h
index f6376461da0..94c67666a7c 100644
--- a/arch/arm/src/stm32h7/stm32_dma.h
+++ b/arch/arm/src/stm32h7/stm32_dma.h
@@ -43,8 +43,8 @@
 #include <nuttx/config.h>
 #include <sys/types.h>
 
-#include "chip/stm32_dma.h"
-#include "chip/stm32_dmamux.h"
+#include "hardware/stm32_dma.h"
+#include "hardware/stm32_dmamux.h"
 
 /* These definitions provide the bit encoding of the 'status' parameter passed to the
  * DMA callback function (see dma_callback_t).
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c
index eb3b0d5559d..84ef06053c6 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.c
+++ b/arch/arm/src/stm32h7/stm32_ethernet.c
@@ -67,8 +67,8 @@
 #include "up_internal.h"
 #include "barriers.h"
 
-#include "chip/stm32_syscfg.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_syscfg.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_gpio.h"
 #include "stm32_rcc.h"
 #include "stm32_ethernet.h"
diff --git a/arch/arm/src/stm32h7/stm32_ethernet.h b/arch/arm/src/stm32h7/stm32_ethernet.h
index 6e12eb84d74..fdb1ad51a98 100644
--- a/arch/arm/src/stm32h7/stm32_ethernet.h
+++ b/arch/arm/src/stm32h7/stm32_ethernet.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/stm32_ethernet.h"
+#include "hardware/stm32_ethernet.h"
 
 #if STM32H7_NETHERNET > 0
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/src/stm32h7/stm32_exti.h b/arch/arm/src/stm32h7/stm32_exti.h
index 4b0ea9555d9..981974581f3 100644
--- a/arch/arm/src/stm32h7/stm32_exti.h
+++ b/arch/arm/src/stm32h7/stm32_exti.h
@@ -45,7 +45,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "chip/stm32_exti.h"
+#include "hardware/stm32_exti.h"
 
 /****************************************************************************
  * Public Data
diff --git a/arch/arm/src/stm32h7/stm32_gpio.c b/arch/arm/src/stm32h7/stm32_gpio.c
index 31920c355af..ee708b78e28 100644
--- a/arch/arm/src/stm32h7/stm32_gpio.c
+++ b/arch/arm/src/stm32h7/stm32_gpio.c
@@ -50,7 +50,7 @@
 
 #include "up_arch.h"
 
-#include "chip/stm32_syscfg.h"
+#include "hardware/stm32_syscfg.h"
 #include "stm32_gpio.h"
 
 /* Content of this file requires verification before it is used with other
diff --git a/arch/arm/src/stm32h7/stm32_gpio.h b/arch/arm/src/stm32h7/stm32_gpio.h
index 99d5eb7fa28..d9207ee6f69 100644
--- a/arch/arm/src/stm32h7/stm32_gpio.h
+++ b/arch/arm/src/stm32h7/stm32_gpio.h
@@ -50,7 +50,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "chip/stm32_gpio.h"
+#include "hardware/stm32_gpio.h"
 
 /************************************************************************************
  * Pre-Processor Declarations
diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c
index a26154a6b33..94e96af3d5a 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.c
+++ b/arch/arm/src/stm32h7/stm32_i2c.c
@@ -223,7 +223,7 @@
 #include "stm32_rcc.h"
 #include "stm32_i2c.h"
 #include "stm32_gpio.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 
 /* At least one I2C peripheral must be enabled */
 
diff --git a/arch/arm/src/stm32h7/stm32_i2c.h b/arch/arm/src/stm32h7/stm32_i2c.h
index 7c6847f8302..3013d46bde3 100644
--- a/arch/arm/src/stm32h7/stm32_i2c.h
+++ b/arch/arm/src/stm32h7/stm32_i2c.h
@@ -44,7 +44,7 @@
 #include <nuttx/i2c/i2c_master.h>
 
 #include "chip.h"
-#include "chip/stm32_i2c.h"
+#include "hardware/stm32_i2c.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_lowputc.c b/arch/arm/src/stm32h7/stm32_lowputc.c
index 25e400bd504..58310e488a3 100644
--- a/arch/arm/src/stm32h7/stm32_lowputc.c
+++ b/arch/arm/src/stm32h7/stm32_lowputc.c
@@ -46,7 +46,7 @@
 
 #include "chip.h"
 
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
 #include "stm32_uart.h"
diff --git a/arch/arm/src/stm32h7/stm32_otg.h b/arch/arm/src/stm32h7/stm32_otg.h
index e006a7bf63d..28312364542 100644
--- a/arch/arm/src/stm32h7/stm32_otg.h
+++ b/arch/arm/src/stm32h7/stm32_otg.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 
 #include "chip.h"
-#include "chip/stm32_otg.h"
+#include "hardware/stm32_otg.h"
 
 #if defined(CONFIG_STM32H7_OTGFS) || defined(CONFIG_STM32H7_OTGHS)
 
diff --git a/arch/arm/src/stm32h7/stm32_otgdev.c b/arch/arm/src/stm32h7/stm32_otgdev.c
index cb78e960ca8..3350ea4de78 100644
--- a/arch/arm/src/stm32h7/stm32_otgdev.c
+++ b/arch/arm/src/stm32h7/stm32_otgdev.c
@@ -58,7 +58,7 @@
 #include <nuttx/irq.h>
 #include <arch/board/board.h>
 
-#include "chip/stm32_pwr.h"
+#include "hardware/stm32_pwr.h"
 #include "chip.h"
 #include "stm32_rcc.h"
 #include "stm32_gpio.h"
diff --git a/arch/arm/src/stm32h7/stm32_otghost.c b/arch/arm/src/stm32h7/stm32_otghost.c
index 6c6903f2999..97c8b9e67dc 100644
--- a/arch/arm/src/stm32h7/stm32_otghost.c
+++ b/arch/arm/src/stm32h7/stm32_otghost.c
@@ -69,7 +69,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/stm32_pwr.h"
+#include "hardware/stm32_pwr.h"
 #include "stm32_gpio.h"
 #include "stm32_otg.h"
 #include "stm32_usbhost.h"
diff --git a/arch/arm/src/stm32h7/stm32_pwr.h b/arch/arm/src/stm32h7/stm32_pwr.h
index f6f1b31e21a..9b024297dac 100644
--- a/arch/arm/src/stm32h7/stm32_pwr.h
+++ b/arch/arm/src/stm32h7/stm32_pwr.h
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_pwr.h"
+#include "hardware/stm32_pwr.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_rcc.c b/arch/arm/src/stm32h7/stm32_rcc.c
index b82f9134fdf..e8c09894965 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.c
+++ b/arch/arm/src/stm32h7/stm32_rcc.c
@@ -50,7 +50,7 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/stm32_flash.h"
+#include "hardware/stm32_flash.h"
 #include "stm32_rcc.h"
 #include "stm32_pwr.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_rcc.h b/arch/arm/src/stm32h7/stm32_rcc.h
index 9a51833405f..afb36bc875e 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.h
+++ b/arch/arm/src/stm32h7/stm32_rcc.h
@@ -44,7 +44,7 @@
 
 #include "up_arch.h"
 
-#include "chip/stm32_rcc.h"
+#include "hardware/stm32_rcc.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.h b/arch/arm/src/stm32h7/stm32_sdmmc.h
index 32a35a6bac3..b295a6a906d 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.h
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.h
@@ -45,7 +45,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_sdmmc.h"
+#include "hardware/stm32_sdmmc.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c
index a63beaadee8..09d2c84bc46 100644
--- a/arch/arm/src/stm32h7/stm32_serial.c
+++ b/arch/arm/src/stm32h7/stm32_serial.c
@@ -64,7 +64,7 @@
 
 #include "chip.h"
 #include "stm32_gpio.h"
-#include "chip/stm32_pinmap.h"
+#include "hardware/stm32_pinmap.h"
 #include "stm32_rcc.h"
 #include "stm32_uart.h"
 
diff --git a/arch/arm/src/stm32h7/stm32_spi.h b/arch/arm/src/stm32h7/stm32_spi.h
index c536504c7c5..6d5183010bd 100644
--- a/arch/arm/src/stm32h7/stm32_spi.h
+++ b/arch/arm/src/stm32h7/stm32_spi.h
@@ -47,7 +47,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/stm32_spi.h"
+#include "hardware/stm32_spi.h"
 
 /************************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32h7/stm32_tim.h b/arch/arm/src/stm32h7/stm32_tim.h
index c8c9cbe0faf..ab935cdbbf7 100644
--- a/arch/arm/src/stm32h7/stm32_tim.h
+++ b/arch/arm/src/stm32h7/stm32_tim.h
@@ -48,7 +48,7 @@
 #include <nuttx/config.h>
 
 #include "chip.h"
-#include "chip/stm32_tim.h"
+#include "hardware/stm32_tim.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/stm32h7/stm32_uart.h b/arch/arm/src/stm32h7/stm32_uart.h
index 874fcfedd43..bdd6bc9d81e 100644
--- a/arch/arm/src/stm32h7/stm32_uart.h
+++ b/arch/arm/src/stm32h7/stm32_uart.h
@@ -43,7 +43,7 @@
 #include <nuttx/config.h>
 #include <nuttx/serial/serial.h>
 
-#include "chip/stm32_uart.h"
+#include "hardware/stm32_uart.h"
 
 /************************************************************************************
  * Pre-processor Definitions