zephyr/program: Sort header files

Sort all headers in zephyr/test 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: Ibd81df9a27fc0c934b4134106d6f09487439c245
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4039149
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

16 files changed, 44 insertions, 43 deletions

diff --git a/zephyr/program/skyrim/src/frostflow/keyboard_customization.c b/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
index d176323d80..bd02940e03 100644
--- a/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
+++ b/zephyr/program/skyrim/src/frostflow/keyboard_customization.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "common.h"
 #include "gpio.h"
 #include "keyboard_customization.h"
 #include "keyboard_protocol.h"
 #include "keyboard_raw.h"
 
+#include <zephyr/drivers/gpio.h>
+
 static uint16_t scancode_set2[KEYBOARD_COLS_MAX][KEYBOARD_ROWS] = {
 	{ 0x0000, 0x0000, 0x0014, 0xe01f, 0xe014, 0x0000, 0x0000, 0x0000 },
 	{ 0x001f, 0x0076, 0x0017, 0x000e, 0x001c, 0x003a, 0x000d, 0x0016 },
diff --git a/zephyr/program/skyrim/src/frostflow/ppc_config.c b/zephyr/program/skyrim/src/frostflow/ppc_config.c
index 6072a788eb..513c025dec 100644
--- a/zephyr/program/skyrim/src/frostflow/ppc_config.c
+++ b/zephyr/program/skyrim/src/frostflow/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Frostflow 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/morthal/ppc_config.c b/zephyr/program/skyrim/src/morthal/ppc_config.c
index f3ec1d312e..8108742fdc 100644
--- a/zephyr/program/skyrim/src/morthal/ppc_config.c
+++ b/zephyr/program/skyrim/src/morthal/ppc_config.c
@@ -5,12 +5,12 @@
 
 /* Morthal 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/morthal/usb_mux_config.c b/zephyr/program/skyrim/src/morthal/usb_mux_config.c
index 8fe76233e2..f4b6502b35 100644
--- a/zephyr/program/skyrim/src/morthal/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/morthal/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Morthal 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)
 
diff --git a/zephyr/program/skyrim/src/power_signals.c b/zephyr/program/skyrim/src/power_signals.c
index 5d372d35ae..04ed3d441d 100644
--- a/zephyr/program/skyrim/src/power_signals.c
+++ b/zephyr/program/skyrim/src/power_signals.c
@@ -7,8 +7,8 @@
 #include "charger.h"
 #include "chipset.h"
 #include "config.h"
-#include "gpio_signal.h"
 #include "gpio/gpio_int.h"
+#include "gpio_signal.h"
 #include "hooks.h"
 #include "i2c.h"
 #include "ioexpander.h"
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)
 
diff --git a/zephyr/program/skyrim/src/usb_pd_policy.c b/zephyr/program/skyrim/src/usb_pd_policy.c
index ec9f873863..745d95bc00 100644
--- a/zephyr/program/skyrim/src/usb_pd_policy.c
+++ b/zephyr/program/skyrim/src/usb_pd_policy.c
@@ -5,8 +5,6 @@
 
 /* Shared USB-C policy for Zork boards */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -20,6 +18,8 @@
 #include "usbc_ppc.h"
 #include "util.h"
 
+#include <zephyr/drivers/gpio.h>
+
 int pd_check_vconn_swap(int port)
 {
 	/*
diff --git a/zephyr/program/skyrim/src/usbc_config.c b/zephyr/program/skyrim/src/usbc_config.c
index 1795cb2b1e..1b728f1cf0 100644
--- a/zephyr/program/skyrim/src/usbc_config.c
+++ b/zephyr/program/skyrim/src/usbc_config.c
@@ -5,16 +5,14 @@
 
 /* Skyrim family-specific USB-C configuration */
 
-#include <zephyr/drivers/gpio.h>
-
-#include "cros_board_info.h"
-#include "cros_cbi.h"
 #include "battery_fuel_gauge.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
-#include "charge_state_v2.h"
 #include "charge_state.h"
+#include "charge_state_v2.h"
 #include "charger.h"
+#include "cros_board_info.h"
+#include "cros_cbi.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/charger/isl9241.h"
 #include "driver/ppc/nx20p348x.h"
@@ -29,8 +27,10 @@
 #include "power.h"
 #include "usb_mux.h"
 #include "usb_pd_tcpm.h"
-#include "usbc_ppc.h"
 #include "usbc/usb_muxes.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/winterhold/battery_present.c b/zephyr/program/skyrim/src/winterhold/battery_present.c
index eb5a5bba90..290955a242 100644
--- a/zephyr/program/skyrim/src/winterhold/battery_present.c
+++ b/zephyr/program/skyrim/src/winterhold/battery_present.c
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include <zephyr/drivers/gpio.h>
-
 #include "battery.h"
 #include "battery_smart.h"
 #include "common.h"
 
+#include <zephyr/drivers/gpio.h>
+
 static enum battery_present batt_pres_prev = BP_NOT_SURE;
 
 __overridable bool board_battery_is_initialized(void)
diff --git a/zephyr/program/skyrim/src/winterhold/kb_backlight.c b/zephyr/program/skyrim/src/winterhold/kb_backlight.c
index 049b99e3a1..cbbfc0a4e9 100644
--- a/zephyr/program/skyrim/src/winterhold/kb_backlight.c
+++ b/zephyr/program/skyrim/src/winterhold/kb_backlight.c
@@ -3,14 +3,14 @@
  * found in the LICENSE file.
  */
 
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
 #include "board_config.h"
 #include "common.h"
 #include "cros_board_info.h"
 #include "cros_cbi.h"
 
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
+
 LOG_MODULE_DECLARE(skyrim, CONFIG_SKYRIM_LOG_LEVEL);
 
 __override uint32_t board_override_feature_flags0(uint32_t flags0)
diff --git a/zephyr/program/skyrim/src/winterhold/ppc_config.c b/zephyr/program/skyrim/src/winterhold/ppc_config.c
index 72ddb6ce6c..d6adb145ff 100644
--- a/zephyr/program/skyrim/src/winterhold/ppc_config.c
+++ b/zephyr/program/skyrim/src/winterhold/ppc_config.c
@@ -5,11 +5,11 @@
 
 /* Winterhold board-specific PPC code */
 
-#include <zephyr/drivers/gpio.h>
-
 #include "driver/ppc/nx20p348x.h"
 #include "usbc_ppc.h"
 
+#include <zephyr/drivers/gpio.h>
+
 void ppc_interrupt(enum gpio_signal signal)
 {
 	switch (signal) {
diff --git a/zephyr/program/skyrim/src/winterhold/usb_mux_config.c b/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
index 1eff945ed7..19153eb676 100644
--- a/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
+++ b/zephyr/program/skyrim/src/winterhold/usb_mux_config.c
@@ -5,8 +5,6 @@
 
 /* Winterhold 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)