soc: arm: nxp: cleanup in soc.h headers

A commit that organizes the soc.h header of NXP SoCs:
- removing redundant inclusions of sys/util.h
- removing inclusions of device.h and kernel_includes.h
- including the auto-generated DTS board header
- including the fsl_common.h header
- fixing minor style issues

Signed-off-by: Ioannis Glaropoulos <[email protected]>

Author: ioannisg

drivers/serial/uart_mcux_lpuart.c

@@ -8,8 +8,8 @@
 #include <device.h>
 #include <drivers/uart.h>
 #include <drivers/clock_control.h>
-#include <fsl_lpuart.h>
 #include <soc.h>
+#include <fsl_lpuart.h>
 
 struct mcux_lpuart_config {
 	LPUART_Type *base;

soc/arm/nxp_imx/rt/soc.h

@@ -13,11 +13,8 @@
 
 #include <fsl_common.h>
 
-/* ARM CMSIS definitions must be included before kernel_includes.h.
- * Therefore, it is essential to include kernel_includes.h after including
- * core SOC-specific headers.
- */
-#include <kernel_includes.h>
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #ifdef __cplusplus
 extern "C" {

soc/arm/nxp_kinetis/k6x/soc.h

@@ -30,9 +30,9 @@
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
-#include <device.h>
-#include <sys/util.h>
-#include <random/rand32.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/k8x/Kconfig.soc

@@ -80,4 +80,4 @@ config WDOG_INIT
 	  requires that the watchdog be configured during reset
 	  handling.
 
-endif # SOC_SERIES_KINETIS_KV5X
+endif # SOC_SERIES_KINETIS_K8X

soc/arm/nxp_kinetis/k8x/soc.h

@@ -7,7 +7,7 @@
 #ifndef _SOC__H_
 #define _SOC__H_
 
-#include <misc/util.h>
+#include <sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,11 +17,8 @@ extern "C" {
 
 #include <fsl_common.h>
 
-/* ARM CMSIS definitions must be included before kernel_includes.h.
- * Therefore, it is essential to include kernel_includes.h after including
- * core SOC-specific headers.
- */
-#include <kernel_includes.h>
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/ke1xf/soc.h

@@ -9,4 +9,13 @@
 
 #include <sys/util.h>
 
+#ifndef _ASMLANGUAGE
+
+#include <fsl_common.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
+
+#endif /* !_ASMLANGUAGE */
+
 #endif /* _SOC__H_ */

soc/arm/nxp_kinetis/kl2x/soc.h

@@ -14,9 +14,9 @@
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
-#include <device.h>
-#include <sys/util.h>
-#include <random/rand32.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_kinetis/kwx/soc.h

@@ -25,9 +25,9 @@
 #ifndef _ASMLANGUAGE
 
 #include <fsl_common.h>
-#include <device.h>
-#include <sys/util.h>
-#include <random/rand32.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
 
 #endif /* !_ASMLANGUAGE */
 

soc/arm/nxp_lpc/lpc54xxx/soc.h

@@ -19,11 +19,9 @@
 #include <sys/util.h>
 #include <fsl_common.h>
 
-/* ARM CMSIS definitions must be included before kernel_includes.h.
- * Therefore, it is essential to include kernel_includes.h after including
- * core SOC-specific headers.
- */
-#include <kernel_includes.h>
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
+
 #endif /* !_ASMLANGUAGE */
 
 #define IOCON_PIO_DIGITAL_EN	0x80u

soc/arm/nxp_lpc/lpc55xxx/soc.h

@@ -16,9 +16,12 @@
 #define _SOC__H_
 
 #ifndef _ASMLANGUAGE
-#include <device.h>
 #include <sys/util.h>
 #include <fsl_common.h>
+
+/* Add include for DTS generated information */
+#include <generated_dts_board.h>
+
 #endif /* !_ASMLANGUAGE */
 
 #define IOCON_PIO_DIGITAL_EN 0x0100u  /*!<@brief Enables digital function */