zephyr: Sort remaining includes

This is the last of the files in platform/ec.

Sort all includes  with the clang-format rules used by the zephyr
project.

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

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I95e37e74d860cbb7c74ec478b543aef0b0e967e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4062620
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Sam Hurst <shurst@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Tested-by: Jeremy Bettis <jbettis@chromium.org>

5 files changed, 21 insertions, 21 deletions

diff --git a/zephyr/emul/tcpc/emul_tcpci_partner_vpd.c b/zephyr/emul/tcpc/emul_tcpci_partner_vpd.c
index 596dc45ef9..f01227e913 100644
--- a/zephyr/emul/tcpc/emul_tcpci_partner_vpd.c
+++ b/zephyr/emul/tcpc/emul_tcpci_partner_vpd.c
@@ -3,9 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/logging/log.h>
-#include <zephyr/sys/byteorder.h>
-
 #include "driver/tcpm/tcpci.h"
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci_partner_faulty_ext.h"
@@ -13,6 +10,9 @@
 #include "emul/tcpc/emul_tcpci_partner_src.h"
 #include "emul/tcpc/emul_tcpci_partner_vpd.h"
 
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+
 LOG_MODULE_REGISTER(tcpci_vpd_emul, CONFIG_TCPCI_EMUL_LOG_LEVEL);
 
 static enum tcpci_partner_handler_res
diff --git a/zephyr/include/emul/tcpc/emul_tcpci_partner_vpd.h b/zephyr/include/emul/tcpc/emul_tcpci_partner_vpd.h
index 4f0c600927..6de0452b05 100644
--- a/zephyr/include/emul/tcpc/emul_tcpci_partner_vpd.h
+++ b/zephyr/include/emul/tcpc/emul_tcpci_partner_vpd.h
@@ -12,13 +12,13 @@
 #ifndef __EMUL_TCPCI_PARTNER_VPD_H
 #define __EMUL_TCPCI_PARTNER_VPD_H
 
-#include <zephyr/drivers/emul.h>
-
 #include "emul/tcpc/emul_tcpci_partner_common.h"
 #include "emul/tcpc/emul_tcpci_partner_faulty_ext.h"
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "emul/tcpc/emul_tcpci_partner_src.h"
 
+#include <zephyr/drivers/emul.h>
+
 /**
  * @brief USB-C VCONN-powered device extension backend API
  * @defgroup tcpci_src_emul USB-C source device extension
diff --git a/zephyr/program/nissa/xivu/src/form_factor.c b/zephyr/program/nissa/xivu/src/form_factor.c
index 9a55dacd53..2ce6f5418d 100644
--- a/zephyr/program/nissa/xivu/src/form_factor.c
+++ b/zephyr/program/nissa/xivu/src/form_factor.c
@@ -3,9 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "accelgyro.h"
 #include "button.h"
 #include "cros_board_info.h"
@@ -16,11 +13,13 @@
 #include "driver/accelgyro_lsm6dso.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
-#include "motionsense_sensors.h"
 #include "motion_sense.h"
+#include "motionsense_sensors.h"
+#include "nissa_common.h"
 #include "tablet_mode.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/test/drivers/usbc_ctvpd/src/main.c b/zephyr/test/drivers/usbc_ctvpd/src/main.c
index 391a006370..0bd6639d83 100644
--- a/zephyr/test/drivers/usbc_ctvpd/src/main.c
+++ b/zephyr/test/drivers/usbc_ctvpd/src/main.c
@@ -3,11 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <stdint.h>
-#include <zephyr/kernel.h>
-#include <zephyr/ztest.h>
-#include <zephyr/drivers/gpio/gpio_emul.h>
-
 #include "ec_commands.h"
 #include "ec_tasks.h"
 #include "emul/emul_isl923x.h"
@@ -16,13 +11,19 @@
 #include "emul/tcpc/emul_tcpci_partner_snk.h"
 #include "emul/tcpc/emul_tcpci_partner_src.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 "test_usbc_ctvpd.h"
 #include "usb_pd_vdo.h"
 
+#include <stdint.h>
+
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+
 #define TEST_PORT 0
 BUILD_ASSERT(TEST_PORT == USBC_PORT_C0);
 
diff --git a/zephyr/test/krabby/src/usbc_config.c b/zephyr/test/krabby/src/usbc_config.c
index ea9c4b3eed..0b6c8bc80d 100644
--- a/zephyr/test/krabby/src/usbc_config.c
+++ b/zephyr/test/krabby/src/usbc_config.c
@@ -3,10 +3,6 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/emul.h>
-#include <zephyr/ztest.h>
-
 #include "adc.h"
 #include "charge_manager.h"
 #include "driver/ppc/syv682x.h"
@@ -17,6 +13,10 @@
 #include "usb_pd.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/ztest.h>
+
 bool ppc_sink_enabled(int port)
 {
 	const struct emul *emul = (port == 0) ?