From 7de5f47e1ab1a842e3395eeeb1723cfbe5a15f75 Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Tue, 31 May 2022 16:44:50 +0200
Subject: [PATCH] drivers: serial: pl011: improve include list

<soc.h> was included because some CMSIS helpers (__DMB/__ISB) were
needed. In ARM SoCs, inclusion of CMSIS headers depends mainly on how
HALs decide to do it, being usually an inefficient and fragile include
chain. Note that on ARM64 we're in a better position, as those are
defined in-tree.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 drivers/serial/uart_pl011.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/serial/uart_pl011.c b/drivers/serial/uart_pl011.c
index 9d1130dff72..de98f90ed01 100644
--- a/drivers/serial/uart_pl011.c
+++ b/drivers/serial/uart_pl011.c
@@ -11,9 +11,12 @@
 #include <zephyr/arch/cpu.h>
 #include <zephyr/init.h>
 #include <zephyr/device.h>
-#include <soc.h>
 #include <zephyr/drivers/uart.h>
 
+#ifdef CONFIG_CPU_CORTEX_M
+#include <cmsis_compiler.h>
+#endif
+
 /*
  * UART PL011 register map structure
  */