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 /board/samus_pd | |
| 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 'board/samus_pd')
| -rw-r--r-- | board/samus_pd/board.c | 2 | ||||
| -rw-r--r-- | board/samus_pd/board.h | 2 | ||||
| -rw-r--r-- | board/samus_pd/usb_mux.c | 4 | ||||
| -rw-r--r-- | board/samus_pd/usb_pd_policy.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index c942418ee6..69a67f6e44 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -318,7 +318,7 @@ int board_set_active_charge_port(int charge_port) { /* charge port is a realy physical port */ int is_real_port = (charge_port >= 0 && - charge_port < CONFIG_USB_PD_PORT_COUNT); + charge_port < CONFIG_USB_PD_PORT_MAX_COUNT); /* check if we are source vbus on that port */ if (is_real_port && usb_charger_port_is_sourcing_vbus(charge_port)) { CPRINTS("Skip enable p%d", charge_port); diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h index a6e6d3ecec..9fc09340c1 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -63,7 +63,7 @@ #define CONFIG_USB_PD_FLASH_ERASE_CHECK #define CONFIG_USB_PD_INTERNAL_COMP #define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_PORT_COUNT 2 +#define CONFIG_USB_PD_PORT_MAX_COUNT 2 #define CONFIG_USB_PD_TCPC #define CONFIG_USB_PD_TCPM_STUB #define CONFIG_USB_PD_VBUS_DETECT_GPIO diff --git a/board/samus_pd/usb_mux.c b/board/samus_pd/usb_mux.c index 268c0c5843..2c3a0b3a45 100644 --- a/board/samus_pd/usb_mux.c +++ b/board/samus_pd/usb_mux.c @@ -37,7 +37,7 @@ static const struct usb_port_mux mux_gpios[] = { .ss2_dp_mode = GPIO_USB_C1_SS2_DP_MODE, }, }; -BUILD_ASSERT(ARRAY_SIZE(mux_gpios) == CONFIG_USB_PD_PORT_COUNT); +BUILD_ASSERT(ARRAY_SIZE(mux_gpios) == CONFIG_USB_PD_PORT_MAX_COUNT); static int board_init_usb_mux(int port) @@ -105,7 +105,7 @@ const struct usb_mux_driver board_custom_usb_mux_driver = { .get = board_get_usb_mux, }; -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { +struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { .driver = &board_custom_usb_mux_driver, }, diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c index 595c3b6929..40277da8f8 100644 --- a/board/samus_pd/usb_pd_policy.c +++ b/board/samus_pd/usb_pd_policy.c @@ -214,9 +214,9 @@ int pd_custom_vdm(int port, int cnt, uint32_t *payload, return 0; } -static int dp_flags[CONFIG_USB_PD_PORT_COUNT]; +static int dp_flags[CONFIG_USB_PD_PORT_MAX_COUNT]; /* DP Status VDM as returned by UFP */ -static uint32_t dp_status[CONFIG_USB_PD_PORT_COUNT]; +static uint32_t dp_status[CONFIG_USB_PD_PORT_MAX_COUNT]; static void svdm_safe_dp_mode(int port) { |