From 9839f8ad91ce886f9fc97414d9a7a1ee800c0685 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 24 May 2019 18:51:49 -0600
Subject: [PATCH] Rename arch/arm/src/efm32/chip to
 arch/arm/src/efm32/hardware.

---
 arch/arm/src/efm32/efm32_adc.h                            | 2 +-
 arch/arm/src/efm32/efm32_bitband.h                        | 2 +-
 arch/arm/src/efm32/efm32_clockconfig.c                    | 6 +++---
 arch/arm/src/efm32/efm32_dma.c                            | 4 ++--
 arch/arm/src/efm32/efm32_dma.h                            | 2 +-
 arch/arm/src/efm32/efm32_flash.c                          | 4 ++--
 arch/arm/src/efm32/efm32_gpio.c                           | 2 +-
 arch/arm/src/efm32/efm32_gpioirq.c                        | 2 +-
 arch/arm/src/efm32/efm32_i2c.c                            | 4 ++--
 arch/arm/src/efm32/efm32_leserial.c                       | 2 +-
 arch/arm/src/efm32/efm32_lowputc.c                        | 8 ++++----
 arch/arm/src/efm32/efm32_pwm.c                            | 4 ++--
 arch/arm/src/efm32/efm32_pwm.h                            | 2 +-
 arch/arm/src/efm32/efm32_rmu.c                            | 4 ++--
 arch/arm/src/efm32/efm32_rmu.h                            | 2 +-
 arch/arm/src/efm32/efm32_rtc_burtc.c                      | 2 +-
 arch/arm/src/efm32/efm32_serial.c                         | 2 +-
 arch/arm/src/efm32/efm32_spi.c                            | 2 +-
 arch/arm/src/efm32/efm32_timer.c                          | 2 +-
 arch/arm/src/efm32/efm32_timer.h                          | 2 +-
 arch/arm/src/efm32/efm32_usb.h                            | 2 +-
 arch/arm/src/efm32/efm32_usbdev.c                         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_acmp.h        | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_adc.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_aes.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_burtc.h       | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_calibrate.h   | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_cmu.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_dac.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_devinfo.h     | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_dma.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_emu.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_flash.h       | 0
 arch/arm/src/efm32/{chip => hardware}/efm32_gpio.h        | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_i2c.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_lcd.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_lesense.h     | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_letimer.h     | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_leuart.h      | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_memorymap.h   | 6 +++---
 arch/arm/src/efm32/{chip => hardware}/efm32_msc.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_pcnt.h        | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_prs.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_rmu.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_romtable.h    | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_rtc.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_timer.h       | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_usart.h       | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_usb.h         | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_vcmp.h        | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32_wdog.h        | 2 +-
 arch/arm/src/efm32/{chip => hardware}/efm32g_memorymap.h  | 0
 arch/arm/src/efm32/{chip => hardware}/efm32gg_memorymap.h | 0
 arch/arm/src/efm32/{chip => hardware}/efm32tg_memorymap.h | 0
 configs/efm32-g8xx-stk/include/board.h                    | 4 ++--
 configs/efm32gg-stk3700/include/board.h                   | 4 ++--
 configs/olimex-efm32g880f128-stk/include/board.h          | 4 ++--
 57 files changed, 68 insertions(+), 68 deletions(-)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_acmp.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_adc.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_aes.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_burtc.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_calibrate.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_cmu.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_dac.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_devinfo.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_dma.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_emu.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_flash.h (100%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_gpio.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_i2c.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_lcd.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_lesense.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_letimer.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_leuart.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_memorymap.h (95%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_msc.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_pcnt.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_prs.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_rmu.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_romtable.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_rtc.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_timer.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_usart.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_usb.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_vcmp.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32_wdog.h (99%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32g_memorymap.h (100%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32gg_memorymap.h (100%)
 rename arch/arm/src/efm32/{chip => hardware}/efm32tg_memorymap.h (100%)

diff --git a/arch/arm/src/efm32/efm32_adc.h b/arch/arm/src/efm32/efm32_adc.h
index 9b892c0663..53ef6a62f8 100644
--- a/arch/arm/src/efm32/efm32_adc.h
+++ b/arch/arm/src/efm32/efm32_adc.h
@@ -44,7 +44,7 @@
 
 #include "chip.h"
 
-#include "chip/efm32_adc.h"
+#include "hardware/efm32_adc.h"
 
 #include <nuttx/analog/adc.h>
 
diff --git a/arch/arm/src/efm32/efm32_bitband.h b/arch/arm/src/efm32/efm32_bitband.h
index 9c655de78a..e84a7ff05d 100644
--- a/arch/arm/src/efm32/efm32_bitband.h
+++ b/arch/arm/src/efm32/efm32_bitband.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index 2ff0670f51..2d2bd907b4 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -50,9 +50,9 @@
 #include "chip.h"
 #include "itm_syslog.h"
 #include "efm32_gpio.h"
-#include "chip/efm32_msc.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_msc.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_gpio.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index 7efc1d2021..ddb2e23fd0 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -50,8 +50,8 @@
 #include <nuttx/arch.h>
 
 #include "up_arch.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_dma.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_dma.h"
 #include "efm32_dma.h"
 
 /****************************************************************************
diff --git a/arch/arm/src/efm32/efm32_dma.h b/arch/arm/src/efm32/efm32_dma.h
index 19eec8b0e9..8d32333627 100644
--- a/arch/arm/src/efm32/efm32_dma.h
+++ b/arch/arm/src/efm32/efm32_dma.h
@@ -47,7 +47,7 @@
 #include <stdbool.h>
 
 #include "chip.h"
-#include "chip/efm32_dma.h"
+#include "hardware/efm32_dma.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/efm32/efm32_flash.c b/arch/arm/src/efm32/efm32_flash.c
index 66cae06ab3..24d74aca8a 100644
--- a/arch/arm/src/efm32/efm32_flash.c
+++ b/arch/arm/src/efm32/efm32_flash.c
@@ -80,8 +80,8 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "chip/efm32_msc.h"
-#include "chip/efm32_devinfo.h"
+#include "hardware/efm32_msc.h"
+#include "hardware/efm32_devinfo.h"
 
 #include "efm32_bitband.h"
 
diff --git a/arch/arm/src/efm32/efm32_gpio.c b/arch/arm/src/efm32/efm32_gpio.c
index 7ffc58cf34..2366a26c21 100644
--- a/arch/arm/src/efm32/efm32_gpio.c
+++ b/arch/arm/src/efm32/efm32_gpio.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 
 #include "up_arch.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 
 /************************************************************************************
diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c
index 1b31758281..dd31f639ed 100644
--- a/arch/arm/src/efm32/efm32_gpioirq.c
+++ b/arch/arm/src/efm32/efm32_gpioirq.c
@@ -47,7 +47,7 @@
 #include <nuttx/irq.h>
 
 #include "up_arch.h"
-#include "chip/efm32_gpio.h"
+#include "hardware/efm32_gpio.h"
 #include "efm32_gpio.h"
 #include "efm32_bitband.h"
 
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index 87e6b82747..8f2e0e98cf 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -80,8 +80,8 @@
 #include "up_arch.h"
 
 #include "efm32_gpio.h"
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_i2c.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_i2c.h"
 
 /* At least one I2C peripheral must be enabled */
 
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index 2303f7ce72..dee04cef0d 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -57,7 +57,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_leuart.h"
+#include "hardware/efm32_leuart.h"
 #include "efm32_config.h"
 #include "efm32_lowputc.h"
 
diff --git a/arch/arm/src/efm32/efm32_lowputc.c b/arch/arm/src/efm32/efm32_lowputc.c
index 26ec02884a..466f7c93f2 100644
--- a/arch/arm/src/efm32/efm32_lowputc.c
+++ b/arch/arm/src/efm32/efm32_lowputc.c
@@ -47,10 +47,10 @@
 
 #include "up_arch.h"
 
-#include "chip/efm32_memorymap.h"
-#include "chip/efm32_usart.h"
-#include "chip/efm32_leuart.h"
-#include "chip/efm32_cmu.h"
+#include "hardware/efm32_memorymap.h"
+#include "hardware/efm32_usart.h"
+#include "hardware/efm32_leuart.h"
+#include "hardware/efm32_cmu.h"
 
 #include "efm32_gpio.h"
 #include "efm32_lowputc.h"
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index e619f80569..5cfaab505b 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -53,8 +53,8 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_timer.h"
 #include "efm32_timer.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_pwm.h b/arch/arm/src/efm32/efm32_pwm.h
index 909137c9c0..9b987267ec 100644
--- a/arch/arm/src/efm32/efm32_pwm.h
+++ b/arch/arm/src/efm32/efm32_pwm.h
@@ -82,7 +82,7 @@
     defined(CONFIG_EFM32_TIMER3_PWM)
 
 #include <arch/board/board.h>
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 
 /* For each timer that is enabled for PWM usage, we need the following additional
  * configuration settings:
diff --git a/arch/arm/src/efm32/efm32_rmu.c b/arch/arm/src/efm32/efm32_rmu.c
index fbed325339..744fbd1727 100644
--- a/arch/arm/src/efm32/efm32_rmu.c
+++ b/arch/arm/src/efm32/efm32_rmu.c
@@ -50,8 +50,8 @@
 
 #include "up_arch.h"
 
-#include "chip/efm32_emu.h"
-#include "chip/efm32_rmu.h"
+#include "hardware/efm32_emu.h"
+#include "hardware/efm32_rmu.h"
 
 #include "efm32_rmu.h"
 
diff --git a/arch/arm/src/efm32/efm32_rmu.h b/arch/arm/src/efm32/efm32_rmu.h
index 9a7a32dbdc..7fb44beaa4 100644
--- a/arch/arm/src/efm32/efm32_rmu.h
+++ b/arch/arm/src/efm32/efm32_rmu.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_rmu.h"
+#include "hardware/efm32_rmu.h"
 
 #ifdef CONFIG_EFM32_RMU
 
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index d0028b6a11..9ce34673e4 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -53,7 +53,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/efm32_burtc.h"
+#include "hardware/efm32_burtc.h"
 
 #include "efm32_rmu.h"
 #include "efm32_rtc.h"
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index e1ecd7a837..80eb14c3fd 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_serial.c
@@ -61,7 +61,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_usart.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
 #include "efm32_lowputc.h"
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index 7fe5139666..843519157d 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -62,7 +62,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_usart.h"
 #include "efm32_config.h"
 #include "efm32_dma.h"
 #include "efm32_lowputc.h"
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index f8c1b1eaaf..86121c2d75 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -51,7 +51,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 #include "efm32_config.h"
 #include "efm32_gpio.h"
 
diff --git a/arch/arm/src/efm32/efm32_timer.h b/arch/arm/src/efm32/efm32_timer.h
index 3ed36baad7..ebafbef1dd 100644
--- a/arch/arm/src/efm32/efm32_timer.h
+++ b/arch/arm/src/efm32/efm32_timer.h
@@ -41,7 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_timer.h"
+#include "hardware/efm32_timer.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/efm32/efm32_usb.h b/arch/arm/src/efm32/efm32_usb.h
index 4f0e25d8d9..9236e7ae37 100644
--- a/arch/arm/src/efm32/efm32_usb.h
+++ b/arch/arm/src/efm32/efm32_usb.h
@@ -44,7 +44,7 @@
 
 #include <stdint.h>
 
-#include "chip/efm32_usb.h"
+#include "hardware/efm32_usb.h"
 
 #if defined(CONFIG_EFM32_OTGFS)
 
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index eedec628e9..e0de5b08fa 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -60,7 +60,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 
-#include "chip/efm32_cmu.h"
+#include "hardware/efm32_cmu.h"
 
 #include "efm32_usb.h"
 
diff --git a/arch/arm/src/efm32/chip/efm32_acmp.h b/arch/arm/src/efm32/hardware/efm32_acmp.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_acmp.h
rename to arch/arm/src/efm32/hardware/efm32_acmp.h
index e9956ba8e4..177ac49f55 100644
--- a/arch/arm/src/efm32/chip/efm32_acmp.h
+++ b/arch/arm/src/efm32/hardware/efm32_acmp.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_adc.h b/arch/arm/src/efm32/hardware/efm32_adc.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_adc.h
rename to arch/arm/src/efm32/hardware/efm32_adc.h
index 8245acffab..2d12977102 100644
--- a/arch/arm/src/efm32/chip/efm32_adc.h
+++ b/arch/arm/src/efm32/hardware/efm32_adc.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_aes.h b/arch/arm/src/efm32/hardware/efm32_aes.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_aes.h
rename to arch/arm/src/efm32/hardware/efm32_aes.h
index 3376edaec3..dd7f580436 100644
--- a/arch/arm/src/efm32/chip/efm32_aes.h
+++ b/arch/arm/src/efm32/hardware/efm32_aes.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_burtc.h b/arch/arm/src/efm32/hardware/efm32_burtc.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_burtc.h
rename to arch/arm/src/efm32/hardware/efm32_burtc.h
index 7cdc5cd347..817f2b74ba 100644
--- a/arch/arm/src/efm32/chip/efm32_burtc.h
+++ b/arch/arm/src/efm32/hardware/efm32_burtc.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_calibrate.h b/arch/arm/src/efm32/hardware/efm32_calibrate.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_calibrate.h
rename to arch/arm/src/efm32/hardware/efm32_calibrate.h
index 508d0b56e9..f5c21edf6e 100644
--- a/arch/arm/src/efm32/chip/efm32_calibrate.h
+++ b/arch/arm/src/efm32/hardware/efm32_calibrate.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_cmu.h b/arch/arm/src/efm32/hardware/efm32_cmu.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_cmu.h
rename to arch/arm/src/efm32/hardware/efm32_cmu.h
index ffefddd693..67780485be 100644
--- a/arch/arm/src/efm32/chip/efm32_cmu.h
+++ b/arch/arm/src/efm32/hardware/efm32_cmu.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_dac.h b/arch/arm/src/efm32/hardware/efm32_dac.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_dac.h
rename to arch/arm/src/efm32/hardware/efm32_dac.h
index 58aec484dc..8e8d3e46b8 100644
--- a/arch/arm/src/efm32/chip/efm32_dac.h
+++ b/arch/arm/src/efm32/hardware/efm32_dac.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_devinfo.h b/arch/arm/src/efm32/hardware/efm32_devinfo.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_devinfo.h
rename to arch/arm/src/efm32/hardware/efm32_devinfo.h
index 024b5b2674..455a4d7a2c 100644
--- a/arch/arm/src/efm32/chip/efm32_devinfo.h
+++ b/arch/arm/src/efm32/hardware/efm32_devinfo.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_dma.h b/arch/arm/src/efm32/hardware/efm32_dma.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_dma.h
rename to arch/arm/src/efm32/hardware/efm32_dma.h
index d7ef85e311..3ede28072c 100644
--- a/arch/arm/src/efm32/chip/efm32_dma.h
+++ b/arch/arm/src/efm32/hardware/efm32_dma.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_emu.h b/arch/arm/src/efm32/hardware/efm32_emu.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_emu.h
rename to arch/arm/src/efm32/hardware/efm32_emu.h
index 9cd1c67bd9..9b8c68d1c1 100644
--- a/arch/arm/src/efm32/chip/efm32_emu.h
+++ b/arch/arm/src/efm32/hardware/efm32_emu.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_flash.h b/arch/arm/src/efm32/hardware/efm32_flash.h
similarity index 100%
rename from arch/arm/src/efm32/chip/efm32_flash.h
rename to arch/arm/src/efm32/hardware/efm32_flash.h
diff --git a/arch/arm/src/efm32/chip/efm32_gpio.h b/arch/arm/src/efm32/hardware/efm32_gpio.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_gpio.h
rename to arch/arm/src/efm32/hardware/efm32_gpio.h
index f631de0409..6f4f9f3b35 100644
--- a/arch/arm/src/efm32/chip/efm32_gpio.h
+++ b/arch/arm/src/efm32/hardware/efm32_gpio.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_i2c.h b/arch/arm/src/efm32/hardware/efm32_i2c.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_i2c.h
rename to arch/arm/src/efm32/hardware/efm32_i2c.h
index df8382a2a9..c0a5af072c 100644
--- a/arch/arm/src/efm32/chip/efm32_i2c.h
+++ b/arch/arm/src/efm32/hardware/efm32_i2c.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_lcd.h b/arch/arm/src/efm32/hardware/efm32_lcd.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_lcd.h
rename to arch/arm/src/efm32/hardware/efm32_lcd.h
index f00a4706f3..62615a35e2 100644
--- a/arch/arm/src/efm32/chip/efm32_lcd.h
+++ b/arch/arm/src/efm32/hardware/efm32_lcd.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_lesense.h b/arch/arm/src/efm32/hardware/efm32_lesense.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_lesense.h
rename to arch/arm/src/efm32/hardware/efm32_lesense.h
index 512a7095bb..84d48702c1 100644
--- a/arch/arm/src/efm32/chip/efm32_lesense.h
+++ b/arch/arm/src/efm32/hardware/efm32_lesense.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_letimer.h b/arch/arm/src/efm32/hardware/efm32_letimer.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_letimer.h
rename to arch/arm/src/efm32/hardware/efm32_letimer.h
index 3b877d448f..5d2fa051e9 100644
--- a/arch/arm/src/efm32/chip/efm32_letimer.h
+++ b/arch/arm/src/efm32/hardware/efm32_letimer.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_leuart.h b/arch/arm/src/efm32/hardware/efm32_leuart.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_leuart.h
rename to arch/arm/src/efm32/hardware/efm32_leuart.h
index be5b1bc0de..fbf0de7722 100644
--- a/arch/arm/src/efm32/chip/efm32_leuart.h
+++ b/arch/arm/src/efm32/hardware/efm32_leuart.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_memorymap.h b/arch/arm/src/efm32/hardware/efm32_memorymap.h
similarity index 95%
rename from arch/arm/src/efm32/chip/efm32_memorymap.h
rename to arch/arm/src/efm32/hardware/efm32_memorymap.h
index 62e0a24f82..384927a2c8 100644
--- a/arch/arm/src/efm32/chip/efm32_memorymap.h
+++ b/arch/arm/src/efm32/hardware/efm32_memorymap.h
@@ -44,11 +44,11 @@
 #include "chip.h"
 
 #if defined(CONFIG_EFM32_EFM32TG)
-#  include "chip/efm32tg_memorymap.h"
+#  include "hardware/efm32tg_memorymap.h"
 #elif defined(CONFIG_EFM32_EFM32G)
-#  include "chip/efm32g_memorymap.h"
+#  include "hardware/efm32g_memorymap.h"
 #elif defined(CONFIG_EFM32_EFM32GG)
-#  include "chip/efm32gg_memorymap.h"
+#  include "hardware/efm32gg_memorymap.h"
 #else
 #  error "Unsupported EFM32 memory map"
 #endif
diff --git a/arch/arm/src/efm32/chip/efm32_msc.h b/arch/arm/src/efm32/hardware/efm32_msc.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_msc.h
rename to arch/arm/src/efm32/hardware/efm32_msc.h
index 27b806743c..f6dd0e08f1 100644
--- a/arch/arm/src/efm32/chip/efm32_msc.h
+++ b/arch/arm/src/efm32/hardware/efm32_msc.h
@@ -65,7 +65,7 @@
  * Included Files
  *******************************************************************************************************************************/
 
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 /*******************************************************************************************************************************
  * Pre-processor Definitions
diff --git a/arch/arm/src/efm32/chip/efm32_pcnt.h b/arch/arm/src/efm32/hardware/efm32_pcnt.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_pcnt.h
rename to arch/arm/src/efm32/hardware/efm32_pcnt.h
index e9947f5ba7..1fa10362e6 100644
--- a/arch/arm/src/efm32/chip/efm32_pcnt.h
+++ b/arch/arm/src/efm32/hardware/efm32_pcnt.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_prs.h b/arch/arm/src/efm32/hardware/efm32_prs.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_prs.h
rename to arch/arm/src/efm32/hardware/efm32_prs.h
index b0d8d6e016..8c83310f76 100644
--- a/arch/arm/src/efm32/chip/efm32_prs.h
+++ b/arch/arm/src/efm32/hardware/efm32_prs.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_rmu.h b/arch/arm/src/efm32/hardware/efm32_rmu.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_rmu.h
rename to arch/arm/src/efm32/hardware/efm32_rmu.h
index e383cce135..2e34fb5957 100644
--- a/arch/arm/src/efm32/chip/efm32_rmu.h
+++ b/arch/arm/src/efm32/hardware/efm32_rmu.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_romtable.h b/arch/arm/src/efm32/hardware/efm32_romtable.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_romtable.h
rename to arch/arm/src/efm32/hardware/efm32_romtable.h
index 42ed83cbc8..467675c4a8 100644
--- a/arch/arm/src/efm32/chip/efm32_romtable.h
+++ b/arch/arm/src/efm32/hardware/efm32_romtable.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_rtc.h b/arch/arm/src/efm32/hardware/efm32_rtc.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_rtc.h
rename to arch/arm/src/efm32/hardware/efm32_rtc.h
index 044efae971..0231a6b59d 100644
--- a/arch/arm/src/efm32/chip/efm32_rtc.h
+++ b/arch/arm/src/efm32/hardware/efm32_rtc.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_timer.h b/arch/arm/src/efm32/hardware/efm32_timer.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_timer.h
rename to arch/arm/src/efm32/hardware/efm32_timer.h
index 86b9aaa51a..55d23e014a 100644
--- a/arch/arm/src/efm32/chip/efm32_timer.h
+++ b/arch/arm/src/efm32/hardware/efm32_timer.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this architecture
diff --git a/arch/arm/src/efm32/chip/efm32_usart.h b/arch/arm/src/efm32/hardware/efm32_usart.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_usart.h
rename to arch/arm/src/efm32/hardware/efm32_usart.h
index 6cd1372c3b..613664eaf8 100644
--- a/arch/arm/src/efm32/chip/efm32_usart.h
+++ b/arch/arm/src/efm32/hardware/efm32_usart.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG) && !defined(CONFIG_EFM32_EFM32G)
 #  warning This is the EFM32GG/G header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_usb.h b/arch/arm/src/efm32/hardware/efm32_usb.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_usb.h
rename to arch/arm/src/efm32/hardware/efm32_usb.h
index 92c53e77a6..51213550c0 100644
--- a/arch/arm/src/efm32/chip/efm32_usb.h
+++ b/arch/arm/src/efm32/hardware/efm32_usb.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_vcmp.h b/arch/arm/src/efm32/hardware/efm32_vcmp.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_vcmp.h
rename to arch/arm/src/efm32/hardware/efm32_vcmp.h
index ec71abd878..8439fffb72 100644
--- a/arch/arm/src/efm32/chip/efm32_vcmp.h
+++ b/arch/arm/src/efm32/hardware/efm32_vcmp.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32_wdog.h b/arch/arm/src/efm32/hardware/efm32_wdog.h
similarity index 99%
rename from arch/arm/src/efm32/chip/efm32_wdog.h
rename to arch/arm/src/efm32/hardware/efm32_wdog.h
index 4568dee159..c01c8c9384 100644
--- a/arch/arm/src/efm32/chip/efm32_wdog.h
+++ b/arch/arm/src/efm32/hardware/efm32_wdog.h
@@ -66,7 +66,7 @@
  *******************************************************************************************************************************/
 
 #include <nuttx/config.h>
-#include "chip/efm32_memorymap.h"
+#include "hardware/efm32_memorymap.h"
 
 #if !defined(CONFIG_EFM32_EFM32GG)
 #  warning This is the EFM32GG header file; Review/modification needed for this archtecture
diff --git a/arch/arm/src/efm32/chip/efm32g_memorymap.h b/arch/arm/src/efm32/hardware/efm32g_memorymap.h
similarity index 100%
rename from arch/arm/src/efm32/chip/efm32g_memorymap.h
rename to arch/arm/src/efm32/hardware/efm32g_memorymap.h
diff --git a/arch/arm/src/efm32/chip/efm32gg_memorymap.h b/arch/arm/src/efm32/hardware/efm32gg_memorymap.h
similarity index 100%
rename from arch/arm/src/efm32/chip/efm32gg_memorymap.h
rename to arch/arm/src/efm32/hardware/efm32gg_memorymap.h
diff --git a/arch/arm/src/efm32/chip/efm32tg_memorymap.h b/arch/arm/src/efm32/hardware/efm32tg_memorymap.h
similarity index 100%
rename from arch/arm/src/efm32/chip/efm32tg_memorymap.h
rename to arch/arm/src/efm32/hardware/efm32tg_memorymap.h
diff --git a/configs/efm32-g8xx-stk/include/board.h b/configs/efm32-g8xx-stk/include/board.h
index 55b0072024..4e9c8f0fe8 100644
--- a/configs/efm32-g8xx-stk/include/board.h
+++ b/configs/efm32-g8xx-stk/include/board.h
@@ -44,8 +44,8 @@
 
 #include <stdbool.h>
 
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_usart.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/configs/efm32gg-stk3700/include/board.h b/configs/efm32gg-stk3700/include/board.h
index f8816cc9a7..30543b1622 100644
--- a/configs/efm32gg-stk3700/include/board.h
+++ b/configs/efm32gg-stk3700/include/board.h
@@ -44,8 +44,8 @@
 
 #include <stdbool.h>
 
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_usart.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/configs/olimex-efm32g880f128-stk/include/board.h b/configs/olimex-efm32g880f128-stk/include/board.h
index f9c0a2c4ce..41d3fb6b5b 100644
--- a/configs/olimex-efm32g880f128-stk/include/board.h
+++ b/configs/olimex-efm32g880f128-stk/include/board.h
@@ -44,8 +44,8 @@
 
 #include <stdbool.h>
 
-#include "chip/efm32_cmu.h"
-#include "chip/efm32_usart.h"
+#include "hardware/efm32_cmu.h"
+#include "hardware/efm32_usart.h"
 
 /****************************************************************************
  * Pre-processor Definitions