zephyr: eliminate PLATFORM_EC_USB_A_PORT_COUNT config

The USB-A port count can be get from cros-ec,usba-port-enable-pins node,
namely from a number of defined "enable-pins" pins.
Remove the PLATFORM_EC_USB_A_PORT_COUNT config and define USB_PORT_COUNT
based on DTS.

This shouldn't affect the output binary, it just simplifies the
configuration process.

BUG=b:227472576
TEST=zmake testall
BRANCH=main

Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: I887993af7b4dae300708099f35cfe58181e14162
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3569772
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Dawid Niedzwiecki <dawidn@google.com>

9 files changed, 5 insertions, 18 deletions

diff --git a/zephyr/Kconfig.usba b/zephyr/Kconfig.usba
index 1d7d9027d6..cca91ef787 100644
--- a/zephyr/Kconfig.usba
+++ b/zephyr/Kconfig.usba
@@ -15,18 +15,8 @@ menuconfig PLATFORM_EC_USBA
 
 if PLATFORM_EC_USBA
 
-config PLATFORM_EC_USB_A_PORT_COUNT
-	int "Number of USB-A ports"
-	default 0
-	help
-	  This sets the number of USB-A ports on the device. These ports do
-	  not support USB Power Delivery features but can be used to power
-	  external devices (according to the USB 3 spec, not the Battery Charger
-	  standard) and to charge devices slowly if power is enabled to them.
-
 choice
 	prompt "Port power control mode"
-	depends on PLATFORM_EC_USB_A_PORT_COUNT > 0
 
 config PLATFORM_EC_USB_PORT_POWER_DUMB
 	bool "Dumb"
diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf
index 3ad742028d..129879fb98 100644
--- a/zephyr/projects/brya/prj.conf
+++ b/zephyr/projects/brya/prj.conf
@@ -158,7 +158,6 @@ 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_USB_A_PORT_COUNT=1
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP=n
 CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP=n
diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf
index 1ef4034049..4d65755516 100644
--- a/zephyr/projects/corsola/prj_kingler.conf
+++ b/zephyr/projects/corsola/prj_kingler.conf
@@ -106,7 +106,6 @@ CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS=y
 
 # USBA
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 
 # USBC
diff --git a/zephyr/projects/corsola/prj_krabby.conf b/zephyr/projects/corsola/prj_krabby.conf
index 562e615949..ebab7ce3bd 100644
--- a/zephyr/projects/corsola/prj_krabby.conf
+++ b/zephyr/projects/corsola/prj_krabby.conf
@@ -108,7 +108,6 @@ CONFIG_TASK_PD_STACK_SIZE=1280
 
 # USB-A
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 
 # USB-C
diff --git a/zephyr/projects/herobrine/prj.conf b/zephyr/projects/herobrine/prj.conf
index b5ae268ddd..99d2d8c067 100644
--- a/zephyr/projects/herobrine/prj.conf
+++ b/zephyr/projects/herobrine/prj.conf
@@ -100,7 +100,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 
 # USB-A
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 
 # USB-C
diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf
index 20736f5fd3..9e9995ce3e 100644
--- a/zephyr/projects/nissa/prj.conf
+++ b/zephyr/projects/nissa/prj.conf
@@ -128,7 +128,6 @@ CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=y
 
 # USB-A host ports
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=2
 # Both ports use a smart switch with CTL1..3 fixed high, for SDP2 or CDP only:
 # either SLGC55545 or PI5USB2546.
 CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART=y
diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf
index 6ca2bc4c08..444c45f338 100644
--- a/zephyr/projects/skyrim/prj.conf
+++ b/zephyr/projects/skyrim/prj.conf
@@ -92,7 +92,6 @@ CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON=50000
 
 # USB-A
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=2
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 
 # USB-C
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index 288c7960df..15fe14e08c 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -94,7 +94,6 @@ CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON=y
 
 # USB-A
 CONFIG_PLATFORM_EC_USBA=y
-CONFIG_PLATFORM_EC_USB_A_PORT_COUNT=1
 CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB=y
 
 # USB-C
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index c3266165c1..428752f556 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -1053,7 +1053,11 @@ extern struct jump_data mock_jump_data;
 #define CONFIG_USB_CHARGER
 #endif
 
-#define USB_PORT_COUNT	CONFIG_PLATFORM_EC_USB_A_PORT_COUNT
+#define USB_PORT_COUNT                                                         \
+	COND_CODE_1(DT_NODE_EXISTS(DT_INST(0, cros_ec_usba_port_enable_pins)), \
+		    (DT_PROP_LEN(DT_INST(0, cros_ec_usba_port_enable_pins),    \
+				 enable_pins)),                                \
+		    (0))
 
 #undef CONFIG_USB_PORT_POWER_DUMB
 #ifdef CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB