summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Palatin <vpalatin@chromium.org>2014-05-22 08:01:58 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-06-05 23:15:22 +0000
commit3d51ec882392bbb819ee75ca4a7010d62d224128 (patch)
tree91ecd1ca00d8eba7f3c7355ae3339e96d924f979
parentf4b12223e2cbf586f84147432b607129e4845e98 (diff)
downloadchrome-ec-3d51ec882392bbb819ee75ca4a7010d62d224128.tar.gz
samus_pd: force USB2.0 + DisplayPort on Port1
Until we have the full dual port support, hardcoded the 2nd type-C receptacle (port C1) as a power provider with USB2.0 and DisplayPort source. Should be reverted to default as a power sink for the dead battery case when the dual port logic is in place. Signed-off-by: Vincent Palatin <vpalatin@chromium.org> BRANCH=none BUG=chrome-os-partner:28341 TEST=Plug a USB key on port 1 through a type-C to type-A cable. Change-Id: I85d0c48412087d6afcdeb214a485a2bab9d8bcd4 Reviewed-on: https://chromium-review.googlesource.com/201064 Reviewed-by: Alec Berg <alecaberg@chromium.org> Reviewed-by: Todd Broch <tbroch@chromium.org> Tested-by: Todd Broch <tbroch@chromium.org> Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--board/samus_pd/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c
index 07fc4fa14a..8da5297546 100644
--- a/board/samus_pd/board.c
+++ b/board/samus_pd/board.c
@@ -87,9 +87,9 @@ const struct gpio_info gpio_list[] = {
/* Power and muxes control */
{"PP3300_USB_PD_EN", GPIO_A, (1<<8), GPIO_OUT_HIGH, NULL},
{"USB_C0_CHARGE_EN_L", GPIO_D, (1<<12), GPIO_OUT_LOW, NULL},
- {"USB_C1_CHARGE_EN_L", GPIO_D, (1<<13), GPIO_OUT_LOW, NULL},
+ {"USB_C1_CHARGE_EN_L", GPIO_D, (1<<13), GPIO_OUT_HIGH, NULL},
{"USB_C0_5V_EN", GPIO_D, (1<<14), GPIO_OUT_LOW, NULL},
- {"USB_C1_5V_EN", GPIO_D, (1<<15), GPIO_OUT_LOW, NULL},
+ {"USB_C1_5V_EN", GPIO_D, (1<<15), GPIO_OUT_HIGH, NULL},
{"USB_C0_CC1_VCONN1_EN_L", GPIO_D, (1<<8), GPIO_OUT_HIGH, NULL},
{"USB_C0_CC2_VCONN1_EN_L", GPIO_D, (1<<9), GPIO_OUT_HIGH, NULL},
{"USB_C1_CC1_VCONN1_EN_L", GPIO_D, (1<<10), GPIO_OUT_HIGH, NULL},
@@ -110,7 +110,7 @@ const struct gpio_info gpio_list[] = {
{"USB_C1_SS1_DP_MODE_L", GPIO_E, (1<<11), GPIO_OUT_HIGH, NULL},
{"USB_C1_SS2_DP_MODE_L", GPIO_E, (1<<13), GPIO_OUT_HIGH, NULL},
{"USB_C0_DP_MODE_L", GPIO_E, (1<<8), GPIO_OUT_HIGH, NULL},
- {"USB_C1_DP_MODE_L", GPIO_F, (1<<6), GPIO_OUT_HIGH, NULL},
+ {"USB_C1_DP_MODE_L", GPIO_F, (1<<6), GPIO_OUT_LOW, NULL},
{"USB_C0_DP_POLARITY_L", GPIO_E, (1<<7), GPIO_OUT_HIGH, NULL},
{"USB_C1_DP_POLARITY_L", GPIO_F, (1<<3), GPIO_OUT_HIGH, NULL},