diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2019-10-02 14:27:47 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-11-01 18:43:42 +0000 |
| commit | 9577704f30c7e824c0590264df22d95a2c706575 (patch) | |
| tree | 566b5beeeae8b343803718101ba0b00c940506cb /baseboard/octopus/baseboard.c | |
| parent | e8121e83e478fef2d5a29304be900311f3f020c4 (diff) | |
| download | chrome-ec-9577704f30c7e824c0590264df22d95a2c706575.tar.gz | |
Rename CONFIG_USB_PD_PORT_COUNT as CONFIG_USB_PD_PORT_MAX_COUNT
Certain SKUs of certain boards have lesser number of USB PD ports than
defined by CONFIG_USB_PD_PORT_COUNT. Hence rename
CONFIG_USB_PD_PORT_COUNT as CONFIG_USB_PD_PORT_MAX_COUNT.
BUG=b:140816510, b:143196487
BRANCH=octopus
TEST=make -j buildall; Boot to ChromeOS
Change-Id: I7c33b27150730a1a3b5813b7b4a72fd24ab73c6a
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1879337
Tested-by: Karthikeyan Ramasubramanian <kramasub@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'baseboard/octopus/baseboard.c')
| -rw-r--r-- | baseboard/octopus/baseboard.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index 9bf8347756..f263f4a97e 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -64,7 +64,7 @@ const int usb_port_enable[USB_PORT_COUNT] = { /******************************************************************************/ /* BC 1.2 chip Configuration */ -const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_COUNT] = { +const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { { .chip_enable_pin = GPIO_USB_C0_BC12_VBUS_ON, .chg_det_pin = GPIO_USB_C0_BC12_CHG_DET_L, @@ -211,7 +211,7 @@ void baseboard_tcpc_init(void) * Initialize HPD to low; after sysjump SOC needs to see * HPD pulse to enable video path */ - for (port = 0; port < CONFIG_USB_PD_PORT_COUNT; port++) { + for (port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; port++) { const struct usb_mux *mux = &usb_muxes[port]; mux->hpd_update(port, 0, 0); @@ -223,7 +223,7 @@ DECLARE_HOOK(HOOK_INIT, baseboard_tcpc_init, HOOK_PRIO_INIT_I2C + 2); int board_set_active_charge_port(int port) { int is_valid_port = (port >= 0 && - port < CONFIG_USB_PD_PORT_COUNT); + port < CONFIG_USB_PD_PORT_MAX_COUNT); int i; if (!is_valid_port && port != CHARGE_PORT_NONE) @@ -329,7 +329,7 @@ void board_hibernate(void) * low power mode or open the SNK FET based on which signals wake up * the EC from hibernate. */ - for (port = 0; port < CONFIG_USB_PD_PORT_COUNT; port++) { + for (port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; port++) { if (!pd_is_vbus_present(port)) { #ifdef VARIANT_OCTOPUS_EC_ITE8320 /* |