5 files changed, 16 insertions, 15 deletions
diff --git a/zephyr/program/skyrim/src/skyrim/alt_charger.c b/zephyr/program/skyrim/src/skyrim/alt_charger.c
index 4b717901cd..91e5af8426 100644
--- a/zephyr/program/skyrim/src/skyrim/alt_charger.c
+++ b/zephyr/program/skyrim/src/skyrim/alt_charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "charger_chips.h"
 #include "common.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 #include "hooks.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 static void alt_charger_init(void)
diff --git a/zephyr/program/skyrim/src/skyrim/fan.c b/zephyr/program/skyrim/src/skyrim/fan.c
index 0a368ee6f0..c584022a92 100644
--- a/zephyr/program/skyrim/src/skyrim/fan.c
+++ b/zephyr/program/skyrim/src/skyrim/fan.c
@@ -3,16 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/skyrim/src/skyrim/form_factor.c b/zephyr/program/skyrim/src/skyrim/form_factor.c
index f137c6db31..b13d905364 100644
--- a/zephyr/program/skyrim/src/skyrim/form_factor.c
+++ b/zephyr/program/skyrim/src/skyrim/form_factor.c
@@ -3,14 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-#include "common.h"
 #include "accelgyro.h"
+#include "common.h"
 #include "cros_board_info.h"
 #include "hooks.h"
 #include "motionsense_sensors.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/skyrim/src/skyrim/ppc_config.c b/zephyr/program/skyrim/src/skyrim/ppc_config.c
index bebc8adcc7..047103baee 100644
--- a/zephyr/program/skyrim/src/skyrim/ppc_config.c
+++ b/zephyr/program/skyrim/src/skyrim/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Skyrim board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "driver/ppc/nx20p348x.h"
 #include "driver/ppc/aoz1380_public.h"
+#include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)
 
diff --git a/zephyr/program/skyrim/src/skyrim/usb_mux_config.c b/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
index 6c65e56d9e..8d409dffdd 100644
--- a/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/skyrim/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Skyrim board-specific USB-C mux configuration */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "console.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
@@ -16,6 +14,8 @@
 #include "usb_mux.h"
 #include "usbc/usb_muxes.h"
 
+#include <zephyr/drivers/gpio.h>
+
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
 #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ##args)