zephyr: emul: use non-deprecated includes

Drop usage of deprecated <emul.h> for <drivers/emul.h>

BRANCH=none
BUG=none
TEST=zmake configute --test test-drivers

Signed-off-by: Aaron Massey <aaronmassey@google.com>
Change-Id: I9e221f44fa3b70305916914c0bbeed21b6a6bed8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3413067
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

35 files changed, 35 insertions, 35 deletions

diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c
index ac7271c357..20a4fe3e42 100644
--- a/zephyr/emul/emul_bb_retimer.c
+++ b/zephyr/emul/emul_bb_retimer.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_bb_retimer);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_bma255.c b/zephyr/emul/emul_bma255.c
index bd41bcde3f..7342507164 100644
--- a/zephyr/emul/emul_bma255.c
+++ b/zephyr/emul/emul_bma255.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_bma255);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_bmi.c b/zephyr/emul/emul_bmi.c
index fcfe3859bd..fcec77f22b 100644
--- a/zephyr/emul/emul_bmi.c
+++ b/zephyr/emul/emul_bmi.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_bmi);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_bmi160.c b/zephyr/emul/emul_bmi160.c
index 2a68b688ff..6518002179 100644
--- a/zephyr/emul/emul_bmi160.c
+++ b/zephyr/emul/emul_bmi160.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_bmi160);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_bmi260.c b/zephyr/emul/emul_bmi260.c
index 235b1e219e..0b7789f74b 100644
--- a/zephyr/emul/emul_bmi260.c
+++ b/zephyr/emul/emul_bmi260.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_bmi260);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_common_i2c.c b/zephyr/emul/emul_common_i2c.c
index 43e7101784..0c11f8d8c9 100644
--- a/zephyr/emul/emul_common_i2c.c
+++ b/zephyr/emul/emul_common_i2c.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(emul_common_i2c);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_isl923x.c b/zephyr/emul/emul_isl923x.c
index 05ec6bdc52..56287d531e 100644
--- a/zephyr/emul/emul_isl923x.c
+++ b/zephyr/emul/emul_isl923x.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <errno.h>
 #include <sys/__assert.h>
 
diff --git a/zephyr/emul/emul_lis2dw12.c b/zephyr/emul/emul_lis2dw12.c
index e14c184504..a4eb064caf 100644
--- a/zephyr/emul/emul_lis2dw12.c
+++ b/zephyr/emul/emul_lis2dw12.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <errno.h>
 #include <sys/__assert.h>
 
diff --git a/zephyr/emul/emul_ln9310.c b/zephyr/emul/emul_ln9310.c
index 4b74c537cf..f1064e9748 100644
--- a/zephyr/emul/emul_ln9310.c
+++ b/zephyr/emul/emul_ln9310.c
@@ -10,7 +10,7 @@
 #include <drivers/gpio/gpio_emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <errno.h>
 #include <sys/__assert.h>
 
diff --git a/zephyr/emul/emul_pi3usb9201.c b/zephyr/emul/emul_pi3usb9201.c
index babef58c75..ac5b0b0968 100644
--- a/zephyr/emul/emul_pi3usb9201.c
+++ b/zephyr/emul/emul_pi3usb9201.c
@@ -6,7 +6,7 @@
 #define DT_DRV_COMPAT zephyr_pi3usb9201_emul
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c
index 136d81cc35..43b46bc844 100644
--- a/zephyr/emul/emul_smart_battery.c
+++ b/zephyr/emul/emul_smart_battery.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(smart_battery);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/emul_sn5s330.c b/zephyr/emul/emul_sn5s330.c
index 238815b11c..a68c7ed709 100644
--- a/zephyr/emul/emul_sn5s330.c
+++ b/zephyr/emul/emul_sn5s330.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <errno.h>
 #include <sys/__assert.h>
 #include <devicetree/gpio.h>
diff --git a/zephyr/emul/emul_syv682x.c b/zephyr/emul/emul_syv682x.c
index 51a61aaf0e..6882571f32 100644
--- a/zephyr/emul/emul_syv682x.c
+++ b/zephyr/emul/emul_syv682x.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <devicetree/gpio.h>
 #include <drivers/gpio/gpio_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
diff --git a/zephyr/emul/emul_tcs3400.c b/zephyr/emul/emul_tcs3400.c
index ccc46bb382..1e7eb67486 100644
--- a/zephyr/emul/emul_tcs3400.c
+++ b/zephyr/emul/emul_tcs3400.c
@@ -10,7 +10,7 @@
 LOG_MODULE_REGISTER(emul_tcs);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/tcpc/emul_ps8xxx.c b/zephyr/emul/tcpc/emul_ps8xxx.c
index 5a36f39cd1..cbee6a4f74 100644
--- a/zephyr/emul/tcpc/emul_ps8xxx.c
+++ b/zephyr/emul/tcpc/emul_ps8xxx.c
@@ -9,7 +9,7 @@
 LOG_MODULE_REGISTER(ps8xxx_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/emul/tcpc/emul_tcpci.c b/zephyr/emul/tcpc/emul_tcpci.c
index 4a33a48f59..228a26ffab 100644
--- a/zephyr/emul/tcpc/emul_tcpci.c
+++ b/zephyr/emul/tcpc/emul_tcpci.c
@@ -9,7 +9,7 @@
 LOG_MODULE_REGISTER(tcpci_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
 #include <device.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 #include <drivers/gpio/gpio_emul.h>
diff --git a/zephyr/include/emul/emul_bb_retimer.h b/zephyr/include/emul/emul_bb_retimer.h
index c63cc651c0..5e1a5fbd9a 100644
--- a/zephyr/include/emul/emul_bb_retimer.h
+++ b/zephyr/include/emul/emul_bb_retimer.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_BB_RETIMER_H
 #define __EMUL_BB_RETIMER_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/emul_bma255.h b/zephyr/include/emul/emul_bma255.h
index b2f71df88b..d1253ba133 100644
--- a/zephyr/include/emul/emul_bma255.h
+++ b/zephyr/include/emul/emul_bma255.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_BMA255_H
 #define __EMUL_BMA255_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/emul_bmi.h b/zephyr/include/emul/emul_bmi.h
index 9eac9c3f85..98c52b574d 100644
--- a/zephyr/include/emul/emul_bmi.h
+++ b/zephyr/include/emul/emul_bmi.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_BMI_H
 #define __EMUL_BMI_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/emul_common_i2c.h b/zephyr/include/emul/emul_common_i2c.h
index 39711108f0..a5ae0ba967 100644
--- a/zephyr/include/emul/emul_common_i2c.h
+++ b/zephyr/include/emul/emul_common_i2c.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_COMMON_I2C_H
 #define __EMUL_COMMON_I2C_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/emul_isl923x.h b/zephyr/include/emul/emul_isl923x.h
index 2edae32d84..659b620f21 100644
--- a/zephyr/include/emul/emul_isl923x.h
+++ b/zephyr/include/emul/emul_isl923x.h
@@ -8,7 +8,7 @@
 
 #include <device.h>
 #include <drivers/i2c_emul.h>
-#include <emul.h>
+#include <drivers/emul.h>
 
 /**
  * @brief Get the emulator's parent bus device
diff --git a/zephyr/include/emul/emul_lis2dw12.h b/zephyr/include/emul/emul_lis2dw12.h
index 0d630af215..31f5239c7d 100644
--- a/zephyr/include/emul/emul_lis2dw12.h
+++ b/zephyr/include/emul/emul_lis2dw12.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_LIS2DW12_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_LIS2DW12_H_
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c_emul.h>
 
 /**
diff --git a/zephyr/include/emul/emul_ln9310.h b/zephyr/include/emul/emul_ln9310.h
index 72debc22d2..402df04ad8 100644
--- a/zephyr/include/emul/emul_ln9310.h
+++ b/zephyr/include/emul/emul_ln9310.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_LN9310_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_LN9310_H_
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include "driver/ln9310.h"
 #include <stdbool.h>
 
diff --git a/zephyr/include/emul/emul_pi3usb9201.h b/zephyr/include/emul/emul_pi3usb9201.h
index b171cfefc9..a4f9f7c550 100644
--- a/zephyr/include/emul/emul_pi3usb9201.h
+++ b/zephyr/include/emul/emul_pi3usb9201.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_PI3USB9201_H
 #define __EMUL_PI3USB9201_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/emul_smart_battery.h b/zephyr/include/emul/emul_smart_battery.h
index 69425997a1..47d1ffd8f8 100644
--- a/zephyr/include/emul/emul_smart_battery.h
+++ b/zephyr/include/emul/emul_smart_battery.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_SMART_BATTERY_H
 #define __EMUL_SMART_BATTERY_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 #include <stdint.h>
diff --git a/zephyr/include/emul/emul_sn5s330.h b/zephyr/include/emul/emul_sn5s330.h
index c6ea31b6d6..be849b31dd 100644
--- a/zephyr/include/emul/emul_sn5s330.h
+++ b/zephyr/include/emul/emul_sn5s330.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_EMUL_SN5S330_H_
 #define ZEPHYR_INCLUDE_EMUL_EMUL_SN5S330_H_
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c_emul.h>
 
 /**
diff --git a/zephyr/include/emul/emul_tcs3400.h b/zephyr/include/emul/emul_tcs3400.h
index 49ec382a66..fe3a485e54 100644
--- a/zephyr/include/emul/emul_tcs3400.h
+++ b/zephyr/include/emul/emul_tcs3400.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCS3400_H
 #define __EMUL_TCS3400_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/i2c_mock.h b/zephyr/include/emul/i2c_mock.h
index e9e8d97252..f3836bb81e 100644
--- a/zephyr/include/emul/i2c_mock.h
+++ b/zephyr/include/emul/i2c_mock.h
@@ -6,7 +6,7 @@
 #ifndef ZEPHYR_INCLUDE_EMUL_I2C_MOCK_H_
 #define ZEPHYR_INCLUDE_EMUL_I2C_MOCK_H_
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c_emul.h>
 
 /**
diff --git a/zephyr/include/emul/tcpc/emul_ps8xxx.h b/zephyr/include/emul/tcpc/emul_ps8xxx.h
index 110def22ec..52045ba86d 100644
--- a/zephyr/include/emul/tcpc/emul_ps8xxx.h
+++ b/zephyr/include/emul/tcpc/emul_ps8xxx.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_PS8XXX_H
 #define __EMUL_PS8XXX_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 
diff --git a/zephyr/include/emul/tcpc/emul_tcpci.h b/zephyr/include/emul/tcpc/emul_tcpci.h
index 22a5e243a4..3a50481054 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_H
 #define __EMUL_TCPCI_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include <drivers/i2c.h>
 #include <drivers/i2c_emul.h>
 #include <usb_pd_tcpm.h>
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
index 066a167703..3968d99d5a 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_common.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_COMMON_H
 #define __EMUL_TCPCI_PARTNER_COMMON_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include "emul/tcpc/emul_tcpci.h"
 
 #include "ec_commands.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
index bb79ef5472..75b08eccb6 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_drp.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_DRP_H
 #define __EMUL_TCPCI_PARTNER_DRP_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include "emul/tcpc/emul_tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
index 8948243969..6f17d9a8ef 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_snk.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_SNK_H
 #define __EMUL_TCPCI_PARTNER_SNK_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci.h"
 #include "usb_pd.h"
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
index 7aa466617b..9b9ed66a4a 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_src.h
@@ -12,7 +12,7 @@
 #ifndef __EMUL_TCPCI_PARTNER_SRC_H
 #define __EMUL_TCPCI_PARTNER_SRC_H
 
-#include <emul.h>
+#include <drivers/emul.h>
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci.h"
 #include "usb_pd.h"
diff --git a/zephyr/test/drivers/src/ppc_sn5s330.c b/zephyr/test/drivers/src/ppc_sn5s330.c
index 429b9b8c26..5af6f1e2aa 100644
--- a/zephyr/test/drivers/src/ppc_sn5s330.c
+++ b/zephyr/test/drivers/src/ppc_sn5s330.c
@@ -6,7 +6,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <devicetree.h>
-#include <emul.h>
+#include <drivers/emul.h>
 #include <ztest.h>
 #include <fff.h>