diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2019-10-02 14:27:47 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-12 08:46:30 +0000 |
| commit | 94a46c3b4a1202052eb50c70f850bce878cda6d1 (patch) | |
| tree | 7e626c141d296a26456ddb2f54d4a5a406f602d8 /chip | |
| parent | 1b376d94546337836dbfb43b2e1ef1a7106c2b80 (diff) | |
| download | chrome-ec-94a46c3b4a1202052eb50c70f850bce878cda6d1.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>
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1961893
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/host/usb_pd_phy.c | 2 | ||||
| -rw-r--r-- | chip/mec1322/system.c | 8 | ||||
| -rw-r--r-- | chip/stm32/system.c | 2 | ||||
| -rw-r--r-- | chip/stm32/usb_pd_phy.c | 11 |
4 files changed, 12 insertions, 11 deletions
diff --git a/chip/host/usb_pd_phy.c b/chip/host/usb_pd_phy.c index c44b8eea02..0ca92604b8 100644 --- a/chip/host/usb_pd_phy.c +++ b/chip/host/usb_pd_phy.c @@ -35,7 +35,7 @@ static struct pd_physical { int last_edge_written; uint8_t out_msg[PD_BIT_LEN / 5]; int verified_idx; -} pd_phy[CONFIG_USB_PD_PORT_COUNT]; +} pd_phy[CONFIG_USB_PD_PORT_MAX_COUNT]; static const uint16_t enc4b5b[] = { 0x1E, 0x09, 0x14, 0x15, 0x0A, 0x0B, 0x0E, 0x0F, 0x12, 0x13, 0x16, diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index 4938f07b75..6fa837f6f4 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -292,20 +292,20 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) if (board_hibernate_late) board_hibernate_late(); -#ifdef CONFIG_USB_PD_PORT_COUNT +#ifdef CONFIG_USB_PD_PORT_MAX_COUNT /* * Leave USB-C charging enabled in hibernate, in order to * allow wake-on-plug. 5V enable must be pulled low. */ -#if CONFIG_USB_PD_PORT_COUNT > 0 +#if CONFIG_USB_PD_PORT_MAX_COUNT > 0 gpio_set_flags(GPIO_USB_C0_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 0); #endif -#if CONFIG_USB_PD_PORT_COUNT > 1 +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 gpio_set_flags(GPIO_USB_C1_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 0); #endif -#endif /* CONFIG_USB_PD_PORT_COUNT */ +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT */ if (hibernate_wake_pins_used > 0) { for (i = 0; i < hibernate_wake_pins_used; ++i) { diff --git a/chip/stm32/system.c b/chip/stm32/system.c index 27e2f8fc79..ddba03958a 100644 --- a/chip/stm32/system.c +++ b/chip/stm32/system.c @@ -78,7 +78,7 @@ enum bkpdata_index { BUILD_ASSERT(STM32_BKP_ENTRIES >= BKPDATA_COUNT); #ifdef CONFIG_USB_PD_DUAL_ROLE -BUILD_ASSERT(CONFIG_USB_PD_PORT_COUNT <= 2); +BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT <= 2); #endif /** diff --git a/chip/stm32/usb_pd_phy.c b/chip/stm32/usb_pd_phy.c index 833b3b0f3a..7296ae245f 100644 --- a/chip/stm32/usb_pd_phy.c +++ b/chip/stm32/usb_pd_phy.c @@ -70,14 +70,15 @@ static struct pd_physical { /* Pointers to timer register for each port */ timer_ctlr_t *tim_tx; timer_ctlr_t *tim_rx; -} pd_phy[CONFIG_USB_PD_PORT_COUNT]; +} pd_phy[CONFIG_USB_PD_PORT_MAX_COUNT]; /* keep track of RX edge timing in order to trigger receive */ -static timestamp_t rx_edge_ts[CONFIG_USB_PD_PORT_COUNT][PD_RX_TRANSITION_COUNT]; -static int rx_edge_ts_idx[CONFIG_USB_PD_PORT_COUNT]; +static timestamp_t + rx_edge_ts[CONFIG_USB_PD_PORT_MAX_COUNT][PD_RX_TRANSITION_COUNT]; +static int rx_edge_ts_idx[CONFIG_USB_PD_PORT_MAX_COUNT]; /* keep track of transmit polarity for DMA interrupt */ -static int tx_dma_polarities[CONFIG_USB_PD_PORT_COUNT]; +static int tx_dma_polarities[CONFIG_USB_PD_PORT_MAX_COUNT]; void pd_init_dequeue(int port) { @@ -462,7 +463,7 @@ void pd_rx_handler(void) } #endif - for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) { + for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) { if (pending & EXTI_COMP_MASK(i)) { rx_edge_ts[i][rx_edge_ts_idx[i]].val = get_time().val; next_idx = (rx_edge_ts_idx[i] == |