From aee97be7107b478ca0f88e1d09624615a1de54b0 Mon Sep 17 00:00:00 2001
From: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
Date: Wed, 20 Jun 2018 17:54:34 +0200
Subject: [PATCH] arch: arm: soc: remove core zephyr header inclusions from
 soc.h

This commit removes the direct inclusions of device.h or gpio.h
from soc.h header files in ARM SOCs, to avoid soc.h include
kernel.h.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
---
 arch/arm/soc/arm/beetle/soc.h            | 3 +--
 arch/arm/soc/atmel_sam/common/soc_gpio.h | 1 -
 arch/arm/soc/atmel_sam/same70/soc.h      | 2 ++
 arch/arm/soc/nordic_nrf/nrf51/soc.h      | 7 ++++---
 arch/arm/soc/nordic_nrf/nrf52/soc.h      | 7 ++++---
 arch/arm/soc/nxp_imx/rt/soc.h            | 4 ++--
 arch/arm/soc/st_stm32/stm32f4/soc.h      | 6 ++----
 arch/arm/soc/st_stm32/stm32l4/soc.h      | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/soc/arm/beetle/soc.h b/arch/arm/soc/arm/beetle/soc.h
index f2c299b8d82..49e162c9893 100644
--- a/arch/arm/soc/arm/beetle/soc.h
+++ b/arch/arm/soc/arm/beetle/soc.h
@@ -89,8 +89,7 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <device.h>
-#include <misc/util.h>
+#include <kernel_includes.h>
 
 #include "soc_pins.h"
 #include "soc_power.h"
diff --git a/arch/arm/soc/atmel_sam/common/soc_gpio.h b/arch/arm/soc/atmel_sam/common/soc_gpio.h
index 9c8475403e6..f3c57c6d564 100644
--- a/arch/arm/soc/atmel_sam/common/soc_gpio.h
+++ b/arch/arm/soc/atmel_sam/common/soc_gpio.h
@@ -13,7 +13,6 @@
 
 #include <zephyr/types.h>
 #include <soc.h>
-#include <gpio.h>
 
 /*
  * Pin flags/attributes
diff --git a/arch/arm/soc/atmel_sam/same70/soc.h b/arch/arm/soc/atmel_sam/same70/soc.h
index e822d21ddc8..38956644022 100644
--- a/arch/arm/soc/atmel_sam/same70/soc.h
+++ b/arch/arm/soc/atmel_sam/same70/soc.h
@@ -46,6 +46,8 @@
 #include "../common/soc_pmc.h"
 #include "../common/soc_gpio.h"
 
+#include <kernel_includes.h>
+
 #endif /* _ASMLANGUAGE */
 
 /** Peripheral Hardware Request Line Identifier */
diff --git a/arch/arm/soc/nordic_nrf/nrf51/soc.h b/arch/arm/soc/nordic_nrf/nrf51/soc.h
index 323476b956e..de1393a6a69 100644
--- a/arch/arm/soc/nordic_nrf/nrf51/soc.h
+++ b/arch/arm/soc/nordic_nrf/nrf51/soc.h
@@ -15,9 +15,10 @@
 
 #include <nrf_common.h>
 #include <nrf.h>
-#include <device.h>
-#include <misc/util.h>
-#include <random/rand32.h>
+#include <kernel_includes.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/arch/arm/soc/nordic_nrf/nrf52/soc.h b/arch/arm/soc/nordic_nrf/nrf52/soc.h
index de7c620beec..880fa39c457 100644
--- a/arch/arm/soc/nordic_nrf/nrf52/soc.h
+++ b/arch/arm/soc/nordic_nrf/nrf52/soc.h
@@ -15,9 +15,10 @@
 
 #include <nrf_common.h>
 #include <nrf.h>
-#include <device.h>
-#include <misc/util.h>
-#include <random/rand32.h>
+#include <kernel_includes.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/arch/arm/soc/nxp_imx/rt/soc.h b/arch/arm/soc/nxp_imx/rt/soc.h
index 5faf2c7d76c..26ccc919fdb 100644
--- a/arch/arm/soc/nxp_imx/rt/soc.h
+++ b/arch/arm/soc/nxp_imx/rt/soc.h
@@ -16,8 +16,8 @@ extern "C" {
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
-#include <device.h>
-#include <misc/util.h>
+#include <kernel_includes.h>
+
 
 #endif /* !_ASMLANGUAGE */
 
diff --git a/arch/arm/soc/st_stm32/stm32f4/soc.h b/arch/arm/soc/st_stm32/stm32f4/soc.h
index a13e8391e63..044701feee7 100644
--- a/arch/arm/soc/st_stm32/stm32f4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32f4/soc.h
@@ -24,12 +24,10 @@
 
 #ifndef _ASMLANGUAGE
 
-#include <device.h>
-#include <misc/util.h>
-#include <random/rand32.h>
-
 #include <stm32f4xx.h>
 
+#include <kernel_includes.h>
+
 #ifdef CONFIG_CLOCK_CONTROL_STM32_CUBE
 #include <stm32f4xx_ll_utils.h>
 #include <stm32f4xx_ll_bus.h>
diff --git a/arch/arm/soc/st_stm32/stm32l4/soc.h b/arch/arm/soc/st_stm32/stm32l4/soc.h
index 2f517eaa0b8..fafe6725dde 100644
--- a/arch/arm/soc/st_stm32/stm32l4/soc.h
+++ b/arch/arm/soc/st_stm32/stm32l4/soc.h
@@ -22,8 +22,8 @@
 #ifndef _ASMLANGUAGE
 
 #include <autoconf.h>
-#include <device.h>
 #include <stm32l4xx.h>
+#include <kernel_includes.h>
 
 #define GPIO_REG_SIZE         0x400
 /* base address for where GPIO registers start */