zephyr test: Sort drivers testcases

Sort testcase.yaml by test name and Kconfig by config name. This should
be a no-op change.

BUG=none
TEST=twister -T zephyr/test/drivers
BRANCH=none

Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: Iaeed3c54da3c589f468918c5a56cb5cea16fe2d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3966685
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Commit-Queue: Aaron Massey <aaronmassey@google.com>

2 files changed, 46 insertions, 46 deletions

diff --git a/zephyr/test/drivers/Kconfig b/zephyr/test/drivers/Kconfig
index 17cc06055d..d49577ac9b 100644
--- a/zephyr/test/drivers/Kconfig
+++ b/zephyr/test/drivers/Kconfig
@@ -17,6 +17,9 @@ config LINK_TEST_SUITE_AP_MUX_CONTROL
 config LINK_TEST_SUITE_AP_VDM_CONTROL
 	bool "Link and test the ap_vdm_control tests"
 
+config LINK_TEST_SUITE_BUTTON
+	bool "Link tests for common/button.c"
+
 config LINK_TEST_SUITE_CHARGESPLASH
 	bool "Link and test the chargesplash tests"
 
@@ -35,18 +38,24 @@ config LINK_TEST_SUITE_KEYBOARD_SCAN
 config LINK_TEST_SUITE_LED_DRIVER
 	bool "Link and test the led_driver tests"
 
+config LINK_TEST_SUITE_LOCATE_CHIP_ALTS
+	bool "Link tests for alternate operations of the locate chip host cmd"
+	help
+	  Compile a binary that allows the non herobrine paths of the locate
+	  chip command to execute
+
 config LINK_TEST_SUITE_MKBP
 	bool "Link and test the mkbp tests"
 
-config LINK_TEST_SUITE_SHIM_PWM_HC
-	bool "Link and run the shim pwm_hc tests"
-
 config LINK_TEST_SUITE_POWER_HOST_SLEEP
 	bool "Link and run the power/host_sleep.c specific tests"
 
 config LINK_TEST_SUITE_RT9490
 	bool "Link and test the rt9490 tests"
 
+config LINK_TEST_SUITE_SHIM_PWM_HC
+	bool "Link and run the shim pwm_hc tests"
+
 config LINK_TEST_SUITE_SHIM_RTC
 	bool "Link and run the shim rtc tests"
 
@@ -59,18 +68,24 @@ config LINK_TEST_SUITE_TIMER
 config LINK_TEST_SUITE_USB_MALFUNCTION_SINK
 	bool "Link and test the usb_malfunction_sink tests"
 
-config LINK_TEST_SUITE_USB_PORT_POWER_DUMB
-	bool "Link and test the usb_port_power_dumb tests"
-
 config LINK_TEST_SUITE_USB_PD_DPS
 	bool "Link and test the dps tests"
 
+config LINK_TEST_SUITE_USB_PORT_POWER_DUMB
+	bool "Link and test the usb_port_power_dumb tests"
+
 config LINK_TEST_SUITE_USB_RETIMER_FW_UPDATE
 	bool "Link and test the usb_retimer_fw_update tests"
 
 config LINK_TEST_SUITE_USBC_ALT_MODE
 	bool "Link and test the usbc_alt_mode tests"
 
+config LINK_TEST_SUITE_USBC_OCP
+	bool "Link tests for common USBC OCP code"
+
+config LINK_TEST_SUITE_USBC_PPC
+	bool "Link tests for common USBC PPC code"
+
 config LINK_TEST_SUITE_USBC_SVDM_DFP_ONLY
 	bool "Link and test the usbc_svdm_dfp_only tests"
 
@@ -82,19 +97,4 @@ config LINK_TEST_SUITE_USBC_VCONN_SWAP
 	help
 	  Include the test suite exercising VCONN Swap behaviors in the binary.
 
-config LINK_TEST_SUITE_USBC_OCP
-	bool "Link tests for common USBC OCP code"
-
-config LINK_TEST_SUITE_USBC_PPC
-	bool "Link tests for common USBC PPC code"
-
-config LINK_TEST_SUITE_LOCATE_CHIP_ALTS
-	bool "Link tests for alternate operations of the locate chip host cmd"
-	help
-	  Compile a binary that allows the non herobrine paths of the locate
-	  chip command to execute
-
-config LINK_TEST_SUITE_BUTTON
-	bool "Link tests for common/button.c"
-
 source "Kconfig.zephyr"
diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml
index d6530bcd9a..b8e02a6726 100644
--- a/zephyr/test/drivers/testcase.yaml
+++ b/zephyr/test/drivers/testcase.yaml
@@ -22,26 +22,10 @@ tests:
       - CONFIG_POWER_SEQUENCE_MOCK=y
       - CONFIG_PLATFORM_EC_CBI_EEPROM=y
       - CONFIG_PLATFORM_EC_USB_PD_DPS=y
-  drivers.button:
-    timeout: 240
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_BUTTON=y
-      - CONFIG_PLATFORM_EC_CMD_BUTTON=y
-      - CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
-      - CONFIG_PLATFORM_EC_EMULATED_SYSRQ=y
   drivers.anx7447:
     extra_args: CONF_FILE="prj.conf;anx7447/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./anx7447/tcpc_policy.dts"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_ANX7447=y
-  drivers.host_cmd:
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_HOST_COMMANDS=y
-      - CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
-      - CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
-      - CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y
-  drivers.locate_chip:
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_LOCATE_CHIP_ALTS=y
   drivers.ap_mux_control:
     extra_args: CONF_FILE="prj.conf;ap_mux_control/prj.conf"
     extra_configs:
@@ -50,6 +34,13 @@ tests:
     extra_args: CONF_FILE="prj.conf;ap_vdm_control/prj.conf"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_AP_VDM_CONTROL=y
+  drivers.button:
+    timeout: 240
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_BUTTON=y
+      - CONFIG_PLATFORM_EC_CMD_BUTTON=y
+      - CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y
+      - CONFIG_PLATFORM_EC_EMULATED_SYSRQ=y
   drivers.chargesplash:
     timeout: 240
     extra_configs:
@@ -63,6 +54,12 @@ tests:
     extra_args: CONF_FILE="prj.conf;dps/prj.conf"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_USB_PD_DPS=y
+  drivers.host_cmd:
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_HOST_COMMANDS=y
+      - CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y
+      - CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
+      - CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE=y
   drivers.isl923x:
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_ISL923X=y
@@ -82,6 +79,9 @@ tests:
     extra_args: CONF_FILE="prj.conf;led_driver/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./led_driver/led_pins.dts;./led_driver/led_policy.dts"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_LED_DRIVER=y
+  drivers.locate_chip:
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_LOCATE_CHIP_ALTS=y
   drivers.mkbp:
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_MKBP=y
@@ -92,9 +92,6 @@ tests:
     tags:
       common
       mkbp
-  drivers.shim_pwm_hc:
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_SHIM_PWM_HC=y
   drivers.power_host_sleep:
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_POWER_HOST_SLEEP=y
@@ -108,6 +105,9 @@ tests:
     extra_args: CONF_FILE="prj.conf;rt9490/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./rt9490/charger.dts"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_RT9490=y
+  drivers.shim_pwm_hc:
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_SHIM_PWM_HC=y
   drivers.shim_rtc:
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_SHIM_RTC=y
@@ -153,6 +153,12 @@ tests:
      - CONFIG_PLATFORM_EC_USB_PD_REQUIRE_AP_MODE_ENTRY=n
      - CONFIG_LINK_TEST_SUITE_USBC_ALT_MODE=y
      - CONFIG_POWER_SEQUENCE_MOCK=y
+  drivers.usbc_ocp:
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_USBC_OCP=y
+  drivers.usbc_ppc:
+    extra_configs:
+      - CONFIG_LINK_TEST_SUITE_USBC_PPC=y
   drivers.usbc_svdm_dfp_only:
     extra_args: CONF_FILE="prj.conf;usbc_svdm_dfp_only/prj.conf"
     extra_configs:
@@ -163,9 +169,3 @@ tests:
   drivers.usbc_vconn_swap:
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_USBC_VCONN_SWAP=y
-  drivers.usbc_ocp:
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_USBC_OCP=y
-  drivers.usbc_ppc:
-    extra_configs:
-      - CONFIG_LINK_TEST_SUITE_USBC_PPC=y