9 files changed, 36 insertions, 42 deletions
diff --git a/zephyr/shim/chip/npcx/clock.c b/zephyr/shim/chip/npcx/clock.c
index 2a6fe27ef4..fc483ef775 100644
--- a/zephyr/shim/chip/npcx/clock.c
+++ b/zephyr/shim/chip/npcx/clock.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include "clock_chip.h"
-#include "module_id.h"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/dt-bindings/clock/npcx_clock.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
 #include <soc.h>
 
+#include "clock_chip.h"
+#include "module_id.h"
+
 LOG_MODULE_REGISTER(shim_clock, LOG_LEVEL_ERR);
 
 #define CDCG_NODE DT_INST(0, nuvoton_npcx_pcc)
diff --git a/zephyr/shim/chip/npcx/gpio.c b/zephyr/shim/chip/npcx/gpio.c
index 1d51c00f61..850123e17b 100644
--- a/zephyr/shim/chip/npcx/gpio.c
+++ b/zephyr/shim/chip/npcx/gpio.c
@@ -3,16 +3,17 @@
  * found in the LICENSE file.
  */
 
-#include "gpio/gpio.h"
-#include "soc_gpio.h"
-#include "util.h"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
 #include <zephyr/shell/shell.h>
 
+#include <zephyr/logging/log.h>
+
+#include "gpio/gpio.h"
+#include "soc_gpio.h"
+#include "util.h"
+
 LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR);
 
 static const struct unused_pin_config unused_pin_configs[] = {
diff --git a/zephyr/shim/chip/npcx/keyboard_raw.c b/zephyr/shim/chip/npcx/keyboard_raw.c
index 1f01952ab9..4d43134482 100644
--- a/zephyr/shim/chip/npcx/keyboard_raw.c
+++ b/zephyr/shim/chip/npcx/keyboard_raw.c
@@ -5,16 +5,15 @@
 
 /* Functions needed by keyboard scanner module for Chrome EC */
 
-#include "drivers/cros_kb_raw.h"
-#include "keyboard_raw.h"
-
 #include <zephyr/device.h>
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-
 #include <soc.h>
 #include <soc_gpio.h>
+#include <zephyr/kernel.h>
+
+#include "drivers/cros_kb_raw.h"
+#include "keyboard_raw.h"
 
 /**
  * Return true if the current value of the given input GPIO port is zero
diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
index 3062ed98a4..e3fecc0cbd 100644
--- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
+++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c
@@ -5,14 +5,12 @@
  * NPCX SoC spi flash update tool - monitor firmware
  */
 
+#include <stdint.h>
+#include <zephyr/sys/util.h>
 #include "config_chip.h"
 #include "npcx_monitor.h"
 #include "registers.h"
 
-#include <stdint.h>
-
-#include <zephyr/sys/util.h>
-
 /*
  * TODO(b/197162681): This was copied from chip/npcx/spiflashfw but this
  * needs to be moved to Zephyr upstream
diff --git a/zephyr/shim/chip/npcx/power_policy.c b/zephyr/shim/chip/npcx/power_policy.c
index 29ebcbd542..aea6e62d30 100644
--- a/zephyr/shim/chip/npcx/power_policy.c
+++ b/zephyr/shim/chip/npcx/power_policy.c
@@ -3,16 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include "console.h"
-#include "cros_version.h"
-#include "system.h"
-
 #include <zephyr/kernel.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/policy.h>
-
 #include <soc.h>
 
+#include "console.h"
+#include "cros_version.h"
+#include "system.h"
+
 static const struct pm_state_info residency_info[] =
 	PM_STATE_INFO_LIST_FROM_DT_CPU(DT_NODELABEL(cpu0));
 
diff --git a/zephyr/shim/chip/npcx/shi.c b/zephyr/shim/chip/npcx/shi.c
index 0cecc2c56e..8bec57252d 100644
--- a/zephyr/shim/chip/npcx/shi.c
+++ b/zephyr/shim/chip/npcx/shi.c
@@ -5,19 +5,18 @@
 
 /* Functions needed by Serial Host Interface module for Chrome EC */
 
-#include "chipset.h"
-#include "drivers/cros_shi.h"
-#include "hooks.h"
-#include "host_command.h"
-#include "system.h"
-
 #include <zephyr/device.h>
 #include <zephyr/dt-bindings/clock/npcx_clock.h>
-#include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <soc.h>
+#include <zephyr/kernel.h>
 
 #include <ap_power/ap_power.h>
-#include <soc.h>
+#include "chipset.h"
+#include "drivers/cros_shi.h"
+#include "hooks.h"
+#include "host_command.h"
+#include "system.h"
 
 LOG_MODULE_REGISTER(shim_cros_shi, LOG_LEVEL_DBG);
 
diff --git a/zephyr/shim/chip/npcx/system.c b/zephyr/shim/chip/npcx/system.c
index 1fbdca0803..2240acea54 100644
--- a/zephyr/shim/chip/npcx/system.c
+++ b/zephyr/shim/chip/npcx/system.c
@@ -3,12 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include "system.h"
-#include "system_chip.h"
-
 #include <zephyr/drivers/bbram.h>
 #include <zephyr/logging/log.h>
 
+#include "system.h"
+#include "system_chip.h"
+
 LOG_MODULE_REGISTER(shim_npcx_system, LOG_LEVEL_ERR);
 
 static void chip_bbram_status_check(void)
diff --git a/zephyr/shim/chip/npcx/system_download_from_flash.c b/zephyr/shim/chip/npcx/system_download_from_flash.c
index 53e22d4839..1aef9560d1 100644
--- a/zephyr/shim/chip/npcx/system_download_from_flash.c
+++ b/zephyr/shim/chip/npcx/system_download_from_flash.c
@@ -2,14 +2,13 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "common.h"
-#include "soc.h"
-#include "system_chip.h"
-
 #include <zephyr/dt-bindings/clock/npcx_clock.h>
+#include <stdnoreturn.h>
 #include <zephyr/sys/__assert.h>
 
-#include <stdnoreturn.h>
+#include "common.h"
+#include "soc.h"
+#include "system_chip.h"
 
 /* Modules Map */
 #define NPCX_PMC_BASE_ADDR 0x4000D000
diff --git a/zephyr/shim/chip/npcx/system_external_storage.c b/zephyr/shim/chip/npcx/system_external_storage.c
index d3b2d26362..81e1968cf4 100644
--- a/zephyr/shim/chip/npcx/system_external_storage.c
+++ b/zephyr/shim/chip/npcx/system_external_storage.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/syscon.h>
+
 #include "clock_chip.h"
 #include "common.h"
 #include "rom_chip.h"
 #include "system.h"
 #include "system_chip.h"
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/syscon.h>
-
 /* TODO (b:179900857) Make this implementation not npcx specific. */
 
 static const struct device *mdc_dev = DEVICE_DT_GET(DT_NODELABEL(mdc));