zephyr: Sort header files

Sort all headers in zephyr 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 -j$(nproc) buildall_only runtests
TEST=zmake compare-builds

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: Ic4431f9354cfb87b8357e6288f651aaef8a50f7f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4043353
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

7 files changed, 28 insertions, 21 deletions

diff --git a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
index dcb2b3b968..75390b5005 100644
--- a/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
+++ b/zephyr/subsys/ap_pwrseq/include/x86_common_pwrseq.h
@@ -7,6 +7,7 @@
 #define __X86_COMMON_PWRSEQ_H__
 
 #include <zephyr/logging/log.h>
+
 #include <ap_power/ap_power_interface.h>
 #include <ap_power_override_functions.h>
 #include <power_signals.h>
diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c
index a02eef6e6b..1ae8604a3a 100644
--- a/zephyr/subsys/ap_pwrseq/power_signals.c
+++ b/zephyr/subsys/ap_pwrseq/power_signals.c
@@ -3,18 +3,18 @@
  * found in the LICENSE file.
  */
 
+#include "signal_adc.h"
+#include "signal_gpio.h"
+#include "signal_vw.h"
+
 #include <zephyr/kernel.h>
-#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/atomic.h>
+#include <zephyr/toolchain.h>
 
 #include <ap_power/ap_pwrseq.h>
 #include <power_signals.h>
 
-#include "signal_gpio.h"
-#include "signal_vw.h"
-#include "signal_adc.h"
-
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
 
 #if DT_HAS_COMPAT_STATUS_OKAY(intel_ap_pwrseq)
diff --git a/zephyr/subsys/ap_pwrseq/signal_gpio.c b/zephyr/subsys/ap_pwrseq/signal_gpio.c
index 1dbd430bef..f09f6b23cb 100644
--- a/zephyr/subsys/ap_pwrseq/signal_gpio.c
+++ b/zephyr/subsys/ap_pwrseq/signal_gpio.c
@@ -3,10 +3,12 @@
  * found in the LICENSE file.
  */
 
+#include "system.h"
+
+#include <zephyr/drivers/gpio.h>
+
 #include <power_signals.h>
 #include <signal_gpio.h>
-#include <zephyr/drivers/gpio.h>
-#include "system.h"
 
 #define MY_COMPAT intel_ap_pwrseq_gpio
 
diff --git a/zephyr/subsys/ap_pwrseq/signal_vw.c b/zephyr/subsys/ap_pwrseq/signal_vw.c
index 0e9e4affff..cee88e362d 100644
--- a/zephyr/subsys/ap_pwrseq/signal_vw.c
+++ b/zephyr/subsys/ap_pwrseq/signal_vw.c
@@ -3,11 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <atomic.h>
+#include "signal_vw.h"
+
 #include <zephyr/drivers/espi.h>
-#include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
-#include "signal_vw.h"
+#include <atomic.h>
+#include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
 #define MY_COMPAT intel_ap_pwrseq_vw
 
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
index dbceeacc85..6ac2b5e0ba 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_console.c
@@ -3,8 +3,10 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/shell/shell.h>
 #include <stdlib.h>
+
+#include <zephyr/shell/shell.h>
+
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
 
 LOG_MODULE_DECLARE(ap_pwrseq, CONFIG_AP_PWRSEQ_LOG_LEVEL);
diff --git a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
index 09846759ee..55f1414a4b 100644
--- a/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
+++ b/zephyr/subsys/ap_pwrseq/x86_non_dsx_common_pwrseq_sm_handler.c
@@ -3,11 +3,12 @@
  * found in the LICENSE file.
  */
 
-#include <atomic.h>
+#include "zephyr_console_shim.h"
+
 #include <zephyr/init.h>
 
+#include <atomic.h>
 #include <x86_non_dsx_common_pwrseq_sm_handler.h>
-#include "zephyr_console_shim.h"
 
 static K_KERNEL_STACK_DEFINE(pwrseq_thread_stack, CONFIG_AP_PWRSEQ_STACK_SIZE);
 static struct k_thread pwrseq_thread_data;
diff --git a/zephyr/subsys/emul/ap_pwrseq/emul_power_signals.c b/zephyr/subsys/emul/ap_pwrseq/emul_power_signals.c
index 9f68a18bdc..e8f211bb56 100644
--- a/zephyr/subsys/emul/ap_pwrseq/emul_power_signals.c
+++ b/zephyr/subsys/emul/ap_pwrseq/emul_power_signals.c
@@ -3,21 +3,21 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/espi.h>
-#include <zephyr/drivers/espi_emul.h>
-#include <zephyr/drivers/gpio/gpio_emul.h>
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/ztest.h>
-
 #include "ap_power/ap_power.h"
 #include "ap_power/ap_power_events.h"
-#include <zephyr/drivers/adc.h>
 #include "chipset.h"
 #include "emul/emul_power_signals.h"
 #include "power_signals.h"
 #include "test_state.h"
 
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_emul.h>
+#include <zephyr/drivers/gpio/gpio_emul.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/ztest.h>
+
 LOG_MODULE_REGISTER(emul_power_signal, CONFIG_EMUL_POWER_SIGNALS_LOG_LEVEL);
 
 /**