ec: Sort includes for some stragglers

There were some more files that snuck in unsorted.

BRANCH=None
BUG=b:247100970
TEST=zmake build -a
TEST=./twister --clobber -v -i
TEST=make -j72 buildall_only runtests

Signed-off-by: Jeremy Bettis <jbettis@google.com>

Change-Id: I34d876c1fd4190cec4a2c84e89d7caca5d64de79
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4068490
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Tristan Honscheid <honscheid@google.com>

6 files changed, 22 insertions, 25 deletions

diff --git a/zephyr/program/nissa/xivur/src/charger.c b/zephyr/program/nissa/xivur/src/charger.c
index 9dadb0f42f..bf4c6bb08f 100644
--- a/zephyr/program/nissa/xivur/src/charger.c
+++ b/zephyr/program/nissa/xivur/src/charger.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "battery.h"
 #include "charger.h"
 #include "charger/isl923x_public.h"
 #include "console.h"
 #include "extpower.h"
-#include "usb_pd.h"
 #include "nissa_common.h"
+#include "usb_pd.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/nissa/xivur/src/fan.c b/zephyr/program/nissa/xivur/src/fan.c
index 840049722c..3111a70e03 100644
--- a/zephyr/program/nissa/xivur/src/fan.c
+++ b/zephyr/program/nissa/xivur/src/fan.c
@@ -3,17 +3,16 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
 #include "cros_cbi.h"
 #include "fan.h"
 #include "gpio/gpio.h"
 #include "hooks.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/xivur/src/form_factor.c b/zephyr/program/nissa/xivur/src/form_factor.c
index 602b22baff..08dfa5c04b 100644
--- a/zephyr/program/nissa/xivur/src/form_factor.c
+++ b/zephyr/program/nissa/xivur/src/form_factor.c
@@ -3,16 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "cros_cbi.h"
 #include "hooks.h"
 #include "motionsense_sensors.h"
-
 #include "nissa_common.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 /*
diff --git a/zephyr/program/nissa/xivur/src/usbc.c b/zephyr/program/nissa/xivur/src/usbc.c
index a15460a212..a32cc41331 100644
--- a/zephyr/program/nissa/xivur/src/usbc.c
+++ b/zephyr/program/nissa/xivur/src/usbc.c
@@ -3,19 +3,18 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-
 #include "charge_state_v2.h"
 #include "chipset.h"
-#include "hooks.h"
-#include "usb_mux.h"
-#include "system.h"
 #include "driver/charger/isl923x_public.h"
 #include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/raa489000.h"
-
+#include "driver/tcpm/tcpci.h"
+#include "hooks.h"
 #include "nissa_common.h"
+#include "system.h"
+#include "usb_mux.h"
+
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
 
diff --git a/zephyr/program/skyrim/frostflow/src/thermal.c b/zephyr/program/skyrim/frostflow/src/thermal.c
index eae8aac25d..59110dd35e 100644
--- a/zephyr/program/skyrim/frostflow/src/thermal.c
+++ b/zephyr/program/skyrim/frostflow/src/thermal.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "chipset.h"
+#include "common.h"
+#include "console.h"
 #include "fan.h"
 #include "tablet_mode.h"
 #include "temp_sensor/temp_sensor.h"
 #include "thermal.h"
 #include "util.h"
-#include "console.h"
 
 #define TEMP_AMB TEMP_SENSOR_ID(DT_NODELABEL(temp_amb))
 
diff --git a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
index 536f41577e..b8bb6809a4 100644
--- a/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
+++ b/zephyr/test/drivers/usbc_usb4_mode/src/usbc_usb4_mode.c
@@ -8,18 +8,18 @@
 #include "emul/tcpc/emul_tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "host_command.h"
-#include "test/drivers/stubs.h"
 #include "tcpm/tcpci.h"
-#include "test/drivers/utils.h"
+#include "test/drivers/stubs.h"
 #include "test/drivers/test_state.h"
+#include "test/drivers/utils.h"
 #include "usb_pd_vdo.h"
 
+#include <stdint.h>
+
 #include <zephyr/kernel.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/ztest.h>
 
-#include <stdint.h>
-
 #define TEST_PORT USBC_PORT_C0
 /* Remove polarity for any mux checks */
 #define USB_MUX_CHECK_MASK ~USB_PD_MUX_POLARITY_INVERTED