summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce <Bruce.Wan@quantatw.com>2016-11-17 14:38:13 +0800
committerchrome-bot <chrome-bot@chromium.org>2016-11-17 16:09:54 -0800
commitc4aa651a21077174def4f6735ee943e86e86ea55 (patch)
treefa29836176e706a3135b9c4323ce02e80892b7d2
parentb8406119c2c51acc46c551ef0930c51153657613 (diff)
downloadchrome-ec-stabilize-9000.91.0.B.tar.gz
BUG=none BRANCH=none TEST=make buildall Change-Id: Iefa74d574e8f6354a9344abaab638a71b8783bfa Signed-off-by: Bruce.Wan <Bruce.Wan@quantatw.com> Reviewed-on: https://chromium-review.googlesource.com/412240 Commit-Ready: Keith Tzeng <keith.tzeng@quantatw.com> Tested-by: Keith Tzeng <keith.tzeng@quantatw.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--board/pyro/board.h1
-rw-r--r--board/pyro/gpio.inc2
-rw-r--r--board/snappy/board.h1
-rw-r--r--board/snappy/gpio.inc2
4 files changed, 4 insertions, 2 deletions
diff --git a/board/pyro/board.h b/board/pyro/board.h
index 0c8b779a11..d95e12557a 100644
--- a/board/pyro/board.h
+++ b/board/pyro/board.h
@@ -67,6 +67,7 @@
/* USB-A config */
#define CONFIG_USB_PORT_POWER_SMART
+#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_CDP
#define CONFIG_USB_PORT_POWER_SMART_SIMPLE
#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT
#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1
diff --git a/board/pyro/gpio.inc b/board/pyro/gpio.inc
index 87808e1fe0..742a774ff6 100644
--- a/board/pyro/gpio.inc
+++ b/board/pyro/gpio.inc
@@ -115,7 +115,7 @@ GPIO(PCH_RCIN_L, PIN(6, 1), GPIO_ODR_HIGH) /* SYS_RST_ODL */
/* FIXME: What, if anything, to do about EC_RST_ODL on VCC1_RST#? */
GPIO(CHARGER_RST_ODL, PIN(C, 0), GPIO_ODR_HIGH)
-GPIO(USB_A_CHARGE_EN_L, PIN(4, 2), GPIO_OUT_HIGH)
+GPIO(USB_A_CHARGE_EN_L, PIN(4, 2), GPIO_OUT_LOW)
GPIO(EN_USB_TCPC_PWR, PIN(C, 3), GPIO_OUT_LOW)
GPIO(USB1_ENABLE, PIN(4, 1), GPIO_OUT_LOW)
diff --git a/board/snappy/board.h b/board/snappy/board.h
index 36412db61d..dd521343c5 100644
--- a/board/snappy/board.h
+++ b/board/snappy/board.h
@@ -66,6 +66,7 @@
/* USB-A config */
#define CONFIG_USB_PORT_POWER_SMART
+#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_CDP
#define CONFIG_USB_PORT_POWER_SMART_SIMPLE
#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT
#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1
diff --git a/board/snappy/gpio.inc b/board/snappy/gpio.inc
index e2f2c13211..e4473f677f 100644
--- a/board/snappy/gpio.inc
+++ b/board/snappy/gpio.inc
@@ -115,7 +115,7 @@ GPIO(PCH_RCIN_L, PIN(6, 1), GPIO_ODR_HIGH) /* SYS_RST_ODL */
/* FIXME: What, if anything, to do about EC_RST_ODL on VCC1_RST#? */
GPIO(CHARGER_RST_ODL, PIN(C, 0), GPIO_ODR_HIGH)
-GPIO(USB_A_CHARGE_EN_L, PIN(4, 2), GPIO_OUT_HIGH)
+GPIO(USB_A_CHARGE_EN_L, PIN(4, 2), GPIO_OUT_LOW)
GPIO(EN_USB_TCPC_PWR, PIN(C, 3), GPIO_OUT_LOW)
GPIO(USB1_ENABLE, PIN(4, 1), GPIO_OUT_LOW)