From 33112b74e8b734562addf8c876386f91b96d955d Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Tue, 12 Jul 2022 22:19:27 -0400
Subject: [PATCH] zephyr: use zephyr prefix for includes

Zephyr includes are now under a zephyr namespace, so use this.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 src/idc/zephyr_idc.c             |  4 ++--
 src/include/sof/trace/trace.h    |  2 +-
 src/lib/agent.c                  |  2 +-
 src/schedule/zephyr_domain.c     |  4 ++--
 src/schedule/zephyr_ll.c         |  2 +-
 zephyr/edf_schedule.c            |  4 ++--
 zephyr/include/sof/trace/trace.h |  4 ++--
 zephyr/wrapper.c                 | 10 +++++-----
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/idc/zephyr_idc.c b/src/idc/zephyr_idc.c
index 8c52d3a21..bf525dfda 100644
--- a/src/idc/zephyr_idc.c
+++ b/src/idc/zephyr_idc.c
@@ -19,9 +19,9 @@
  *	send tasks to other CPUs.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <sys/p4wq.h>
+#include <zephyr/sys/p4wq.h>
 #include <sof/drivers/idc.h>
 #include <sof/init.h>
 #include <sof/ipc/common.h>
diff --git a/src/include/sof/trace/trace.h b/src/include/sof/trace/trace.h
index 409505941..a145f15f5 100644
--- a/src/include/sof/trace/trace.h
+++ b/src/include/sof/trace/trace.h
@@ -31,7 +31,7 @@
 #endif
 
 #ifdef __ZEPHYR__
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 #endif
 
 struct sof;
diff --git a/src/lib/agent.c b/src/lib/agent.c
index 14da9cacb..b33959c5e 100644
--- a/src/lib/agent.c
+++ b/src/lib/agent.c
@@ -35,7 +35,7 @@
 #include <stdint.h>
 
 #ifdef __ZEPHYR__
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #endif
 
 LOG_MODULE_REGISTER(sa, CONFIG_SOF_LOG_LEVEL);
diff --git a/src/schedule/zephyr_domain.c b/src/schedule/zephyr_domain.c
index 11954377e..360ff3d69 100644
--- a/src/schedule/zephyr_domain.c
+++ b/src/schedule/zephyr_domain.c
@@ -20,8 +20,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <kernel.h>
-#include <sys_clock.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
 
 LOG_MODULE_DECLARE(ll_schedule, CONFIG_SOF_LOG_LEVEL);
 
diff --git a/src/schedule/zephyr_ll.c b/src/schedule/zephyr_ll.c
index f07047c7a..3149e38a3 100644
--- a/src/schedule/zephyr_ll.c
+++ b/src/schedule/zephyr_ll.c
@@ -13,7 +13,7 @@
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(ll_schedule, CONFIG_SOF_LOG_LEVEL);
 
diff --git a/zephyr/edf_schedule.c b/zephyr/edf_schedule.c
index 4abecc1dd..a8e4d7fbc 100644
--- a/zephyr/edf_schedule.c
+++ b/zephyr/edf_schedule.c
@@ -10,8 +10,8 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/lib/wait.h>
 
-#include <kernel.h>
-#include <sys_clock.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys_clock.h>
 
 struct k_work_q edf_workq;
 K_THREAD_STACK_DEFINE(edf_workq_stack, 8192);
diff --git a/zephyr/include/sof/trace/trace.h b/zephyr/include/sof/trace/trace.h
index caeeada6e..bc484719b 100644
--- a/zephyr/include/sof/trace/trace.h
+++ b/zephyr/include/sof/trace/trace.h
@@ -7,8 +7,8 @@
 #define __SOF_TRACE_TRACE1_H__
 
 #ifndef ZEPHYR_INCLUDE_LOGGING_LOG_H_
-#include <logging/log.h>
-#include <sys/printk.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/printk.h>
 
 /* Level of SOF trace on Zephyr */
 #define SOF_ZEPHYR_TRACE_LEVEL LOG_LEVEL_INF
diff --git a/zephyr/wrapper.c b/zephyr/wrapper.c
index ba90e0e07..31177cc10 100644
--- a/zephyr/wrapper.c
+++ b/zephyr/wrapper.c
@@ -22,14 +22,14 @@
 #include <sof/trace/trace.h>
 
 /* Zephyr includes */
-#include <device.h>
-#include <soc.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 #include <version.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
+#include <soc.h>
 
 #if !CONFIG_KERNEL_COHERENCE
-#include <arch/xtensa/cache.h>
+#include <zephyr/arch/xtensa/cache.h>
 #endif
 
 LOG_MODULE_REGISTER(zephyr, CONFIG_SOF_LOG_LEVEL);