diff options
Diffstat (limited to 'zephyr/shim/src')
46 files changed, 117 insertions, 117 deletions
diff --git a/zephyr/shim/src/adc.c b/zephyr/shim/src/adc.c index 68babcc576..80cf60391d 100644 --- a/zephyr/shim/src/adc.c +++ b/zephyr/shim/src/adc.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <devicetree/io-channels.h> -#include <drivers/adc.h> -#include <logging/log.h> +#include <zephyr/devicetree/io-channels.h> +#include <zephyr/drivers/adc.h> +#include <zephyr/logging/log.h> #include "adc.h" #include "zephyr_adc.h" diff --git a/zephyr/shim/src/bc12.c b/zephyr/shim/src/bc12.c index fc6dfb6aa9..3bdab5f16e 100644 --- a/zephyr/shim/src/bc12.c +++ b/zephyr/shim/src/bc12.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "usbc/bc12_pi3usb9201.h" #include "usbc/bc12_rt1739.h" #include "usbc/bc12_rt9490.h" diff --git a/zephyr/shim/src/bc12_pi3usb9201.c b/zephyr/shim/src/bc12_pi3usb9201.c index 57e4ed7b61..aac8dcd0a0 100644 --- a/zephyr/shim/src/bc12_pi3usb9201.c +++ b/zephyr/shim/src/bc12_pi3usb9201.c @@ -5,7 +5,7 @@ #define DT_DRV_COMPAT pericom_pi3usb9201 -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "bc12/pi3usb9201_public.h" #include "gpio/gpio_int.h" #include "hooks.h" diff --git a/zephyr/shim/src/bc12_rt9490.c b/zephyr/shim/src/bc12_rt9490.c index 68798241d5..abecfcfa3a 100644 --- a/zephyr/shim/src/bc12_rt9490.c +++ b/zephyr/shim/src/bc12_rt9490.c @@ -5,7 +5,7 @@ #define DT_DRV_COMPAT richtek_rt9490_bc12 -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "driver/charger/rt9490.h" #include "gpio/gpio_int.h" #include "hooks.h" diff --git a/zephyr/shim/src/cbi/cbi_eeprom.c b/zephyr/shim/src/cbi/cbi_eeprom.c index 760defb22a..4b9d718ef0 100644 --- a/zephyr/shim/src/cbi/cbi_eeprom.c +++ b/zephyr/shim/src/cbi/cbi_eeprom.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <drivers/eeprom.h> -#include <drivers/gpio.h> +#include <zephyr/drivers/eeprom.h> +#include <zephyr/drivers/gpio.h> #include "console.h" #include "cros_board_info.h" diff --git a/zephyr/shim/src/cbi/cros_cbi_fw_config.c b/zephyr/shim/src/cbi/cros_cbi_fw_config.c index b411f0ac7f..e94c950a0f 100644 --- a/zephyr/shim/src/cbi/cros_cbi_fw_config.c +++ b/zephyr/shim/src/cbi/cros_cbi_fw_config.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <logging/log.h> +#include <zephyr/logging/log.h> #include "cros_board_info.h" #include "cros_cbi.h" diff --git a/zephyr/shim/src/cbi/cros_cbi_ssfc.c b/zephyr/shim/src/cbi/cros_cbi_ssfc.c index 2a4e591eb5..a2dc3ccf0a 100644 --- a/zephyr/shim/src/cbi/cros_cbi_ssfc.c +++ b/zephyr/shim/src/cbi/cros_cbi_ssfc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <logging/log.h> +#include <zephyr/logging/log.h> #include "cros_board_info.h" #include "cros_cbi.h" diff --git a/zephyr/shim/src/charger.c b/zephyr/shim/src/charger.c index 506e140e00..08aa121a19 100644 --- a/zephyr/shim/src/charger.c +++ b/zephyr/shim/src/charger.c @@ -4,7 +4,7 @@ */ #include "charger.h" -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "charger/chg_bq25710.h" #include "charger/chg_isl923x.h" #include "charger/chg_isl9241.h" diff --git a/zephyr/shim/src/console.c b/zephyr/shim/src/console.c index 002b6e1618..bedc7ca90b 100644 --- a/zephyr/shim/src/console.c +++ b/zephyr/shim/src/console.c @@ -3,19 +3,19 @@ * found in the LICENSE file. */ -#include <device.h> -#include <drivers/uart.h> -#include <shell/shell.h> +#include <zephyr/device.h> +#include <zephyr/drivers/uart.h> +#include <zephyr/shell/shell.h> #ifdef CONFIG_SHELL_BACKEND_DUMMY /* nocheck */ -#include <shell/shell_dummy.h> /* nocheck */ +#include <zephyr/shell/shell_dummy.h> /* nocheck */ #endif -#include <shell/shell_uart.h> +#include <zephyr/shell/shell_uart.h> #include <stdbool.h> #include <string.h> -#include <sys/printk.h> -#include <sys/ring_buffer.h> -#include <zephyr.h> -#include <logging/log.h> +#include <zephyr/sys/printk.h> +#include <zephyr/sys/ring_buffer.h> +#include <zephyr/zephyr.h> +#include <zephyr/logging/log.h> #include "console.h" #include "printf.h" diff --git a/zephyr/shim/src/console_buffer.c b/zephyr/shim/src/console_buffer.c index 739d1e2251..aaeb6dae68 100644 --- a/zephyr/shim/src/console_buffer.c +++ b/zephyr/shim/src/console_buffer.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <kernel.h> -#include <zephyr.h> +#include <zephyr/kernel.h> +#include <zephyr/zephyr.h> #include "common.h" #include "console.h" diff --git a/zephyr/shim/src/crc.c b/zephyr/shim/src/crc.c index 5c726619ee..0c5a81a4dd 100644 --- a/zephyr/shim/src/crc.c +++ b/zephyr/shim/src/crc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <sys/crc.h> +#include <zephyr/sys/crc.h> #include "crc8.h" diff --git a/zephyr/shim/src/espi.c b/zephyr/shim/src/espi.c index 9d6e6fbfce..ab7ac3cc97 100644 --- a/zephyr/shim/src/espi.c +++ b/zephyr/shim/src/espi.c @@ -4,13 +4,13 @@ */ #include <atomic.h> -#include <device.h> -#include <drivers/espi.h> -#include <drivers/gpio.h> -#include <logging/log.h> -#include <kernel.h> +#include <zephyr/device.h> +#include <zephyr/drivers/espi.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/logging/log.h> +#include <zephyr/kernel.h> #include <stdint.h> -#include <zephyr.h> +#include <zephyr/zephyr.h> #include <ap_power/ap_power.h> #include <ap_power/ap_power_events.h> diff --git a/zephyr/shim/src/fan.c b/zephyr/shim/src/fan.c index 49afb0f508..3531941a08 100644 --- a/zephyr/shim/src/fan.c +++ b/zephyr/shim/src/fan.c @@ -5,11 +5,11 @@ #define DT_DRV_COMPAT cros_ec_fans -#include <drivers/gpio.h> -#include <drivers/pwm.h> -#include <drivers/sensor.h> -#include <logging/log.h> -#include <sys/util_macro.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/drivers/pwm.h> +#include <zephyr/drivers/sensor.h> +#include <zephyr/logging/log.h> +#include <zephyr/sys/util_macro.h> #include "fan.h" #include "gpio_signal.h" diff --git a/zephyr/shim/src/flash.c b/zephyr/shim/src/flash.c index b5611839a8..9802b39c3a 100644 --- a/zephyr/shim/src/flash.c +++ b/zephyr/shim/src/flash.c @@ -4,9 +4,9 @@ */ #include <flash.h> -#include <kernel.h> -#include <logging/log.h> -#include <drivers/flash.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> +#include <zephyr/drivers/flash.h> #include "console.h" #include "drivers/cros_flash.h" diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c index 945c04a577..b0b05f6bff 100644 --- a/zephyr/shim/src/gpio.c +++ b/zephyr/shim/src/gpio.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <device.h> -#include <init.h> -#include <kernel.h> -#include <logging/log.h> +#include <zephyr/device.h> +#include <zephyr/init.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> #ifdef __REQUIRE_ZEPHYR_GPIOS__ #undef __REQUIRE_ZEPHYR_GPIOS__ diff --git a/zephyr/shim/src/gpio_id.c b/zephyr/shim/src/gpio_id.c index 3a122ae376..b562f405bc 100644 --- a/zephyr/shim/src/gpio_id.c +++ b/zephyr/shim/src/gpio_id.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <devicetree.h> +#include <zephyr/devicetree.h> #ifdef __REQUIRE_ZEPHYR_GPIOS__ #undef __REQUIRE_ZEPHYR_GPIOS__ diff --git a/zephyr/shim/src/gpio_int.c b/zephyr/shim/src/gpio_int.c index 9d7f71448f..6f13976acc 100644 --- a/zephyr/shim/src/gpio_int.c +++ b/zephyr/shim/src/gpio_int.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <device.h> -#include <init.h> -#include <kernel.h> -#include <logging/log.h> +#include <zephyr/device.h> +#include <zephyr/init.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> #ifdef __REQUIRE_ZEPHYR_GPIOS__ #undef __REQUIRE_ZEPHYR_GPIOS__ diff --git a/zephyr/shim/src/hooks.c b/zephyr/shim/src/hooks.c index c680e18d20..07bf27f3b0 100644 --- a/zephyr/shim/src/hooks.c +++ b/zephyr/shim/src/hooks.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <kernel.h> -#include <zephyr.h> +#include <zephyr/kernel.h> +#include <zephyr/zephyr.h> #include <ap_power/ap_power.h> #include <ap_power/ap_power_events.h> diff --git a/zephyr/shim/src/host_command.c b/zephyr/shim/src/host_command.c index ee7f994fdb..7bf61ee551 100644 --- a/zephyr/shim/src/host_command.c +++ b/zephyr/shim/src/host_command.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <zephyr.h> +#include <zephyr/zephyr.h> #include "host_command.h" #include "task.h" diff --git a/zephyr/shim/src/hwtimer.c b/zephyr/shim/src/hwtimer.c index 85c72c5c59..aaaf051d80 100644 --- a/zephyr/shim/src/hwtimer.c +++ b/zephyr/shim/src/hwtimer.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <kernel.h> +#include <zephyr/kernel.h> #include <stdint.h> -#include <zephyr.h> +#include <zephyr/zephyr.h> #include "hwtimer.h" diff --git a/zephyr/shim/src/i2c.c b/zephyr/shim/src/i2c.c index 6e0505921c..8d55876629 100644 --- a/zephyr/shim/src/i2c.c +++ b/zephyr/shim/src/i2c.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <sys/util.h> -#include <drivers/i2c.h> +#include <zephyr/sys/util.h> +#include <zephyr/drivers/i2c.h> #include "console.h" #include "i2c.h" diff --git a/zephyr/shim/src/ioex.c b/zephyr/shim/src/ioex.c index c3bad885b0..8e1282d152 100644 --- a/zephyr/shim/src/ioex.c +++ b/zephyr/shim/src/ioex.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <init.h> -#include <kernel.h> -#include <logging/log.h> +#include <zephyr/init.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> #include "common.h" #ifdef __REQUIRE_ZEPHYR_GPIOS__ #undef __REQUIRE_ZEPHYR_GPIOS__ diff --git a/zephyr/shim/src/ioex_drv.c b/zephyr/shim/src/ioex_drv.c index fcc489f30b..ccf142576d 100644 --- a/zephyr/shim/src/ioex_drv.c +++ b/zephyr/shim/src/ioex_drv.c @@ -6,20 +6,20 @@ #define DT_DRV_COMPAT cros_ioex_port #define DT_DRV_COMPAT_CHIP cros_ioex_chip -#include <device.h> -#include <drivers/gpio.h> -#include <drivers/i2c.h> +#include <zephyr/device.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/drivers/i2c.h> #include <errno.h> #ifdef __REQUIRE_ZEPHYR_GPIOS__ #undef __REQUIRE_ZEPHYR_GPIOS__ #endif #include "gpio.h" #include <gpio/gpio_utils.h> -#include <init.h> -#include <kernel.h> -#include <logging/log.h> -#include <sys/byteorder.h> -#include <sys/util.h> +#include <zephyr/init.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> +#include <zephyr/sys/byteorder.h> +#include <zephyr/sys/util.h> #include "common.h" #include "config.h" #include "i2c.h" diff --git a/zephyr/shim/src/keyboard_raw.c b/zephyr/shim/src/keyboard_raw.c index 474e1af5da..ef2dadb29c 100644 --- a/zephyr/shim/src/keyboard_raw.c +++ b/zephyr/shim/src/keyboard_raw.c @@ -5,10 +5,10 @@ /* Functions needed by keyboard scanner module for Chrome EC */ -#include <device.h> -#include <logging/log.h> +#include <zephyr/device.h> +#include <zephyr/logging/log.h> #include <soc.h> -#include <zephyr.h> +#include <zephyr/zephyr.h> #include "drivers/cros_kb_raw.h" #include "keyboard_raw.h" diff --git a/zephyr/shim/src/keyscan.c b/zephyr/shim/src/keyscan.c index fa8fb11dd2..a5503ecb48 100644 --- a/zephyr/shim/src/keyscan.c +++ b/zephyr/shim/src/keyscan.c @@ -6,7 +6,7 @@ #define DT_DRV_COMPAT cros_keyscan #include <assert.h> -#include <kernel.h> +#include <zephyr/kernel.h> #include <soc.h> #include "keyboard_scan.h" diff --git a/zephyr/shim/src/led_driver/led.c b/zephyr/shim/src/led_driver/led.c index b48641bc8f..6498c6127e 100644 --- a/zephyr/shim/src/led_driver/led.c +++ b/zephyr/shim/src/led_driver/led.c @@ -5,7 +5,7 @@ * Power and battery LED control. */ -#include <drivers/gpio.h> +#include <zephyr/drivers/gpio.h> #include "battery.h" #include "charge_manager.h" @@ -20,8 +20,8 @@ #include "system.h" #include "util.h" -#include <devicetree.h> -#include <logging/log.h> +#include <zephyr/devicetree.h> +#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(gpio_led, LOG_LEVEL_ERR); #define LED_COLOR_NODE DT_PATH(led_colors) diff --git a/zephyr/shim/src/led_driver/led.h b/zephyr/shim/src/led_driver/led.h index f802142c18..9a64f64572 100644 --- a/zephyr/shim/src/led_driver/led.h +++ b/zephyr/shim/src/led_driver/led.h @@ -6,7 +6,7 @@ #ifndef __CROS_EC_LED_H__ #define __CROS_EC_LED_H__ -#include <devicetree.h> +#include <zephyr/devicetree.h> #define COMPAT_GPIO_LED cros_ec_gpio_led_pins #define COMPAT_PWM_LED cros_ec_pwm_led_pins diff --git a/zephyr/shim/src/led_driver/led_gpio.c b/zephyr/shim/src/led_driver/led_gpio.c index 2395e4b510..f4a2058f6c 100644 --- a/zephyr/shim/src/led_driver/led_gpio.c +++ b/zephyr/shim/src/led_driver/led_gpio.c @@ -9,9 +9,9 @@ #include "led.h" #include "util.h" -#include <devicetree.h> -#include <drivers/gpio.h> -#include <logging/log.h> +#include <zephyr/devicetree.h> +#include <zephyr/drivers/gpio.h> +#include <zephyr/logging/log.h> #if DT_HAS_COMPAT_STATUS_OKAY(COMPAT_GPIO_LED) diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c index eee80243cb..74501e5b65 100644 --- a/zephyr/shim/src/led_driver/led_pwm.c +++ b/zephyr/shim/src/led_driver/led_pwm.c @@ -9,9 +9,9 @@ #include "led.h" #include "util.h" -#include <devicetree.h> -#include <drivers/pwm.h> -#include <logging/log.h> +#include <zephyr/devicetree.h> +#include <zephyr/drivers/pwm.h> +#include <zephyr/logging/log.h> #if DT_HAS_COMPAT_STATUS_OKAY(COMPAT_PWM_LED) diff --git a/zephyr/shim/src/motionsense_sensors.c b/zephyr/shim/src/motionsense_sensors.c index c720e8434e..f0b76adf33 100644 --- a/zephyr/shim/src/motionsense_sensors.c +++ b/zephyr/shim/src/motionsense_sensors.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <logging/log.h> +#include <zephyr/logging/log.h> #include "common.h" #include "accelgyro.h" #include "cros_cbi.h" diff --git a/zephyr/shim/src/panic.c b/zephyr/shim/src/panic.c index 82091df10d..030bc60843 100644 --- a/zephyr/shim/src/panic.c +++ b/zephyr/shim/src/panic.c @@ -3,11 +3,11 @@ * found in the LICENSE file. */ -#include <arch/cpu.h> -#include <fatal.h> -#include <logging/log.h> -#include <logging/log_ctrl.h> -#include <zephyr.h> +#include <zephyr/arch/cpu.h> +#include <zephyr/fatal.h> +#include <zephyr/logging/log.h> +#include <zephyr/logging/log_ctrl.h> +#include <zephyr/zephyr.h> #include "common.h" #include "panic.h" diff --git a/zephyr/shim/src/power.c b/zephyr/shim/src/power.c index 6d09dba9d3..49f820e567 100644 --- a/zephyr/shim/src/power.c +++ b/zephyr/shim/src/power.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <sys/util.h> +#include <zephyr/sys/util.h> #include "console.h" #include "power.h" diff --git a/zephyr/shim/src/power_host_sleep_api.c b/zephyr/shim/src/power_host_sleep_api.c index d22f4fe4c4..1d283e1c3c 100644 --- a/zephyr/shim/src/power_host_sleep_api.c +++ b/zephyr/shim/src/power_host_sleep_api.c @@ -2,7 +2,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include <kernel.h> +#include <zephyr/kernel.h> #include <ap_power/ap_power_interface.h> #include <power_host_sleep.h> diff --git a/zephyr/shim/src/ppc.c b/zephyr/shim/src/ppc.c index a77f7aa656..c1bf3cb0fd 100644 --- a/zephyr/shim/src/ppc.c +++ b/zephyr/shim/src/ppc.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "usbc_ppc.h" #include "usbc/ppc_rt1739.h" #include "usbc/ppc_sn5s330.h" diff --git a/zephyr/shim/src/pwm_hc.c b/zephyr/shim/src/pwm_hc.c index 3aaba20bc4..00c8ddf69b 100644 --- a/zephyr/shim/src/pwm_hc.c +++ b/zephyr/shim/src/pwm_hc.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <device.h> -#include <devicetree.h> -#include <drivers/pwm.h> -#include <logging/log.h> +#include <zephyr/device.h> +#include <zephyr/devicetree.h> +#include <zephyr/drivers/pwm.h> +#include <zephyr/logging/log.h> #include "common.h" #include "console.h" diff --git a/zephyr/shim/src/pwm_led.c b/zephyr/shim/src/pwm_led.c index 5a72a07395..09fbd009b4 100644 --- a/zephyr/shim/src/pwm_led.c +++ b/zephyr/shim/src/pwm_led.c @@ -6,7 +6,7 @@ #define DT_DRV_COMPAT cros_ec_pwm_leds #include <string.h> -#include <devicetree.h> +#include <zephyr/devicetree.h> #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) diff --git a/zephyr/shim/src/rtc.c b/zephyr/shim/src/rtc.c index 002e60148d..9627089f2e 100644 --- a/zephyr/shim/src/rtc.c +++ b/zephyr/shim/src/rtc.c @@ -3,9 +3,9 @@ * found in the LICENSE file. */ -#include <logging/log.h> -#include <kernel.h> -#include <zephyr.h> +#include <zephyr/logging/log.h> +#include <zephyr/kernel.h> +#include <zephyr/zephyr.h> #include "console.h" #include "drivers/cros_rtc.h" diff --git a/zephyr/shim/src/switchcap_gpio.c b/zephyr/shim/src/switchcap_gpio.c index 9d08a78917..18f8344943 100644 --- a/zephyr/shim/src/switchcap_gpio.c +++ b/zephyr/shim/src/switchcap_gpio.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <devicetree.h> -#include <drivers/gpio.h> +#include <zephyr/devicetree.h> +#include <zephyr/drivers/gpio.h> #include "common.h" /* TODO(b/218600962): Consolidate switchcap code. */ diff --git a/zephyr/shim/src/switchcap_ln9310.c b/zephyr/shim/src/switchcap_ln9310.c index 4dc7f0d7fe..bd8612fb2e 100644 --- a/zephyr/shim/src/switchcap_ln9310.c +++ b/zephyr/shim/src/switchcap_ln9310.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <devicetree.h> -#include <drivers/gpio.h> +#include <zephyr/devicetree.h> +#include <zephyr/drivers/gpio.h> #include "common.h" #include "ln9310.h" diff --git a/zephyr/shim/src/system.c b/zephyr/shim/src/system.c index 11da1bcc46..807bbd50b0 100644 --- a/zephyr/shim/src/system.c +++ b/zephyr/shim/src/system.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <device.h> -#include <drivers/bbram.h> +#include <zephyr/device.h> +#include <zephyr/drivers/bbram.h> #include <drivers/cros_system.h> -#include <logging/log.h> +#include <zephyr/logging/log.h> #include "common.h" #include "console.h" diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c index c1b91316a9..83fc410648 100644 --- a/zephyr/shim/src/tasks.c +++ b/zephyr/shim/src/tasks.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <kernel.h> -#include <init.h> -#include <sys/atomic.h> -#include <shell/shell.h> +#include <zephyr/kernel.h> +#include <zephyr/init.h> +#include <zephyr/sys/atomic.h> +#include <zephyr/shell/shell.h> #include "common.h" #include "host_command.h" diff --git a/zephyr/shim/src/tcpc.c b/zephyr/shim/src/tcpc.c index 82f53d70d9..b560cdb837 100644 --- a/zephyr/shim/src/tcpc.c +++ b/zephyr/shim/src/tcpc.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <devicetree.h> -#include <sys/util.h> +#include <zephyr/devicetree.h> +#include <zephyr/sys/util.h> #include "usb_pd_tcpm.h" #include "usb_pd.h" #include "usbc/tcpc_fusb302.h" diff --git a/zephyr/shim/src/tcpc_nct38xx.c b/zephyr/shim/src/tcpc_nct38xx.c index 9481961e5e..f8c73d1aa0 100644 --- a/zephyr/shim/src/tcpc_nct38xx.c +++ b/zephyr/shim/src/tcpc_nct38xx.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <device.h> -#include <devicetree.h> +#include <zephyr/device.h> +#include <zephyr/devicetree.h> #include "config.h" #include "usbc/tcpc_nct38xx.h" diff --git a/zephyr/shim/src/usb_muxes.c b/zephyr/shim/src/usb_muxes.c index e162478fec..9244f3cf68 100644 --- a/zephyr/shim/src/usb_muxes.c +++ b/zephyr/shim/src/usb_muxes.c @@ -3,8 +3,8 @@ * found in the LICENSE file. */ -#include <devicetree.h> -#include <sys/util_macro.h> +#include <zephyr/devicetree.h> +#include <zephyr/sys/util_macro.h> #include "usb_mux.h" #include "usbc/usb_muxes.h" diff --git a/zephyr/shim/src/usba.c b/zephyr/shim/src/usba.c index d3191a4f8d..e8e1ca373a 100644 --- a/zephyr/shim/src/usba.c +++ b/zephyr/shim/src/usba.c @@ -5,7 +5,7 @@ #define DT_DRV_COMPAT cros_ec_usba_port_enable_pins -#include <devicetree.h> +#include <zephyr/devicetree.h> #include "hooks.h" #if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) diff --git a/zephyr/shim/src/watchdog.c b/zephyr/shim/src/watchdog.c index 56c301c404..afb385054b 100644 --- a/zephyr/shim/src/watchdog.c +++ b/zephyr/shim/src/watchdog.c @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <device.h> -#include <drivers/watchdog.h> -#include <logging/log.h> -#include <zephyr.h> +#include <zephyr/device.h> +#include <zephyr/drivers/watchdog.h> +#include <zephyr/logging/log.h> +#include <zephyr/zephyr.h> #include "config.h" #include "hooks.h" |