zephyr: de-clang-format a bunch of enums and inits

Usually clang-format works great, but it gets really confused by
macros that include a comma termination in their definition. In those
situation it tends to add unnecessary indentation and makes it more
confusing to understand that the statements on different lines are
actually doing the same thing.

Don't think there's a good way of configuring the tool to do that
properly, and frankly it's probably fine to indent few weird code
snippets manually.

This fixes a bunch of enums and initialization code that had unusual
indentation by shutting clang off for the block and indenting manually

BRANCH=none
BUG=none
TEST=zmake compare-builds -a

Signed-off-by: Fabio Baltieri <fabio.baltieri@gmail.com>
Change-Id: Ic923b27c2ed9f66a2858bfa12e63838f1538700d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4264115
Tested-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Fabio Baltieri <fabiobaltieri@google.com>

19 files changed, 153 insertions, 112 deletions

diff --git a/zephyr/include/ap_power/ap_pwrseq.h b/zephyr/include/ap_power/ap_pwrseq.h
index 86c5f051e6..f7324b0f6c 100644
--- a/zephyr/include/ap_power/ap_pwrseq.h
+++ b/zephyr/include/ap_power/ap_pwrseq.h
@@ -32,6 +32,7 @@ extern "C" {
 			     ())))
 
 /** @brief AP power sequence valid power states. */
+/* clang-format off */
 enum ap_pwrseq_state {
 	AP_POWER_STATE_UNINIT, /* EC and AP are Uninitialized */
 	AP_POWER_STATE_G3, /* AP is OFF */
@@ -43,10 +44,11 @@ enum ap_pwrseq_state {
 	AP_POWER_STATE_S0, /* AP is in active state */
 	DT_FOREACH_STATUS_OKAY(ap_pwrseq_sub_states,
 			       AP_PWRSEQ_EACH_SUB_STATE_ENUM_DEF)
-		AP_POWER_STATE_COUNT,
+	AP_POWER_STATE_COUNT,
 	AP_POWER_STATE_UNDEF = 0xFFFE,
 	AP_POWER_STATE_ERROR = 0xFFFF,
 };
+/* clang-format on */
 
 /** @brief AP power sequence events. */
 enum ap_pwrseq_event {
diff --git a/zephyr/shim/include/battery_enum.h b/zephyr/shim/include/battery_enum.h
index 774b9d4c29..95fbecf8d2 100644
--- a/zephyr/shim/include/battery_enum.h
+++ b/zephyr/shim/include/battery_enum.h
@@ -13,12 +13,14 @@
 #define BATTERY_TYPE_WITH_COMMA(id) BATTERY_TYPE(id),
 
 /* This produces a list of BATTERY_<ENUM_NAME> identifiers */
+/* clang-format off */
 enum battery_type {
 #if DT_HAS_COMPAT_STATUS_OKAY(battery_smart)
 	DT_FOREACH_STATUS_OKAY(battery_smart, BATTERY_TYPE_WITH_COMMA)
 #endif
-		BATTERY_TYPE_COUNT,
+	BATTERY_TYPE_COUNT,
 };
+/* clang-format on */
 
 #undef BATTERY_TYPE_WITH_COMMA
 
diff --git a/zephyr/shim/include/cros_cbi.h b/zephyr/shim/include/cros_cbi.h
index 603be590c1..49d3608426 100644
--- a/zephyr/shim/include/cros_cbi.h
+++ b/zephyr/shim/include/cros_cbi.h
@@ -61,21 +61,24 @@ enum cbi_ssfc_value_id {
 /*
  * Enum list of all fields.
  */
+/* clang-format off */
 enum cbi_fw_config_field_id {
 	DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_COMPAT,
 			       CBI_FW_CONFIG_CHILD_ENUM_LIST)
-		CBI_FW_CONFIG_FIELDS_COUNT
+	CBI_FW_CONFIG_FIELDS_COUNT
 };
+/* clang-format on */
 
 /*
  * enum list of all child values.
  */
+/* clang-format off */
 enum cbi_fw_config_value_id {
 	DT_FOREACH_STATUS_OKAY(CBI_FW_CONFIG_VALUE_COMPAT,
 			       CBI_FW_CONFIG_ENUM_WITH_VALUE)
-		CBI_FW_CONFIG_VALUES_LAST /* added to ensure at least one entry
-					   */
+	CBI_FW_CONFIG_VALUES_LAST /* added to ensure at least one entry */
 };
+/* clang-format on */
 
 /**
  * @brief Initialize CBI SSFC
diff --git a/zephyr/shim/include/motionsense_sensors_defs.h b/zephyr/shim/include/motionsense_sensors_defs.h
index b4b0274237..35e4de56d7 100644
--- a/zephyr/shim/include/motionsense_sensors_defs.h
+++ b/zephyr/shim/include/motionsense_sensors_defs.h
@@ -20,12 +20,14 @@
 		   (COND_CODE_0(DT_NODE_HAS_PROP(id, alternate_for), \
 				(SENSOR_ID(id), ), ())))
 
+/* clang-format off */
 enum sensor_id {
 #if DT_NODE_EXISTS(SENSOR_NODE)
 	DT_FOREACH_CHILD(SENSOR_NODE, SENSOR_ID_WITH_COMMA)
 #endif
-		SENSOR_COUNT,
+	SENSOR_COUNT,
 };
+/* clang-format on */
 
 #undef SENSOR_ID_WITH_COMMA
 /* Define the SENSOR_ID if:
@@ -35,12 +37,14 @@ enum sensor_id {
 	IF_ENABLED(DT_NODE_HAS_STATUS(id, okay),                     \
 		   (COND_CODE_1(DT_NODE_HAS_PROP(id, alternate_for), \
 				(SENSOR_ID(id), ), ())))
+/* clang-format off */
 enum sensor_alt_id {
 #if DT_NODE_EXISTS(SENSOR_ALT_NODE)
 	DT_FOREACH_CHILD(SENSOR_ALT_NODE, SENSOR_ID_WITH_COMMA)
 #endif
-		SENSOR_ALT_COUNT,
+	SENSOR_ALT_COUNT,
 };
+/* clang-format on */
 
 /*
  * Find the accelerometers for lid angle calculation.
diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h
index 4cccd51b73..9c8e03e493 100644
--- a/zephyr/shim/include/shimmed_task_id.h
+++ b/zephyr/shim/include/shimmed_task_id.h
@@ -212,14 +212,16 @@ enum {
  */
 #define CROS_EC_TASK(name, ...) TASK_ID_##name,
 #define TASK_TEST(name, ...) CROS_EC_TASK(name)
+/* clang-format off */
 enum {
 	CROS_EC_TASK_LIST
 #ifdef TEST_BUILD
-		TASK_ID_TEST_RUNNER,
+	TASK_ID_TEST_RUNNER,
 #endif
 	TASK_ID_COUNT,
 	TASK_ID_INVALID = 0xff, /* Unable to find the task */
 };
+/* clang-format on */
 #undef CROS_EC_TASK
 #undef TASK_TEST
 
diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h
index 5ff7662d62..d35a283a41 100644
--- a/zephyr/shim/include/temp_sensor/temp_sensor.h
+++ b/zephyr/shim/include/temp_sensor/temp_sensor.h
@@ -120,10 +120,12 @@ enum temp_sensor_id {
 #define PCT2075_SENSOR_ID(node_id) DT_CAT(PCT2075_, node_id)
 #define PCT2075_SENSOR_ID_WITH_COMMA(node_id) PCT2075_SENSOR_ID(node_id),
 
+/* clang-format off */
 enum pct2075_sensor {
 	DT_FOREACH_STATUS_OKAY(PCT2075_COMPAT, PCT2075_SENSOR_ID_WITH_COMMA)
-		PCT2075_COUNT,
+	PCT2075_COUNT,
 };
+/* clang-format on */
 
 #undef PCT2075_SENSOR_ID_WITH_COMMA
 
@@ -136,10 +138,12 @@ enum pct2075_sensor {
 #define TMP112_SENSOR_ID(node_id) DT_CAT(TMP112_, node_id)
 #define TMP112_SENSOR_ID_WITH_COMMA(node_id) TMP112_SENSOR_ID(node_id),
 
+/* clang-format off */
 enum tmp112_sensor {
 	DT_FOREACH_STATUS_OKAY(TMP112_COMPAT, TMP112_SENSOR_ID_WITH_COMMA)
-		TMP112_COUNT,
+	TMP112_COUNT,
 };
+/* clang-format on */
 
 #undef TMP112_SENSOR_ID_WITH_COMMA
 
@@ -152,10 +156,12 @@ enum tmp112_sensor {
 #define F75303_SENSOR_ID(node_id) DT_CAT(F75303_, node_id)
 #define F75303_SENSOR_ID_WITH_COMMA(node_id) F75303_SENSOR_ID(node_id),
 
+/* clang-format off */
 enum f75303_sensor {
 	DT_FOREACH_STATUS_OKAY(F75303_COMPAT, F75303_SENSOR_ID_WITH_COMMA)
-		F75303_IDX_COUNT,
+	F75303_IDX_COUNT,
 };
+/* clang-format on */
 
 #undef F75303_SENSOR_ID_WITH_COMMA
 
diff --git a/zephyr/shim/include/usbc/anx7447_usb_mux.h b/zephyr/shim/include/usbc/anx7447_usb_mux.h
index 874958c04c..7118e222db 100644
--- a/zephyr/shim/include/usbc/anx7447_usb_mux.h
+++ b/zephyr/shim/include/usbc/anx7447_usb_mux.h
@@ -10,13 +10,14 @@
 
 #define ANX7447_USB_MUX_COMPAT analogix_usbc_mux_anx7447
 
-#define USB_MUX_CONFIG_ANX7447(mux_id)                                      \
-	{                                                                   \
-		USB_MUX_COMMON_FIELDS(mux_id),                              \
-			.driver = &anx7447_usb_mux_driver,                  \
-			.hpd_update = COND_CODE_1(                          \
-				DT_PROP(mux_id, hpd_update_enable),         \
-				(&anx7447_tcpc_update_hpd_status), (NULL)), \
+/* clang-format off */
+#define USB_MUX_CONFIG_ANX7447(mux_id)                                         \
+	{                                                                      \
+		USB_MUX_COMMON_FIELDS(mux_id),                                 \
+		.driver = &anx7447_usb_mux_driver,                             \
+		.hpd_update = COND_CODE_1(DT_PROP(mux_id, hpd_update_enable),  \
+			(&anx7447_tcpc_update_hpd_status), (NULL)),            \
 	}
+/* clang-format on */
 
 #endif /* __ZEPHYR_SHIM_ANX7447_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/anx7483_usb_mux.h b/zephyr/shim/include/usbc/anx7483_usb_mux.h
index 5e56837e3a..1a84d94da3 100644
--- a/zephyr/shim/include/usbc/anx7483_usb_mux.h
+++ b/zephyr/shim/include/usbc/anx7483_usb_mux.h
@@ -10,12 +10,14 @@
 
 #define ANX7483_USB_MUX_COMPAT analogix_anx7483
 
-#define USB_MUX_CONFIG_ANX7483(mux_id)                         \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &anx7483_usb_retimer_driver, \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+/* clang-format off */
+#define USB_MUX_CONFIG_ANX7483(mux_id)                 \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &anx7483_usb_retimer_driver, \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 
 #endif /* __ZEPHYR_SHIM_ANX7483_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/bb_retimer_usb_mux.h b/zephyr/shim/include/usbc/bb_retimer_usb_mux.h
index 57a471fb2e..64dd9ba645 100644
--- a/zephyr/shim/include/usbc/bb_retimer_usb_mux.h
+++ b/zephyr/shim/include/usbc/bb_retimer_usb_mux.h
@@ -14,14 +14,16 @@
 #define BB_RETIMER_USB_MUX_COMPAT intel_jhl9040r
 #endif
 
-#define USB_MUX_CONFIG_BB_RETIMER(mux_id)                      \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &bb_usb_retimer,             \
-			.hpd_update = bb_retimer_hpd_update,   \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+/* clang-format off */
+#define USB_MUX_CONFIG_BB_RETIMER(mux_id)              \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &bb_usb_retimer,             \
+		.hpd_update = bb_retimer_hpd_update,   \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 
 /**
  * @brief Get reset gpio for @p mux_id retimer
diff --git a/zephyr/shim/include/usbc/it5205_usb_mux.h b/zephyr/shim/include/usbc/it5205_usb_mux.h
index 983248f3e2..e143038f6c 100644
--- a/zephyr/shim/include/usbc/it5205_usb_mux.h
+++ b/zephyr/shim/include/usbc/it5205_usb_mux.h
@@ -10,12 +10,14 @@
 
 #define IT5205_USB_MUX_COMPAT ite_it5205
 
-#define USB_MUX_CONFIG_IT5205(mux_id)                          \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &it5205_usb_mux_driver,      \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+/* clang-format off */
+#define USB_MUX_CONFIG_IT5205(mux_id)                  \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &it5205_usb_mux_driver,      \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 
 #endif /* __ZEPHYR_SHIM_IT5205_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/ps8743_usb_mux.h b/zephyr/shim/include/usbc/ps8743_usb_mux.h
index 75ce778bac..8cb54f4c17 100644
--- a/zephyr/shim/include/usbc/ps8743_usb_mux.h
+++ b/zephyr/shim/include/usbc/ps8743_usb_mux.h
@@ -10,12 +10,14 @@
 
 #define PS8743_USB_MUX_COMPAT parade_ps8743
 
-#define USB_MUX_CONFIG_PS8743(mux_id)                          \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &ps8743_usb_mux_driver,      \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+/* clang-format off */
+#define USB_MUX_CONFIG_PS8743(mux_id)                  \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &ps8743_usb_mux_driver,      \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 
 #endif /* __ZEPHYR_SHIM_PS8743_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/ps8818_usb_mux.h b/zephyr/shim/include/usbc/ps8818_usb_mux.h
index c45e69aee3..400f238366 100644
--- a/zephyr/shim/include/usbc/ps8818_usb_mux.h
+++ b/zephyr/shim/include/usbc/ps8818_usb_mux.h
@@ -10,12 +10,14 @@
 
 #define PS8818_USB_MUX_COMPAT parade_ps8818
 
-#define USB_MUX_CONFIG_PS8818(mux_id)                          \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &ps8818_usb_retimer_driver,  \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+/* clang-format off */
+#define USB_MUX_CONFIG_PS8818(mux_id)                  \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &ps8818_usb_retimer_driver,  \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 
 #endif /* __ZEPHYR_SHIM_PS8818_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/tcpci_usb_mux.h b/zephyr/shim/include/usbc/tcpci_usb_mux.h
index 1a5dd38241..3c8f062920 100644
--- a/zephyr/shim/include/usbc/tcpci_usb_mux.h
+++ b/zephyr/shim/include/usbc/tcpci_usb_mux.h
@@ -17,25 +17,27 @@
  * Add I2C configuration and USB_MUX_FLAG_NOT_TCPC to enforce it when
  * mux_read()/mux_write() functions are used.
  */
+/* clang-format off */
 #define USB_MUX_CONFIG_TCPCI_TCPM_WITH_I2C(mux_id)                             \
 	{                                                                      \
 		USB_MUX_COMMON_FIELDS_WITH_FLAGS(                              \
 			mux_id, USB_MUX_FLAG_NOT_TCPC, USB_MUX_FLAG_NOT_TCPC), \
-			.driver = &tcpci_tcpm_usb_mux_driver,                  \
-			.hpd_update =                                          \
-				USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update),  \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),                   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id),                 \
+		.driver = &tcpci_tcpm_usb_mux_driver,                          \
+		.hpd_update = USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update),    \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),                           \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id),                         \
 	}
+/* clang-format on */
 
 /** Use I2C configuration from TCPC */
-#define USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id)                              \
-	{                                                                     \
-		USB_MUX_COMMON_FIELDS(mux_id),                                \
-			.driver = &tcpci_tcpm_usb_mux_driver,                 \
-			.hpd_update =                                         \
-				USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update), \
+/* clang-format off */
+#define USB_MUX_CONFIG_TCPCI_TCPM_WO_I2C(mux_id)                               \
+	{                                                                      \
+		USB_MUX_COMMON_FIELDS(mux_id),                                 \
+		.driver = &tcpci_tcpm_usb_mux_driver,                          \
+		.hpd_update = USB_MUX_CALLBACK_OR_NULL(mux_id, hpd_update),    \
 	}
+/* clang-format on */
 
 #define USB_MUX_CONFIG_TCPCI_TCPM(mux_id)                         \
 	COND_CODE_1(DT_NODE_HAS_PROP(mux_id, reg),                \
diff --git a/zephyr/shim/include/usbc/tusb1064_usb_mux.h b/zephyr/shim/include/usbc/tusb1064_usb_mux.h
index 4dfdcaff18..e14b500000 100644
--- a/zephyr/shim/include/usbc/tusb1064_usb_mux.h
+++ b/zephyr/shim/include/usbc/tusb1064_usb_mux.h
@@ -12,30 +12,32 @@
 #define TUSB1064_EMUL_COMPAT zephyr_tusb1064_emul
 
 #if defined(CONFIG_USB_MUX_TUSB1044)
-#define USB_MUX_CONFIG_TUSB1064(mux_id)                        \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &tusb1064_usb_mux_driver,    \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
-			.hpd_update = &tusb1044_hpd_update,    \
+/* clang-format off */
+#define USB_MUX_CONFIG_TUSB1064(mux_id)                \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &tusb1064_usb_mux_driver,    \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+		.hpd_update = &tusb1044_hpd_update,    \
 	}
 #elif defined(CONFIG_USB_MUX_TUSB546)
-#define USB_MUX_CONFIG_TUSB1064(mux_id)                        \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &tusb1064_usb_mux_driver,    \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+#define USB_MUX_CONFIG_TUSB1064(mux_id)                \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &tusb1064_usb_mux_driver,    \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
 #else
-#define USB_MUX_CONFIG_TUSB1064(mux_id)                        \
-	{                                                      \
-		USB_MUX_COMMON_FIELDS(mux_id),                 \
-			.driver = &tusb1064_usb_mux_driver,    \
-			.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
-			.i2c_addr_flags = DT_REG_ADDR(mux_id), \
+#define USB_MUX_CONFIG_TUSB1064(mux_id)                \
+	{                                              \
+		USB_MUX_COMMON_FIELDS(mux_id),         \
+		.driver = &tusb1064_usb_mux_driver,    \
+		.i2c_port = I2C_PORT_BY_DEV(mux_id),   \
+		.i2c_addr_flags = DT_REG_ADDR(mux_id), \
 	}
+/* clang-format on */
 #endif /* defined(CONFIG_USB_MUX_TUSB1044) */
 
 #endif /* __ZEPHYR_SHIM_TUBS1064_USB_MUX_H */
diff --git a/zephyr/shim/include/usbc/usb_muxes.h b/zephyr/shim/include/usbc/usb_muxes.h
index 6ee9c691a8..c7aee09011 100644
--- a/zephyr/shim/include/usbc/usb_muxes.h
+++ b/zephyr/shim/include/usbc/usb_muxes.h
@@ -26,19 +26,21 @@
  * @brief List of USB mux drivers compatibles and their configurations. Each
  *        element of list has to have (compatible, config) format.
  */
-#define USB_MUX_DRIVERS                                                 \
-	(AMD_FP6_USB_MUX_COMPAT, USB_MUX_CONFIG_AMD_FP6),               \
-		(ANX7447_USB_MUX_COMPAT, USB_MUX_CONFIG_ANX7447),       \
-		(ANX7483_USB_MUX_COMPAT, USB_MUX_CONFIG_ANX7483),       \
-		(BB_RETIMER_USB_MUX_COMPAT, USB_MUX_CONFIG_BB_RETIMER), \
-		(IT5205_USB_MUX_COMPAT, USB_MUX_CONFIG_IT5205),         \
-		(PS8743_USB_MUX_COMPAT, USB_MUX_CONFIG_PS8743),         \
-		(PS8818_USB_MUX_COMPAT, USB_MUX_CONFIG_PS8818),         \
-		(PS8XXX_USB_MUX_COMPAT, USB_MUX_CONFIG_TCPCI_TCPM),     \
-		(TCPCI_TCPM_USB_MUX_COMPAT, USB_MUX_CONFIG_TCPCI_TCPM), \
-		(TUSB1064_USB_MUX_COMPAT, USB_MUX_CONFIG_TUSB1064),     \
-		(TUSB1064_EMUL_COMPAT, USB_MUX_CONFIG_TUSB1064),        \
-		(VIRTUAL_USB_MUX_COMPAT, USB_MUX_CONFIG_VIRTUAL)
+/* clang-format off */
+#define USB_MUX_DRIVERS                                         \
+	(AMD_FP6_USB_MUX_COMPAT, USB_MUX_CONFIG_AMD_FP6),       \
+	(ANX7447_USB_MUX_COMPAT, USB_MUX_CONFIG_ANX7447),       \
+	(ANX7483_USB_MUX_COMPAT, USB_MUX_CONFIG_ANX7483),       \
+	(BB_RETIMER_USB_MUX_COMPAT, USB_MUX_CONFIG_BB_RETIMER), \
+	(IT5205_USB_MUX_COMPAT, USB_MUX_CONFIG_IT5205),         \
+	(PS8743_USB_MUX_COMPAT, USB_MUX_CONFIG_PS8743),         \
+	(PS8818_USB_MUX_COMPAT, USB_MUX_CONFIG_PS8818),         \
+	(PS8XXX_USB_MUX_COMPAT, USB_MUX_CONFIG_TCPCI_TCPM),     \
+	(TCPCI_TCPM_USB_MUX_COMPAT, USB_MUX_CONFIG_TCPCI_TCPM), \
+	(TUSB1064_USB_MUX_COMPAT, USB_MUX_CONFIG_TUSB1064),     \
+	(TUSB1064_EMUL_COMPAT, USB_MUX_CONFIG_TUSB1064),        \
+	(VIRTUAL_USB_MUX_COMPAT, USB_MUX_CONFIG_VIRTUAL)
+/* clang-format on */
 
 /**
  * @brief Get compatible from @p driver
diff --git a/zephyr/shim/include/zephyr_gpio_signal.h b/zephyr/shim/include/zephyr_gpio_signal.h
index 9dc0a038bb..c74a9c4810 100644
--- a/zephyr/shim/include/zephyr_gpio_signal.h
+++ b/zephyr/shim/include/zephyr_gpio_signal.h
@@ -66,22 +66,24 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(named_gpios) == 1,
 #define GPIO_DT_ALIAS_LIST(id) \
 	COND_CODE_1(DT_NODE_HAS_PROP(id, alias), (GPIO_DT_MK_ALIAS(id)), ())
 
+/* clang-format off */
 enum gpio_signal {
 	GPIO_UNIMPLEMENTED = -1,
 #if DT_NODE_EXISTS(NAMED_GPIOS_NODE)
 	DT_FOREACH_CHILD(NAMED_GPIOS_NODE, GPIO_IMPL_SIGNAL)
 #endif
-		GPIO_COUNT,
+	GPIO_COUNT,
 #if DT_NODE_EXISTS(NAMED_GPIOS_NODE)
 	DT_FOREACH_CHILD(NAMED_GPIOS_NODE, GPIO_UNIMPL_SIGNAL)
-		DT_FOREACH_CHILD(NAMED_GPIOS_NODE, GPIO_DT_ALIAS_LIST)
+	DT_FOREACH_CHILD(NAMED_GPIOS_NODE, GPIO_DT_ALIAS_LIST)
 #endif
-			GPIO_LIMIT = 0x0FFF,
+	GPIO_LIMIT = 0x0FFF,
 
 	IOEX_SIGNAL_START = GPIO_LIMIT + 1,
 	IOEX_SIGNAL_END = IOEX_SIGNAL_START,
 	IOEX_LIMIT = 0x1FFF,
 };
+/* clang-format on */
 #undef GPIO_DT_ALIAS_LIST
 #undef GPIO_DT_MK_ALIAS
 #undef GPIO_IMPL_SIGNAL
@@ -161,11 +163,13 @@ DT_FOREACH_CHILD(NAMED_GPIOS_NODE, GPIO_DT_PTR_DECL)
 #define IOEXPANDER_ID_EXPAND(id) ioex_chip_##id
 #define IOEXPANDER_ID(id) IOEXPANDER_ID_EXPAND(id)
 #define IOEXPANDER_ID_FROM_INST_WITH_COMMA(id) IOEXPANDER_ID(id),
+/* clang-format off */
 enum ioexpander_id {
 	DT_FOREACH_STATUS_OKAY(cros_ioex_chip,
 			       IOEXPANDER_ID_FROM_INST_WITH_COMMA)
-		CONFIG_IO_EXPANDER_PORT_COUNT
+	CONFIG_IO_EXPANDER_PORT_COUNT
 };
+/* clang-format on */
 
 /**
  * Obtain the gpio_dt_spec structure associated with
diff --git a/zephyr/subsys/ap_pwrseq/include/power_signals.h b/zephyr/subsys/ap_pwrseq/include/power_signals.h
index c5fdbf819b..b4858cfd85 100644
--- a/zephyr/subsys/ap_pwrseq/include/power_signals.h
+++ b/zephyr/subsys/ap_pwrseq/include/power_signals.h
@@ -66,16 +66,15 @@
  * The order that these compatibles are processed in
  * must be the same as in power_signals.c
  */
+/* clang-format off */
 enum power_signal {
 	DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_gpio, PWR_SIGNAL_ENUM_COMMA)
-		DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_vw,
-				       PWR_SIGNAL_ENUM_COMMA)
-			DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_external,
-					       PWR_SIGNAL_ENUM_COMMA)
-				DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_adc,
-						       PWR_SIGNAL_ENUM_COMMA)
-					POWER_SIGNAL_COUNT,
+	DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_vw, PWR_SIGNAL_ENUM_COMMA)
+	DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_external, PWR_SIGNAL_ENUM_COMMA)
+	DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_adc, PWR_SIGNAL_ENUM_COMMA)
+	POWER_SIGNAL_COUNT,
 };
+/* clang-format on */
 
 #undef PWR_SIGNAL_ENUM_COMMA
 
diff --git a/zephyr/subsys/ap_pwrseq/include/signal_gpio.h b/zephyr/subsys/ap_pwrseq/include/signal_gpio.h
index f6ffde2fba..9a201fc742 100644
--- a/zephyr/subsys/ap_pwrseq/include/signal_gpio.h
+++ b/zephyr/subsys/ap_pwrseq/include/signal_gpio.h
@@ -23,10 +23,12 @@
 
 #define PWR_GPIO_ENUM(id) TAG_GPIO(PWR_SIG_TAG_GPIO, PWR_SIGNAL_ENUM(id)),
 
+/* clang-format off */
 enum pwr_sig_gpio {
 	DT_FOREACH_STATUS_OKAY(intel_ap_pwrseq_gpio, PWR_GPIO_ENUM)
-		PWR_SIG_GPIO_COUNT
+	PWR_SIG_GPIO_COUNT
 };
+/* clang-format on */
 
 #undef PWR_GPIO_ENUM
 #undef TAG_GPIO
diff --git a/zephyr/subsys/ap_pwrseq/power_signals.c b/zephyr/subsys/ap_pwrseq/power_signals.c
index 67101d7128..765cc95707 100644
--- a/zephyr/subsys/ap_pwrseq/power_signals.c
+++ b/zephyr/subsys/ap_pwrseq/power_signals.c
@@ -64,18 +64,18 @@ struct ps_config {
 /*
  * Generate the power signal configuration array.
  */
+/* clang-format off */
 static const struct ps_config sig_config[] = {
 	DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_gpio, GEN_PS_ENTRY,
 				     PWR_SIG_SRC_GPIO, PWR_SIG_TAG_GPIO)
-		DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_vw, GEN_PS_ENTRY,
-					     PWR_SIG_SRC_VW, PWR_SIG_TAG_VW)
-			DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_external,
-						     GEN_PS_ENTRY_NO_ENUM,
-						     PWR_SIG_SRC_EXT)
-				DT_FOREACH_STATUS_OKAY_VARGS(
-					intel_ap_pwrseq_adc, GEN_PS_ENTRY,
-					PWR_SIG_SRC_ADC, PWR_SIG_TAG_ADC)
+	DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_vw, GEN_PS_ENTRY,
+				     PWR_SIG_SRC_VW, PWR_SIG_TAG_VW)
+	DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_external,
+				     GEN_PS_ENTRY_NO_ENUM, PWR_SIG_SRC_EXT)
+	DT_FOREACH_STATUS_OKAY_VARGS(intel_ap_pwrseq_adc, GEN_PS_ENTRY,
+				     PWR_SIG_SRC_ADC, PWR_SIG_TAG_ADC)
 };
+/* clang-format on */
 
 #define PWR_SIGNAL_POLLED(id) PWR_SIGNAL_ENUM(id),