board: Sort header files

Sort all includes in board 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 -a

Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I6ad72b167cbb768a64c338fa633eb4bf5a401897
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4060360
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>

7 files changed, 16 insertions, 18 deletions

diff --git a/board/osiris/board.c b/board/osiris/board.c
index 6cfd7d8c26..20c1ae0993 100644
--- a/board/osiris/board.c
+++ b/board/osiris/board.c
@@ -10,20 +10,20 @@
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
+#include "fw_config.h"
 #include "gpio.h"
 #include "gpio_signal.h"
 #include "hooks.h"
-#include "fw_config.h"
-#include "hooks.h"
 #include "lid_switch.h"
-#include "power_button.h"
 #include "power.h"
+#include "power_button.h"
 #include "registers.h"
 #include "switch.h"
 #include "throttle_ap.h"
 #include "usbc_config.h"
 
-#include "gpio_list.h" /* Must come after other header files. */
+/* Must come after other header files and interrupt handler declarations */
+#include "gpio_list.h"
 
 /* Console output macros */
 #define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ##args)
diff --git a/board/osiris/charger.c b/board/osiris/charger.c
index 7a16fcd5cb..c6ee062ab5 100644
--- a/board/osiris/charger.c
+++ b/board/osiris/charger.c
@@ -3,16 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
-
 #include "charge_manager.h"
 #include "charge_state_v2.h"
 #include "charger.h"
+#include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
 #include "driver/charger/isl9241.h"
-#include "usbc_ppc.h"
 #include "usb_pd.h"
+#include "usbc_ppc.h"
 #include "util.h"
 
 #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args)
diff --git a/board/osiris/fans.c b/board/osiris/fans.c
index 5878d4c4c5..af7bc1e17f 100644
--- a/board/osiris/fans.c
+++ b/board/osiris/fans.c
@@ -8,8 +8,8 @@
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
-#include "fan_chip.h"
 #include "fan.h"
+#include "fan_chip.h"
 #include "hooks.h"
 #include "pwm.h"
 #include "util.h"
diff --git a/board/osiris/led.c b/board/osiris/led.c
index 993c2969d4..f06cc17f8f 100644
--- a/board/osiris/led.c
+++ b/board/osiris/led.c
@@ -4,11 +4,11 @@
  * Power and battery LED control for osiris
  */
 
+#include "chipset.h"
 #include "ec_commands.h"
 #include "gpio.h"
 #include "led_common.h"
 #include "led_onoff_states.h"
-#include "chipset.h"
 
 #define LED_ON_LVL 0
 #define LED_OFF_LVL 1
diff --git a/board/osiris/pwm.c b/board/osiris/pwm.c
index eb178750e9..cc093a208f 100644
--- a/board/osiris/pwm.c
+++ b/board/osiris/pwm.c
@@ -4,7 +4,6 @@
  */
 
 #include "common.h"
-
 #include "compile_time_macros.h"
 #include "hooks.h"
 #include "pwm.h"
diff --git a/board/osiris/sensors.c b/board/osiris/sensors.c
index 9ad528c069..4232a1a3fa 100644
--- a/board/osiris/sensors.c
+++ b/board/osiris/sensors.c
@@ -3,15 +3,15 @@
  * found in the LICENSE file.
  */
 
-#include "common.h"
 #include "accelgyro.h"
 #include "adc.h"
+#include "common.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "motion_sense.h"
 #include "temp_sensor.h"
-#include "thermal.h"
 #include "temp_sensor/thermistor.h"
+#include "thermal.h"
 
 /* ADC configuration */
 const struct adc_t adc_channels[] = {
diff --git a/board/osiris/usbc_config.c b/board/osiris/usbc_config.c
index d116e080ad..3f5e5adb91 100644
--- a/board/osiris/usbc_config.c
+++ b/board/osiris/usbc_config.c
@@ -3,12 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-
 #include "cbi.h"
-#include "charger.h"
 #include "charge_ramp.h"
+#include "charger.h"
 #include "common.h"
 #include "compile_time_macros.h"
 #include "console.h"
@@ -25,12 +22,15 @@
 #include "task.h"
 #include "task_id.h"
 #include "timer.h"
-#include "usbc_config.h"
-#include "usbc_ppc.h"
 #include "usb_charge.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpm.h"
+#include "usbc_config.h"
+#include "usbc_ppc.h"
+
+#include <stdbool.h>
+#include <stdint.h>
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)