From d94dc98fd6bec0df2f5fc5bb8067404b300cf6d9 Mon Sep 17 00:00:00 2001
From: Felipe Neves <felipe.neves@linaro.org>
Date: Mon, 8 Aug 2022 21:20:44 -0300
Subject: [PATCH] soc: xtensa: esp32_net: fixes include paths

that were changed with zephyr prefix  after rebasing.
Signed-off-by: Felipe Neves <felipe.neves@linaro.org>
---
 drivers/ipm/ipm_esp32.c                       | 11 ++++-----
 .../ipm/ipm_esp32/ipm_esp32_net/src/main.c    |  8 +++----
 samples/drivers/ipm/ipm_esp32/src/main.c      |  8 +++----
 soc/xtensa/esp32/soc.c                        |  3 +--
 .../esp32_net/include/_soc_inthandlers.h      |  4 ++--
 soc/xtensa/esp32_net/linker.ld                | 19 +++++++--------
 soc/xtensa/esp32_net/soc.c                    | 24 ++++++++++++-------
 soc/xtensa/esp32_net/soc.h                    |  2 +-
 8 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/drivers/ipm/ipm_esp32.c b/drivers/ipm/ipm_esp32.c
index 4055cdab315..e6651817b72 100644
--- a/drivers/ipm/ipm_esp32.c
+++ b/drivers/ipm/ipm_esp32.c
@@ -10,14 +10,13 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/ipm.h>
-#include <drivers/interrupt_controller/intc_esp32.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
 #include <soc.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/atomic.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ipm_esp32, CONFIG_IPM_LOG_LEVEL);
 
 #define ESP32_IPM_LOCK_FREE_VAL 0xB33FFFFF
diff --git a/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c b/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
index 6b8e6c7c922..c01951eec34 100644
--- a/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
+++ b/samples/drivers/ipm/ipm_esp32/ipm_esp32_net/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <drivers/ipm.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/device.h>
 
 static const struct device *ipm_dev;
 static const char fake_resp[] = {"APP_CPU: This is a response"};
diff --git a/samples/drivers/ipm/ipm_esp32/src/main.c b/samples/drivers/ipm/ipm_esp32/src/main.c
index 085107c7c79..aba758fa32b 100644
--- a/samples/drivers/ipm/ipm_esp32/src/main.c
+++ b/samples/drivers/ipm/ipm_esp32/src/main.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <drivers/ipm.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/device.h>
 #include <string.h>
 
 static const char fake_request[] = {"PRO_CPU: Fake request to APP_CPU"};
diff --git a/soc/xtensa/esp32/soc.c b/soc/xtensa/esp32/soc.c
index d6e9da817dd..8b992265e55 100644
--- a/soc/xtensa/esp32/soc.c
+++ b/soc/xtensa/esp32/soc.c
@@ -18,8 +18,6 @@
 #include <zephyr/types.h>
 #include <zephyr/linker/linker-defs.h>
 #include <kernel_internal.h>
-#include <zephyr/sys/printk.h>
-#include <device.h>
 
 #include "esp_private/system_internal.h"
 #include "esp32/rom/cache.h"
@@ -30,6 +28,7 @@
 #include "esp_err.h"
 #include "esp32/spiram.h"
 #include "esp_app_format.h"
+#include <zephyr/sys/printk.h>
 
 extern void z_cstart(void);
 
diff --git a/soc/xtensa/esp32_net/include/_soc_inthandlers.h b/soc/xtensa/esp32_net/include/_soc_inthandlers.h
index 770ba78dbed..63d6eef4c81 100644
--- a/soc/xtensa/esp32_net/include/_soc_inthandlers.h
+++ b/soc/xtensa/esp32_net/include/_soc_inthandlers.h
@@ -5,8 +5,8 @@
  */
 
 #include <xtensa/config/core-isa.h>
-#include <sys/util.h>
-#include <sw_isr_table.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sw_isr_table.h>
 
 #if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
 #error core-isa.h interrupt level does not match dispatcher!
diff --git a/soc/xtensa/esp32_net/linker.ld b/soc/xtensa/esp32_net/linker.ld
index 377e20925d3..36d08cf730e 100644
--- a/soc/xtensa/esp32_net/linker.ld
+++ b/soc/xtensa/esp32_net/linker.ld
@@ -10,11 +10,10 @@
  * Linker script for the Xtensa platform.
  */
 
-#include <devicetree.h>
-#include <autoconf.h>
-#include <linker/sections.h>
-#include <linker/linker-defs.h>
-#include <linker/linker-tool.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/linker/linker-tool.h>
 
 #define RAMABLE_REGION dram0_1_seg :dram0_1_phdr
 #define RAMABLE_REGION_1 dram0_1_seg :dram0_1_phdr
@@ -47,7 +46,7 @@ _rom_store_table = 0;
 SECTIONS
 {
 
-#include <linker/rel-sections.ld>
+#include <zephyr/linker/rel-sections.ld>
 
   /* Send .iram0 code to iram */
   .iram0.vectors : ALIGN(4)
@@ -137,7 +136,7 @@ SECTIONS
 #define ITERABLE_SECTION_RAM_GC_ALLOWED(x, y)
 #undef ITERABLE_SECTION_RAM
 #define ITERABLE_SECTION_RAM(x, y)
-#include <linker/common-ram.ld>
+#include <zephyr/linker/common-ram.ld>
 /* Restore original value for symbols referenced by `common-ram.ld` */
 _net_buf_pool_list = _esp_net_buf_pool_list;
 #pragma pop_macro("ITERABLE_SECTION_RAM_GC_ALLOWED")
@@ -296,7 +295,7 @@ _net_buf_pool_list = _esp_net_buf_pool_list;
  * which is already defined above. In case, `common-rom.ld` creates additional segments
  * they will be placed in DRAM instead. */
 #define ROMABLE_REGION RAMABLE_REGION
-#include <linker/common-rom.ld>
+#include <zephyr/linker/common-rom.ld>
 /* Restore original value for symbols referenced by `common-rom.ld` */
 __log_const_start = __esp_log_const_start;
 __log_const_end = __esp_log_const_end;
@@ -422,10 +421,10 @@ __shell_root_cmds_end = __esp_shell_root_cmds_end;
   } GROUP_LINK_IN(RAMABLE_REGION_1)
 
 #ifdef CONFIG_GEN_ISR_TABLES
-#include <linker/intlist.ld>
+#include <zephyr/linker/intlist.ld>
 #endif
 
-#include <linker/debug-sections.ld>
+#include <zephyr/linker/debug-sections.ld>
 
   SECTION_PROLOGUE(.xtensa.info, 0,)
   {
diff --git a/soc/xtensa/esp32_net/soc.c b/soc/xtensa/esp32_net/soc.c
index a6645f90c10..2962076a547 100644
--- a/soc/xtensa/esp32_net/soc.c
+++ b/soc/xtensa/esp32_net/soc.c
@@ -5,17 +5,20 @@
  */
 
 /* Include esp-idf headers first to avoid redefining BIT() macro */
-#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
-#include <soc.h>
-#include <kernel_structs.h>
-#include <string.h>
-#include <toolchain/gcc.h>
-#include <zephyr/types.h>
-#include <zephyr.h>
-#include "sys/printk.h"
-
+#include "soc.h"
 #include <soc/rtc_cntl_reg.h>
 #include <soc/timer_group_reg.h>
+#include <zephyr/drivers/interrupt_controller/intc_esp32.h>
+#include <xtensa/config/core-isa.h>
+#include <xtensa/corebits.h>
+
+#include <zephyr/kernel_structs.h>
+#include <string.h>
+#include <zephyr/toolchain/gcc.h>
+#include <zephyr/types.h>
+#include <zephyr/linker/linker-defs.h>
+#include <kernel_internal.h>
+
 #include "esp_private/system_internal.h"
 #include "esp32/rom/cache.h"
 #include "hal/soc_ll.h"
@@ -23,6 +26,9 @@
 #include "soc/gpio_periph.h"
 #include "esp_spi_flash.h"
 #include "esp_err.h"
+#include "esp32/spiram.h"
+#include "esp_app_format.h"
+#include <zephyr/sys/printk.h>
 
 extern void z_cstart(void);
 
diff --git a/soc/xtensa/esp32_net/soc.h b/soc/xtensa/esp32_net/soc.h
index a28edd1009a..32893a9623c 100644
--- a/soc/xtensa/esp32_net/soc.h
+++ b/soc/xtensa/esp32_net/soc.h
@@ -14,7 +14,7 @@
 
 #include <zephyr/types.h>
 #include <stdbool.h>
-#include <arch/xtensa/arch.h>
+#include <zephyr/arch/xtensa/arch.h>
 
 #include <xtensa/core-macros.h>
 #include <esp32/clk.h>