From 24d09d363c59ca3d18dd24d3fc7c80582af56075 Mon Sep 17 00:00:00 2001
From: Fabio Baltieri <fabiobaltieri@google.com>
Date: Tue, 19 Jul 2022 14:16:24 +0000
Subject: [PATCH] include: fix the remaining legacy #include paths

Add the "zephyr/" prefix to various #include statements that are
preventing the CI form running with LEGACY_INCLUDE_PATH=n.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
---
 drivers/clock_control/clock_control_ast10x0.c | 2 +-
 drivers/gpio/gpio_mchp_mss.c                  | 8 ++++----
 include/zephyr/logging/log.h                  | 2 +-
 include/zephyr/sys/atomic.h                   | 4 ++--
 soc/arm/atmel_sam0/saml21/linker.ld           | 2 +-
 soc/arm/atmel_sam0/samr34/linker.ld           | 2 +-
 soc/arm/intel_socfpga_std/cyclonev/linker.ld  | 2 +-
 subsys/rtio/rtio_executor_concurrent.c        | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/clock_control/clock_control_ast10x0.c b/drivers/clock_control/clock_control_ast10x0.c
index b81e920ea37..b586a6b46ed 100644
--- a/drivers/clock_control/clock_control_ast10x0.c
+++ b/drivers/clock_control/clock_control_ast10x0.c
@@ -12,7 +12,7 @@
 #include <zephyr/sys/util.h>
 
 #define LOG_LEVEL CONFIG_CLOCK_CONTROL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(clock_control_ast10x0);
 
 #define HPLL_FREQ			MHZ(1000)
diff --git a/drivers/gpio/gpio_mchp_mss.c b/drivers/gpio/gpio_mchp_mss.c
index 5b45c974f89..670c1ee73e3 100644
--- a/drivers/gpio/gpio_mchp_mss.c
+++ b/drivers/gpio/gpio_mchp_mss.c
@@ -7,11 +7,11 @@
 #define DT_DRV_COMPAT microchip_mpfs_gpio
 
 #include <errno.h>
-#include <kernel.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 #include <soc.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
 
 #include "gpio_utils.h"
 
diff --git a/include/zephyr/logging/log.h b/include/zephyr/logging/log.h
index 18bae84db2a..b7db84d44f8 100644
--- a/include/zephyr/logging/log.h
+++ b/include/zephyr/logging/log.h
@@ -322,7 +322,7 @@ void z_log_vprintk(const char *fmt, va_list ap);
 /**
  * @brief Create module-specific state and register the module with Logger.
  *
- * This macro normally must be used after including <logging/log.h> to
+ * This macro normally must be used after including <zephyr/logging/log.h> to
  * complete the initialization of the module.
  *
  * Module registration can be skipped in two cases:
diff --git a/include/zephyr/sys/atomic.h b/include/zephyr/sys/atomic.h
index 85da71be360..2521a6fff98 100644
--- a/include/zephyr/sys/atomic.h
+++ b/include/zephyr/sys/atomic.h
@@ -33,10 +33,10 @@ typedef atomic_ptr_t atomic_ptr_val_t;
 /* Some architectures need their own implementation */
 # ifdef CONFIG_XTENSA
 /* Not all Xtensa toolchains support GCC-style atomic intrinsics */
-# include <arch/xtensa/atomic_xtensa.h>
+# include <zephyr/arch/xtensa/atomic_xtensa.h>
 # else
 /* Other arch specific implementation */
-# include <sys/atomic_arch.h>
+# include <zephyr/sys/atomic_arch.h>
 # endif /* CONFIG_XTENSA */
 #else
 /* Default.  See this file for the Doxygen reference: */
diff --git a/soc/arm/atmel_sam0/saml21/linker.ld b/soc/arm/atmel_sam0/saml21/linker.ld
index 5fc02a3533f..799b8baa700 100644
--- a/soc/arm/atmel_sam0/saml21/linker.ld
+++ b/soc/arm/atmel_sam0/saml21/linker.ld
@@ -5,4 +5,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
diff --git a/soc/arm/atmel_sam0/samr34/linker.ld b/soc/arm/atmel_sam0/samr34/linker.ld
index 5fc02a3533f..799b8baa700 100644
--- a/soc/arm/atmel_sam0/samr34/linker.ld
+++ b/soc/arm/atmel_sam0/samr34/linker.ld
@@ -5,4 +5,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <arch/arm/aarch32/cortex_m/scripts/linker.ld>
+#include <zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld>
diff --git a/soc/arm/intel_socfpga_std/cyclonev/linker.ld b/soc/arm/intel_socfpga_std/cyclonev/linker.ld
index 995b83d61b6..c4812640739 100644
--- a/soc/arm/intel_socfpga_std/cyclonev/linker.ld
+++ b/soc/arm/intel_socfpga_std/cyclonev/linker.ld
@@ -5,4 +5,4 @@
  * Adding support for Cyclone V SoC FPGA, using arm32 linker
  */
 
-#include <arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld>
diff --git a/subsys/rtio/rtio_executor_concurrent.c b/subsys/rtio/rtio_executor_concurrent.c
index 90c3cd47868..776784f6bfd 100644
--- a/subsys/rtio/rtio_executor_concurrent.c
+++ b/subsys/rtio/rtio_executor_concurrent.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "spinlock.h"
+#include <zephyr/spinlock.h>
 #include <zephyr/rtio/rtio_executor_concurrent.h>
 #include <zephyr/rtio/rtio.h>
 #include <zephyr/kernel.h>