summaryrefslogtreecommitdiff
path: root/zephyr
diff options
context:
space:
mode:
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/Kconfig.pd13
-rw-r--r--zephyr/Kconfig.pd_int_shared3
-rw-r--r--zephyr/Kconfig.tasks106
-rw-r--r--zephyr/Kconfig.usb_charger1
-rw-r--r--zephyr/projects/brya/prj.conf1
-rw-r--r--zephyr/projects/corsola/prj_kingler.conf1
-rw-r--r--zephyr/projects/herobrine/prj.conf1
-rw-r--r--zephyr/projects/nissa/prj.conf1
-rw-r--r--zephyr/projects/skyrim/prj.conf1
-rw-r--r--zephyr/projects/trogdor/lazor/prj.conf1
-rw-r--r--zephyr/shim/include/charger_enum.h4
-rw-r--r--zephyr/shim/include/config_chip.h64
-rw-r--r--zephyr/shim/include/shimmed_tasks.h44
-rw-r--r--zephyr/shim/src/tcpc_nct38xx.c4
-rw-r--r--zephyr/test/drivers/src/usb_pd_host_cmd.c3
15 files changed, 70 insertions, 178 deletions
diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd
index b4e7394967..31beab7484 100644
--- a/zephyr/Kconfig.pd
+++ b/zephyr/Kconfig.pd
@@ -7,7 +7,6 @@ if PLATFORM_EC_USBC
menuconfig PLATFORM_EC_USB_POWER_DELIVERY
bool "USB Type-C Power Delivery (PD)"
default y
- select HAS_TASK_PD_C0
help
USB has always provided basic power to an attached peripheral. USB-C
PD is part of the USB 3.0 standard and allows a lot more functionality
@@ -30,18 +29,6 @@ config PLATFORM_EC_USB_PD_HOST_CMD
devices which support firmware update, this is provided as well,
with the firmware being sent from the AP.
-config PLATFORM_EC_USB_PD_PORT_MAX_COUNT
- int "Maximum number of USB PD ports supported"
- default 2
- help
- This sets the limit on the number of PD ports supported on the
- device. This is used to set the size for tables used by devices.
-
- TODO(b/176237074): Can we calculate this from the devicetree at some
- point? Or update the sn5S330 driver to use an 8-bit flag byte for
- source_enabled[] so that plenty of ports are supported without this
- configuration option?
-
config PLATFORM_EC_CONSOLE_CMD_MFALLOW
bool "Console command: mfallow"
default y
diff --git a/zephyr/Kconfig.pd_int_shared b/zephyr/Kconfig.pd_int_shared
index 640bb22677..6f90d2e3e9 100644
--- a/zephyr/Kconfig.pd_int_shared
+++ b/zephyr/Kconfig.pd_int_shared
@@ -23,21 +23,18 @@ config PLATFORM_EC_USB_PD_PORT_0_SHARED
config PLATFORM_EC_USB_PD_PORT_1_SHARED
bool "Port 1 IRQ is shared"
- depends on PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1
help
Enable handling of port 1 PD interrupts signalled by an IRQ that is
shared by every other port enabled in this section.
config PLATFORM_EC_USB_PD_PORT_2_SHARED
bool "Port 2 IRQ is shared"
- depends on PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 2
help
Enable handling of port 2 PD interrupts signalled by an IRQ that is
shared by every other port enabled in this section.
config PLATFORM_EC_USB_PD_PORT_3_SHARED
bool "Port 3 IRQ is shared"
- depends on PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 3
help
Enable handling of port 3 PD interrupts signalled by an IRQ that is
shared by every other port enabled in this section.
diff --git a/zephyr/Kconfig.tasks b/zephyr/Kconfig.tasks
index 470172dc4f..dbcefd3ab3 100644
--- a/zephyr/Kconfig.tasks
+++ b/zephyr/Kconfig.tasks
@@ -172,7 +172,7 @@ config TASK_POWERBTN_STACK_SIZE
endif # HAS_TASK_POWERBTN
-if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
+if PLATFORM_EC_USB_POWER_DELIVERY
config TASK_PD_STACK_SIZE
int "PD task stack size"
@@ -186,7 +186,7 @@ config TASK_PD_INT_STACK_SIZE
help
The stack size of the PD_Cn_INT tasks.
-endif # PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
+endif # PLATFORM_EC_USB_POWER_DELIVERY
if HAS_TASK_DPS
@@ -207,79 +207,14 @@ config HAS_TASK_DPS
efficient power data object (PDO).
-config HAS_TASK_PD_C0
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
- help
- This turns on the PD_C0 task which handles the rather complex USB
- Power Delivery protocol for port 0. There is one of these tasks for
- each USB-C port on the device, but they are enabled separately
- depending on how many ports are present.
-
-config HAS_TASK_PD_C1
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1
- help
- This turns on the PD_C1 task for devices with >=2 ports.
-
-config HAS_TASK_PD_C2
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 2
- help
- This turns on the PD_C2 task for devices with >=3 ports.
-
-config HAS_TASK_PD_C3
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 3
- help
- This turns on the PD_C3 task for devices with 4 ports.
-
config HAS_TASK_PD_INT_SHARED
bool # Selected by PLATFORM_EC_USB_PD_INT_SHARED
help
This turns on the PD_INT_SHARED task which services PD message
interrupts for any port which has a shared IRQ enabled.
-config HAS_TASK_PD_INT_C0
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- depends on !PLATFORM_EC_USB_PD_PORT_0_SHARED
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
- help
- This turns on the PD_INT_C0 task which handles servicing of Power
- Delivery (PD) message interrupts for port 0. There is one of these
- tasks for each USB-C port on the device, but they are enabled
- separately depending on how many ports are present.
-config HAS_TASK_PD_INT_C1
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- depends on !PLATFORM_EC_USB_PD_PORT_1_SHARED
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1
- help
- This turns on the PD_INT_C1 task for devices with >=2 ports.
-
-config HAS_TASK_PD_INT_C2
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- depends on !PLATFORM_EC_USB_PD_PORT_2_SHARED
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 2
- help
- This turns on the PD_INT_C2 task for devices with >=3 ports.
-
-config HAS_TASK_PD_INT_C3
- bool
- depends on PLATFORM_EC_USB_POWER_DELIVERY
- depends on !PLATFORM_EC_USB_PD_PORT_2_SHARED
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 3
- help
- This turns on the PD_INT_C3 task for devices with 4 ports.
-
-if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
+if PLATFORM_EC_USB_POWER_DELIVERY
config TASK_USB_CHG_STACK_SIZE
int "(all ports) task stack size"
@@ -290,39 +225,6 @@ config TASK_USB_CHG_STACK_SIZE
See b/176180736 for checking these stack sizes.
-endif # HAS_TASK_USB_CHG_P0
-
-config HAS_TASK_USB_CHG_P0
- bool
- depends on PLATFORM_EC_USB_CHARGER
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 0
- help
- This turns on the USB charger task for port 0. This handles
- negotiating power from an attached charger, trying to get the maximum
- available power consistent with the needs of the device.
-
- There is one of these tasks for each USB-C port on the device.
-
-config HAS_TASK_USB_CHG_P1
- bool
- depends on PLATFORM_EC_USB_CHARGER
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1
- help
- This turns on the USB charger task for port 1. This handles
- negotiating power from an attached charger, trying to get the maximum
- available power consistent with the needs of the device.
-
- There is one of these tasks for each USB-C port on the device.
-
-config HAS_TASK_USB_CHG_P2
- bool
- depends on PLATFORM_EC_USB_CHARGER
- default y if PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 2
- help
- This turns on the USB charger task for port 2. This handles
- negotiating power from an attached charger, trying to get the maximum
- available power consistent with the needs of the device.
-
- There is one of these tasks for each USB-C port on the device.
+endif # PLATFORM_EC_USB_POWER_DELIVERY
endmenu # Tasks
diff --git a/zephyr/Kconfig.usb_charger b/zephyr/Kconfig.usb_charger
index 5a1e227bab..1510e981d1 100644
--- a/zephyr/Kconfig.usb_charger
+++ b/zephyr/Kconfig.usb_charger
@@ -7,7 +7,6 @@ if PLATFORM_EC_USBC
config PLATFORM_EC_USB_CHARGER
bool "Support charging from a USB-C port"
default y
- select HAS_TASK_USB_CHG_P0
help
This enables common BC1.2 (Battery-Charging Specification Rev1.2)
charger-detection routines. With this is possible to negotiate a
diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf
index f29819fcad..8b9214a114 100644
--- a/zephyr/projects/brya/prj.conf
+++ b/zephyr/projects/brya/prj.conf
@@ -154,7 +154,6 @@ CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715=n
CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422=n
CONFIG_PLATFORM_EC_USB_PD_TCPM_NCT38XX=y
CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX=y
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=3
CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI=y
CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT=y
CONFIG_PLATFORM_EC_USBA=y
diff --git a/zephyr/projects/corsola/prj_kingler.conf b/zephyr/projects/corsola/prj_kingler.conf
index 9cd4adcfc3..1ef4034049 100644
--- a/zephyr/projects/corsola/prj_kingler.conf
+++ b/zephyr/projects/corsola/prj_kingler.conf
@@ -127,7 +127,6 @@ CONFIG_PLATFORM_EC_USB_PD_FRS_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL=y
CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL=2
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
CONFIG_PLATFORM_EC_USB_PD_TCPM_ANX7447=y
CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1718S=y
CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
diff --git a/zephyr/projects/herobrine/prj.conf b/zephyr/projects/herobrine/prj.conf
index 05e12e0401..b5ae268ddd 100644
--- a/zephyr/projects/herobrine/prj.conf
+++ b/zephyr/projects/herobrine/prj.conf
@@ -117,7 +117,6 @@ CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
CONFIG_PLATFORM_EC_USB_PD_REV30=y
CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805=y
diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf
index 5737c9674f..0e8f715a96 100644
--- a/zephyr/projects/nissa/prj.conf
+++ b/zephyr/projects/nissa/prj.conf
@@ -104,7 +104,6 @@ CONFIG_PLATFORM_EC_USBC=y
CONFIG_PLATFORM_EC_USBC_PPC=n
CONFIG_PLATFORM_EC_USB_VID=0x18d1
CONFIG_PLATFORM_EC_USB_PID=0x505a
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
# TODO(b/216085548): configure USB retimers
CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG=y
diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf
index a1f9253d20..6ca2bc4c08 100644
--- a/zephyr/projects/skyrim/prj.conf
+++ b/zephyr/projects/skyrim/prj.conf
@@ -114,7 +114,6 @@ CONFIG_PLATFORM_EC_USB_PD_DP_HPD_GPIO=y
CONFIG_PLATFORM_EC_USB_PD_FRS=y
CONFIG_PLATFORM_EC_USB_PD_FRS_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_LOGGING=y
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
CONFIG_PLATFORM_EC_USB_PD_REV30=y
CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE=n
CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf
index dc3e5b434f..288c7960df 100644
--- a/zephyr/projects/trogdor/lazor/prj.conf
+++ b/zephyr/projects/trogdor/lazor/prj.conf
@@ -107,7 +107,6 @@ CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC=y
CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y
CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC=y
CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC=y
-CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT=2
CONFIG_PLATFORM_EC_USB_PD_REV30=n
CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER=y
CONFIG_PLATFORM_EC_USB_PD_TCPM_MULTI_PS8XXX=y
diff --git a/zephyr/shim/include/charger_enum.h b/zephyr/shim/include/charger_enum.h
index 3e94ab81c3..a2acc3e000 100644
--- a/zephyr/shim/include/charger_enum.h
+++ b/zephyr/shim/include/charger_enum.h
@@ -13,9 +13,9 @@
*/
enum chg_id {
CHARGER_PRIMARY,
-#if (CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1)
+#if (CONFIG_USB_PD_PORT_MAX_COUNT > 1)
CHARGER_SECONDARY,
-#endif /* CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT > 1 */
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */
CHARGER_NUM,
};
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index 0fc6212bc5..ed9c3f7ea7 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -1336,9 +1336,67 @@ extern struct jump_data mock_jump_data;
#endif
#undef CONFIG_USB_PD_PORT_MAX_COUNT
-#ifdef CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT
-#define CONFIG_USB_PD_PORT_MAX_COUNT CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT
-#endif
+#define CONFIG_USB_PD_PORT_MAX_COUNT DT_NUM_INST_STATUS_OKAY(named_usbc_port)
+
+#ifdef CONFIG_PLATFORM_EC_USB_POWER_DELIVERY
+/* USBC-PD Port 0 */
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 0
+#define HAS_TASK_PD_C0 1
+
+#ifndef CONFIG_PLATFORM_EC_USB_PD_PORT_0_SHARED
+#define HAS_TASK_PD_INT_C0 1
+#endif /* !CONFIG_PLATFORM_EC_USB_PD_PORT_0_SHARED */
+
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 0 */
+
+/* USBC-PD Port 1 */
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 1
+#define HAS_TASK_PD_C1 1
+
+#ifndef CONFIG_PLATFORM_EC_USB_PD_PORT_1_SHARED
+#define HAS_TASK_PD_INT_C1 1
+#endif /* !CONFIG_PLATFORM_EC_USB_PD_PORT_1_SHARED */
+
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */
+
+/* USBC-PD Port 2 */
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 2
+#define HAS_TASK_PD_C2 1
+
+#ifndef CONFIG_PLATFORM_EC_USB_PD_PORT_2_SHARED
+#define HAS_TASK_PD_INT_C2 1
+#endif /* !CONFIG_PLATFORM_EC_USB_PD_PORT_2_SHARED */
+
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 2 */
+
+/* USBC-PD Port 3 */
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 3
+#define HAS_TASK_PD_C3 1
+
+#ifndef CONFIG_PLATFORM_EC_USB_PD_PORT_3_SHARED
+#define HAS_TASK_PD_INT_C3 1
+#endif /* !CONFIG_PLATFORM_EC_USB_PD_PORT_3_SHARED */
+
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 3 */
+
+#endif /* CONFIG_PLATFORM_EC_USB_POWER_DELIVERY */
+
+#ifdef CONFIG_PLATFORM_EC_USB_CHARGER
+#define HAS_TASK_USB_CHG_P0 1
+
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 1
+#define HAS_TASK_USB_CHG_P1 1
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */
+
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 2
+#define HAS_TASK_USB_CHG_P2 1
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 2 */
+
+#if CONFIG_USB_PD_PORT_MAX_COUNT > 3
+#define HAS_TASK_USB_CHG_P3 1
+#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 3 */
+
+#endif /* CONFIG_PLATFORM_EC_USB_CHARGER */
#undef CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT
#ifdef CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT
diff --git a/zephyr/shim/include/shimmed_tasks.h b/zephyr/shim/include/shimmed_tasks.h
index 07552f1b27..d1fb6129d3 100644
--- a/zephyr/shim/include/shimmed_tasks.h
+++ b/zephyr/shim/include/shimmed_tasks.h
@@ -39,54 +39,10 @@
#define HAS_TASK_MOTIONSENSE 1
#endif /* CONFIG_HAS_TASK_MOTIONSENSE */
-#ifdef CONFIG_HAS_TASK_PD_C0
-#define HAS_TASK_PD_C0 1
-#endif /* CONFIG_HAS_TASK_PD_C0 */
-
-#ifdef CONFIG_HAS_TASK_PD_C1
-#define HAS_TASK_PD_C1 1
-#endif /* CONFIG_HAS_TASK_PD_C1 */
-
-#ifdef CONFIG_HAS_TASK_PD_C2
-#define HAS_TASK_PD_C2 1
-#endif /* CONFIG_HAS_TASK_PD_C2 */
-
-#ifdef CONFIG_HAS_TASK_PD_C3
-#define HAS_TASK_PD_C3 1
-#endif /* CONFIG_HAS_TASK_PD_C3 */
-
-#ifdef CONFIG_HAS_TASK_PD_INT_C0
-#define HAS_TASK_PD_INT_C0 1
-#endif /* CONFIG_HAS_TASK_PD_INT_C0 */
-
-#ifdef CONFIG_HAS_TASK_PD_INT_C1
-#define HAS_TASK_PD_INT_C1 1
-#endif /* CONFIG_HAS_TASK_PD_INT_C1 */
-
-#ifdef CONFIG_HAS_TASK_PD_INT_C2
-#define HAS_TASK_PD_INT_C2 1
-#endif /* CONFIG_HAS_TASK_PD_INT_C2 */
-
-#ifdef CONFIG_HAS_TASK_PD_INT_C3
-#define HAS_TASK_PD_INT_C3 1
-#endif /* CONFIG_HAS_TASK_PD_INT_C3 */
-
#ifdef CONFIG_HAS_TASK_POWERBTN
#define HAS_TASK_POWERBTN 1
#endif /* CONFIG_HAS_TASK_POWERBTN */
-#ifdef CONFIG_HAS_TASK_USB_CHG_P0
-#define HAS_TASK_USB_CHG_P0 1
-#endif /* CONFIG_HAS_TASK_USB_CHG_P0 */
-
-#ifdef CONFIG_HAS_TASK_USB_CHG_P1
-#define HAS_TASK_USB_CHG_P1 1
-#endif /* CONFIG_HAS_TASK_USB_CHG_P1 */
-
-#ifdef CONFIG_HAS_TASK_USB_CHG_P2
-#define HAS_TASK_USB_CHG_P2 1
-#endif /* CONFIG_HAS_TASK_USB_CHG_P2 */
-
#ifdef CONFIG_PLATFORM_EC_USB_MUX_TASK
#define HAS_TASK_USB_MUX 1
#endif /* CONFIG_PLATFORM_EC_USB_MUX_TASK */
diff --git a/zephyr/shim/src/tcpc_nct38xx.c b/zephyr/shim/src/tcpc_nct38xx.c
index d18e4ccbbe..9481961e5e 100644
--- a/zephyr/shim/src/tcpc_nct38xx.c
+++ b/zephyr/shim/src/tcpc_nct38xx.c
@@ -19,13 +19,13 @@
/* NCT38XX GPIO device pool for binding the TCPC port and NCT38XX GPIO device */
static const struct device
- *nct38xx_gpio_devices[CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT] = {
+ *nct38xx_gpio_devices[CONFIG_USB_PD_PORT_MAX_COUNT] = {
DT_FOREACH_STATUS_OKAY(nuvoton_nct38xx, GPIO_DEV_BINDING)
};
const struct device *nct38xx_get_gpio_device_from_port(const int port)
{
- if (port < 0 || port >= CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT)
+ if (port < 0 || port >= CONFIG_USB_PD_PORT_MAX_COUNT)
return NULL;
return nct38xx_gpio_devices[port];
}
diff --git a/zephyr/test/drivers/src/usb_pd_host_cmd.c b/zephyr/test/drivers/src/usb_pd_host_cmd.c
index a22f3387c3..520973a248 100644
--- a/zephyr/test/drivers/src/usb_pd_host_cmd.c
+++ b/zephyr/test/drivers/src/usb_pd_host_cmd.c
@@ -20,8 +20,7 @@ ZTEST_USER(usb_pd_host_cmd, test_host_command_hc_pd_ports)
zassert_ok(host_command_process(&args), NULL);
zassert_ok(args.result, NULL);
zassert_equal(args.response_size, sizeof(response), NULL);
- zassert_equal(response.num_ports,
- CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT, NULL);
+ zassert_equal(response.num_ports, CONFIG_USB_PD_PORT_MAX_COUNT, NULL);
}
ZTEST_SUITE(usb_pd_host_cmd, drivers_predicate_post_main, NULL, NULL, NULL,