diff options
18 files changed, 131 insertions, 113 deletions
diff --git a/zephyr/drivers/cros_displight/cros_displight.c b/zephyr/drivers/cros_displight/cros_displight.c index 98d1dd0823..998c2a4407 100644 --- a/zephyr/drivers/cros_displight/cros_displight.c +++ b/zephyr/drivers/cros_displight/cros_displight.c @@ -5,13 +5,14 @@ #define DT_DRV_COMPAT cros_ec_displight +#include "common.h" +#include "util.h" + #include <zephyr/devicetree.h> -#include <drivers/cros_displight.h> #include <zephyr/drivers/pwm.h> #include <zephyr/logging/log.h> -#include "common.h" -#include "util.h" +#include <drivers/cros_displight.h> LOG_MODULE_REGISTER(displight, LOG_LEVEL_ERR); diff --git a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c index 4838c5d583..79ef0c36b2 100644 --- a/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c +++ b/zephyr/drivers/cros_flash/cros_flash_it8xxx2.c @@ -5,17 +5,18 @@ #define DT_DRV_COMPAT ite_it8xxx2_cros_flash -#include <drivers/cros_flash.h> -#include <zephyr/drivers/flash.h> -#include <zephyr/kernel.h> -#include <zephyr/logging/log.h> -#include <soc.h> - #include "flash.h" #include "host_command.h" #include "system.h" #include "watchdog.h" +#include <zephyr/drivers/flash.h> +#include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_flash.h> +#include <soc.h> + LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR); /* Device data */ diff --git a/zephyr/drivers/cros_flash/cros_flash_npcx.c b/zephyr/drivers/cros_flash/cros_flash_npcx.c index 032bb5906c..e49067ad1a 100644 --- a/zephyr/drivers/cros_flash/cros_flash_npcx.c +++ b/zephyr/drivers/cros_flash/cros_flash_npcx.c @@ -5,18 +5,19 @@ #define DT_DRV_COMPAT nuvoton_npcx_cros_flash -#include <drivers/cros_flash.h> +#include "../drivers/flash/spi_nor.h" +#include "flash.h" +#include "spi_flash_reg.h" +#include "write_protect.h" + #include <zephyr/drivers/flash.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/spi.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> -#include <soc.h> -#include "flash.h" -#include "spi_flash_reg.h" -#include "write_protect.h" -#include "../drivers/flash/spi_nor.h" +#include <drivers/cros_flash.h> +#include <soc.h> LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR); diff --git a/zephyr/drivers/cros_flash/cros_flash_xec.c b/zephyr/drivers/cros_flash/cros_flash_xec.c index 2b92eae25b..610a79c971 100644 --- a/zephyr/drivers/cros_flash/cros_flash_xec.c +++ b/zephyr/drivers/cros_flash/cros_flash_xec.c @@ -5,18 +5,19 @@ #define DT_DRV_COMPAT microchip_xec_cros_flash -#include <drivers/cros_flash.h> +#include "../drivers/flash/spi_nor.h" +#include "flash.h" +#include "spi_flash_reg.h" +#include "write_protect.h" + #include <zephyr/drivers/flash.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/spi.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> -#include <soc.h> -#include "flash.h" -#include "spi_flash_reg.h" -#include "write_protect.h" -#include "../drivers/flash/spi_nor.h" +#include <drivers/cros_flash.h> +#include <soc.h> LOG_MODULE_REGISTER(cros_flash, LOG_LEVEL_ERR); diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c index fdbc8ee30d..f824d1d90c 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_ite.c @@ -5,22 +5,23 @@ #define DT_DRV_COMPAT ite_it8xxx2_cros_kb_raw +#include "ec_tasks.h" +#include "keyboard_raw.h" +#include "task.h" + #include <assert.h> -#include <drivers/cros_kb_raw.h> + #include <zephyr/drivers/clock_control.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/interrupt_controller/wuc_ite_it8xxx2.h> #include <zephyr/dt-bindings/interrupt-controller/it8xxx2-wuc.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_kb_raw.h> #include <soc.h> -#include <soc_dt.h> #include <soc/ite_it8xxx2/reg_def_cros.h> - -#include "ec_tasks.h" -#include "keyboard_raw.h" -#include "task.h" - -#include <zephyr/logging/log.h> +#include <soc_dt.h> LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR); #define KEYBOARD_KSI_PIN_COUNT IT8XXX2_DT_INST_WUCCTRL_LEN(0) diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c index 1d1f2b4918..6c61568016 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_npcx.c @@ -5,21 +5,22 @@ #define DT_DRV_COMPAT nuvoton_npcx_cros_kb_raw -#include <assert.h> -#include <zephyr/dt-bindings/clock/npcx_clock.h> -#include <drivers/cros_kb_raw.h> -#include <zephyr/drivers/clock_control.h> -#include <zephyr/drivers/pinctrl.h> -#include <zephyr/kernel.h> -#include <soc.h> -#include <soc/nuvoton_npcx/reg_def_cros.h> - #include "ec_tasks.h" #include "keyboard_raw.h" #include "soc_miwu.h" #include "task.h" +#include <assert.h> + +#include <zephyr/drivers/clock_control.h> +#include <zephyr/drivers/pinctrl.h> +#include <zephyr/dt-bindings/clock/npcx_clock.h> +#include <zephyr/kernel.h> #include <zephyr/logging/log.h> + +#include <drivers/cros_kb_raw.h> +#include <soc.h> +#include <soc/nuvoton_npcx/reg_def_cros.h> LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR); #ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED diff --git a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c index 797377f84f..30ffd7ca85 100644 --- a/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c +++ b/zephyr/drivers/cros_kb_raw/cros_kb_raw_xec.c @@ -5,19 +5,20 @@ #define DT_DRV_COMPAT microchip_xec_cros_kb_raw -#include <assert.h> -#include <drivers/cros_kb_raw.h> -#include <zephyr/drivers/clock_control.h> -#include <zephyr/drivers/pinctrl.h> -#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h> -#include <soc.h> -#include <soc/microchip_xec/reg_def_cros.h> - #include "ec_tasks.h" #include "keyboard_raw.h" #include "task.h" +#include <assert.h> + +#include <zephyr/drivers/clock_control.h> +#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h> +#include <zephyr/drivers/pinctrl.h> #include <zephyr/logging/log.h> + +#include <drivers/cros_kb_raw.h> +#include <soc.h> +#include <soc/microchip_xec/reg_def_cros.h> LOG_MODULE_REGISTER(cros_kb_raw, LOG_LEVEL_ERR); #ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED diff --git a/zephyr/drivers/cros_kblight/pwm_kblight.c b/zephyr/drivers/cros_kblight/pwm_kblight.c index 59b4ef20ef..ea6004412e 100644 --- a/zephyr/drivers/cros_kblight/pwm_kblight.c +++ b/zephyr/drivers/cros_kblight/pwm_kblight.c @@ -5,14 +5,14 @@ #define DT_DRV_COMPAT cros_ec_kblight_pwm -#include <zephyr/devicetree.h> -#include <zephyr/drivers/pwm.h> -#include <zephyr/logging/log.h> - #include "common.h" #include "keyboard_backlight.h" #include "util.h" +#include <zephyr/devicetree.h> +#include <zephyr/drivers/pwm.h> +#include <zephyr/logging/log.h> + LOG_MODULE_REGISTER(kblight, LOG_LEVEL_ERR); BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1, diff --git a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c index 3312ad899f..6b8e21de27 100644 --- a/zephyr/drivers/cros_rtc/cros_rtc_npcx.c +++ b/zephyr/drivers/cros_rtc/cros_rtc_npcx.c @@ -6,18 +6,19 @@ #define DT_DRV_COMPAT nuvoton_npcx_cros_mtc -#include <assert.h> -#include <drivers/cros_rtc.h> -#include <zephyr/drivers/gpio.h> -#include <zephyr/kernel.h> -#include <soc.h> -#include <soc/nuvoton_npcx/reg_def_cros.h> - #include "ec_tasks.h" #include "soc_miwu.h" #include "task.h" +#include <assert.h> + +#include <zephyr/drivers/gpio.h> +#include <zephyr/kernel.h> #include <zephyr/logging/log.h> + +#include <drivers/cros_rtc.h> +#include <soc.h> +#include <soc/nuvoton_npcx/reg_def_cros.h> LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR); #define NPCX_MTC_TTC_LOAD_DELAY_US 250 /* Delay after writing TTC */ diff --git a/zephyr/drivers/cros_rtc/cros_rtc_xec.c b/zephyr/drivers/cros_rtc/cros_rtc_xec.c index c543aab6af..f42560e107 100644 --- a/zephyr/drivers/cros_rtc/cros_rtc_xec.c +++ b/zephyr/drivers/cros_rtc/cros_rtc_xec.c @@ -5,17 +5,18 @@ #define DT_DRV_COMPAT microchip_xec_cros_rtc +#include "ec_tasks.h" +#include "task.h" + #include <assert.h> -#include <drivers/cros_rtc.h> + #include <zephyr/drivers/gpio.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_rtc.h> #include <soc.h> #include <soc/microchip_xec/reg_def_cros.h> - -#include "ec_tasks.h" -#include "task.h" - -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR); /* Driver config */ diff --git a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c index c5580eaeef..34c2cbe0a7 100644 --- a/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c +++ b/zephyr/drivers/cros_rtc/nxp_rtc_pcf85063a.c @@ -5,18 +5,19 @@ #define DT_DRV_COMPAT nxp_rtc_pcf85063a +#include "nxp_rtc_pcf85063a.h" + #include <assert.h> + #include <zephyr/device.h> -#include <drivers/cros_rtc.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/i2c.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_rtc.h> #include <rtc.h> #include <soc.h> - -#include "nxp_rtc_pcf85063a.h" - -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR); /* Driver config */ diff --git a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c index 7a9a11fd41..f6d3a7c292 100644 --- a/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c +++ b/zephyr/drivers/cros_rtc/renesas_rtc_idt1337ag.c @@ -5,18 +5,19 @@ #define DT_DRV_COMPAT renesas_rtc_idt1337ag +#include "renesas_rtc_idt1337ag.h" + #include <assert.h> + #include <zephyr/device.h> -#include <drivers/cros_rtc.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/i2c.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_rtc.h> #include <rtc.h> #include <soc.h> - -#include "renesas_rtc_idt1337ag.h" - -#include <zephyr/logging/log.h> LOG_MODULE_REGISTER(cros_rtc, LOG_LEVEL_ERR); /* Driver config */ diff --git a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c index ee6ce3f7a4..15b5daf85b 100644 --- a/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c +++ b/zephyr/drivers/cros_shi/cros_shi_it8xxx2.c @@ -5,20 +5,22 @@ #define DT_DRV_COMPAT ite_it8xxx2_cros_shi -#include <zephyr/device.h> +#include "chipset.h" +#include "console.h" +#include "gpio/gpio_int.h" +#include "host_command.h" + #include <errno.h> + +#include <zephyr/device.h> +#include <zephyr/drivers/pinctrl.h> +#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h> #include <zephyr/init.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> + #include <soc.h> #include <soc_dt.h> -#include <zephyr/drivers/pinctrl.h> -#include <zephyr/dt-bindings/pinctrl/it8xxx2-pinctrl.h> - -#include "chipset.h" -#include "console.h" -#include "gpio/gpio_int.h" -#include "host_command.h" /* Console output macros */ #define CPRINTS(format, args...) cprints(CC_SPI, format, ##args) diff --git a/zephyr/drivers/cros_shi/cros_shi_npcx.c b/zephyr/drivers/cros_shi/cros_shi_npcx.c index ce3279288b..79bc79db2e 100644 --- a/zephyr/drivers/cros_shi/cros_shi_npcx.c +++ b/zephyr/drivers/cros_shi/cros_shi_npcx.c @@ -5,22 +5,24 @@ #define DT_DRV_COMPAT nuvoton_npcx_cros_shi -#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h> +#include "host_command.h" +#include "soc_miwu.h" +#include "system.h" + #include <assert.h> -#include <zephyr/dt-bindings/clock/npcx_clock.h> + +#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h> #include <zephyr/drivers/clock_control.h> -#include <zephyr/drivers/pinctrl.h> -#include <drivers/cros_shi.h> #include <zephyr/drivers/gpio.h> -#include <zephyr/logging/log.h> +#include <zephyr/drivers/pinctrl.h> +#include <zephyr/dt-bindings/clock/npcx_clock.h> #include <zephyr/kernel.h> +#include <zephyr/logging/log.h> + +#include <drivers/cros_shi.h> #include <soc.h> #include <soc/nuvoton_npcx/reg_def_cros.h> -#include "host_command.h" -#include "soc_miwu.h" -#include "system.h" - #ifdef CONFIG_CROS_SHI_NPCX_DEBUG #define DEBUG_CPRINTS(format, args...) cprints(CC_SPI, format, ##args) #define DEBUG_CPRINTF(format, args...) cprintf(CC_SPI, format, ##args) diff --git a/zephyr/drivers/cros_system/cros_system_it8xxx2.c b/zephyr/drivers/cros_system/cros_system_it8xxx2.c index 8c63886808..a78b5c929c 100644 --- a/zephyr/drivers/cros_system/cros_system_it8xxx2.c +++ b/zephyr/drivers/cros_system/cros_system_it8xxx2.c @@ -5,17 +5,18 @@ #define DT_DRV_COMPAT ite_it8xxx2_gctrl +#include "drivers/cros_system.h" +#include "gpio/gpio_int.h" +#include "system.h" +#include "util.h" + #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> #include <zephyr/logging/log.h> + #include <soc.h> #include <soc/ite_it8xxx2/reg_def_cros.h> -#include "drivers/cros_system.h" -#include "gpio/gpio_int.h" -#include "system.h" -#include "util.h" - LOG_MODULE_REGISTER(cros_system, LOG_LEVEL_ERR); #define GCTRL_IT8XXX2_REG_BASE \ diff --git a/zephyr/drivers/cros_system/cros_system_native_posix.c b/zephyr/drivers/cros_system/cros_system_native_posix.c index fab9c4d033..59fdb39972 100644 --- a/zephyr/drivers/cros_system/cros_system_native_posix.c +++ b/zephyr/drivers/cros_system/cros_system_native_posix.c @@ -6,12 +6,12 @@ /* LCOV_EXCL_START */ /* This is test code, so it should be excluded from coverage */ -#include <zephyr/logging/log.h> -#include <zephyr/sys/util.h> - #include "common.h" #include "drivers/cros_system.h" +#include <zephyr/logging/log.h> +#include <zephyr/sys/util.h> + LOG_MODULE_REGISTER(cros_system, LOG_LEVEL_ERR); /* Driver config stub */ diff --git a/zephyr/drivers/cros_system/cros_system_npcx.c b/zephyr/drivers/cros_system/cros_system_npcx.c index 4ab21ca549..4fc1f1f977 100644 --- a/zephyr/drivers/cros_system/cros_system_npcx.c +++ b/zephyr/drivers/cros_system/cros_system_npcx.c @@ -3,21 +3,22 @@ * found in the LICENSE file. */ +#include "drivers/cros_system.h" +#include "gpio/gpio_int.h" +#include "rom_chip.h" +#include "soc_gpio.h" +#include "soc_miwu.h" +#include "system.h" + #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h> #include <zephyr/drivers/gpio.h> #include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/watchdog.h> #include <zephyr/logging/log.h> -#include <soc.h> -#include <soc/nuvoton_npcx/reg_def_cros.h> #include <zephyr/sys/util.h> -#include "drivers/cros_system.h" -#include "gpio/gpio_int.h" -#include "rom_chip.h" -#include "soc_gpio.h" -#include "soc_miwu.h" -#include "system.h" +#include <soc.h> +#include <soc/nuvoton_npcx/reg_def_cros.h> LOG_MODULE_REGISTER(cros_system, LOG_LEVEL_ERR); diff --git a/zephyr/drivers/cros_system/cros_system_xec.c b/zephyr/drivers/cros_system/cros_system_xec.c index a3cf9aea22..f91b4630fc 100644 --- a/zephyr/drivers/cros_system/cros_system_xec.c +++ b/zephyr/drivers/cros_system/cros_system_xec.c @@ -3,18 +3,19 @@ * found in the LICENSE file. */ +#include "gpio/gpio_int.h" +#include "system.h" +#include "system_chip.h" + #include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h> -#include <drivers/cros_system.h> +#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h> #include <zephyr/drivers/watchdog.h> #include <zephyr/logging/log.h> -#include <soc.h> -#include <soc/microchip_xec/reg_def_cros.h> #include <zephyr/sys/util.h> -#include "system.h" -#include "system_chip.h" -#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h> -#include "gpio/gpio_int.h" +#include <drivers/cros_system.h> +#include <soc.h> +#include <soc/microchip_xec/reg_def_cros.h> LOG_MODULE_REGISTER(cros_system, LOG_LEVEL_ERR); |