zephyr: ioex: select PLATFORM_EC_USBA automatically

Enable PLATFORM_EC_USBA automatically based devicetree compatible nodes.

Drop a bunch of now unnecessary config and a macro guard.

BRANCH=none
BUG=none
TEST=cq dry run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I824e7f7f01fda9145b682897d3262de221f9000a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4003282
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

11 files changed, 2 insertions, 25 deletions

diff --git a/zephyr/Kconfig.usba b/zephyr/Kconfig.usba
index 8abbe839f6..b5413d2c83 100644
--- a/zephyr/Kconfig.usba
+++ b/zephyr/Kconfig.usba
@@ -4,6 +4,8 @@
 
 menuconfig PLATFORM_EC_USBA
 	bool "USB Type-A support"
+	default y
+	depends on DT_HAS_CROS_EC_USBA_PORT_ENABLE_PINS_ENABLED
 	help
 	  Enable USB Type A ports
 
diff --git a/zephyr/program/brya/prj.conf b/zephyr/program/brya/prj.conf
index 5d80ff9b34..1678eb29d2 100644
--- a/zephyr/program/brya/prj.conf
+++ b/zephyr/program/brya/prj.conf
@@ -151,7 +151,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
 CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
 CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
-CONFIG_PLATFORM_EC_USBA=y
 CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP=n
 CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP=n
 CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG=n
diff --git a/zephyr/program/corsola/prj_it81202_base.conf b/zephyr/program/corsola/prj_it81202_base.conf
index 2d4af86300..2a8b46bb28 100644
--- a/zephyr/program/corsola/prj_it81202_base.conf
+++ b/zephyr/program/corsola/prj_it81202_base.conf
@@ -62,9 +62,6 @@ CONFIG_TASK_CHIPSET_STACK_SIZE=1440
 CONFIG_TASK_MOTIONSENSE_STACK_SIZE=1024
 CONFIG_TASK_PD_STACK_SIZE=1280
 
-# USB-A
-CONFIG_PLATFORM_EC_USBA=y
-
 # USB-C
 CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n
 CONFIG_PLATFORM_EC_USBC_PPC_RT1739=y
diff --git a/zephyr/program/corsola/prj_npcx993_base.conf b/zephyr/program/corsola/prj_npcx993_base.conf
index 35189ea2f7..5d685679e7 100644
--- a/zephyr/program/corsola/prj_npcx993_base.conf
+++ b/zephyr/program/corsola/prj_npcx993_base.conf
@@ -58,9 +58,6 @@ CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y
 CONFIG_PLATFORM_EC_TABLET_MODE=y
 CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH=y
 
-# USBA
-CONFIG_PLATFORM_EC_USBA=y
-
 # USBC
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
 CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER=n
diff --git a/zephyr/program/herobrine/program.conf b/zephyr/program/herobrine/program.conf
index 961a47dcb0..5fdf9bcfec 100644
--- a/zephyr/program/herobrine/program.conf
+++ b/zephyr/program/herobrine/program.conf
@@ -90,9 +90,6 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
 CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20
 CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 
-# USB-A
-CONFIG_PLATFORM_EC_USBA=y
-
 # USB-C
 CONFIG_PLATFORM_EC_USB_PD_FRS=y
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
diff --git a/zephyr/program/nissa/program.conf b/zephyr/program/nissa/program.conf
index 622d82837c..dad804a8ee 100644
--- a/zephyr/program/nissa/program.conf
+++ b/zephyr/program/nissa/program.conf
@@ -120,7 +120,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
 CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
 
 # USB-A host ports
-CONFIG_PLATFORM_EC_USBA=y
 CONFIG_PLATFORM_EC_USB_PORT_ENABLE_DYNAMIC=y
 # Both ports use a smart switch with CTL1..3 fixed high, for SDP2 or CDP only:
 # either SLGC55545 or PI5USB2546.
diff --git a/zephyr/program/rex/prj.conf b/zephyr/program/rex/prj.conf
index 75083dd9be..16b29fc8ca 100644
--- a/zephyr/program/rex/prj.conf
+++ b/zephyr/program/rex/prj.conf
@@ -96,9 +96,6 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10
 CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=30000
 CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT=15000
 
-# USB-A
-CONFIG_PLATFORM_EC_USBA=y
-
 # USBC
 CONFIG_PLATFORM_EC_USBC_PPC=y
 CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
diff --git a/zephyr/program/skyrim/prj.conf b/zephyr/program/skyrim/prj.conf
index e20db16b2c..023d58e611 100644
--- a/zephyr/program/skyrim/prj.conf
+++ b/zephyr/program/skyrim/prj.conf
@@ -93,9 +93,6 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
 CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20
 CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=50000
 
-# USB-A
-CONFIG_PLATFORM_EC_USBA=y
-
 # USB-C
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
 CONFIG_PLATFORM_EC_USBC_PPC_NX20P3483=y
diff --git a/zephyr/program/trogdor/lazor/prj.conf b/zephyr/program/trogdor/lazor/prj.conf
index 2674945090..c05717d7ad 100644
--- a/zephyr/program/trogdor/lazor/prj.conf
+++ b/zephyr/program/trogdor/lazor/prj.conf
@@ -89,9 +89,6 @@ CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10
 CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=20
 CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 
-# USB-A
-CONFIG_PLATFORM_EC_USBA=y
-
 # USB-C
 CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201=y
 CONFIG_PLATFORM_EC_USB_PD_USB32_DRD=n
diff --git a/zephyr/shim/src/usba.c b/zephyr/shim/src/usba.c
index 4db8c31e6a..c8c056bad0 100644
--- a/zephyr/shim/src/usba.c
+++ b/zephyr/shim/src/usba.c
@@ -8,8 +8,6 @@
 #include <zephyr/devicetree.h>
 #include "hooks.h"
 
-#if DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT)
-
 #define PIN(node_id, prop, idx) \
 	GPIO_SIGNAL(DT_PHANDLE_BY_IDX(node_id, prop, idx)),
 
@@ -23,5 +21,3 @@ const
 #endif
 	int usb_port_enable[] = { DT_INST_FOREACH_STATUS_OKAY(
 		USBA_ENABLE_PINS) };
-
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(DT_DRV_COMPAT) */
diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml
index 43387183b9..48317113c9 100644
--- a/zephyr/test/drivers/testcase.yaml
+++ b/zephyr/test/drivers/testcase.yaml
@@ -163,7 +163,6 @@ tests:
     extra_args: DTC_OVERLAY_FILE="./boards/native_posix.overlay;./usb_port_power_dumb/usba.dts"
     extra_configs:
       - CONFIG_LINK_TEST_SUITE_USB_PORT_POWER_DUMB=y
-      - CONFIG_PLATFORM_EC_USBA=y
       - CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
   drivers.usb_pd_discharge:
     extra_configs: