summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Chen <philipchen@google.com>2018-07-16 18:33:50 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-07-17 19:10:05 +0000
commitd3ec36664b4a1cfc116ba4d838ba815bfc13fc73 (patch)
treed8bf4ff6e2fa29378f0c68d3f66ba09f1e63fa80
parent4a6e1b6dd95b31afd6f41d3973bdefd4c12b7b1c (diff)
downloadchrome-ec-d3ec36664b4a1cfc116ba4d838ba815bfc13fc73.tar.gz
nautilus: Remove the unused GPIO USB_POWERON_L
BUG=b:111433611 BRANCH=poppy TEST=manually confirm USB-A port still works Change-Id: I70146f696056e526df08831847650710dea4a8ae Signed-off-by: Philip Chen <philipchen@google.com> Reviewed-on: https://chromium-review.googlesource.com/1140794 Reviewed-by: Philip Chen <philipchen@chromium.org> Commit-Queue: Philip Chen <philipchen@chromium.org> Tested-by: Philip Chen <philipchen@chromium.org> Trybot-Ready: Philip Chen <philipchen@chromium.org>
-rw-r--r--board/nautilus/board.c4
-rw-r--r--board/nautilus/gpio.inc3
2 files changed, 1 insertions, 6 deletions
diff --git a/board/nautilus/board.c b/board/nautilus/board.c
index 6372ec43ee..bff3b4e1f9 100644
--- a/board/nautilus/board.c
+++ b/board/nautilus/board.c
@@ -725,8 +725,6 @@ DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT);
static void board_chipset_startup(void)
{
- /* Power On USB-A port */
- gpio_set_level(GPIO_USB_POWERON_L, 0);
/* Enable USB-A port. */
gpio_set_level(GPIO_USB1_ENABLE, 1);
@@ -738,8 +736,6 @@ DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT);
static void board_chipset_shutdown(void)
{
- /* Power Off USB-A port */
- gpio_set_level(GPIO_USB_POWERON_L, 1);
/* Disable USB-A port. */
gpio_set_level(GPIO_USB1_ENABLE, 0);
diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc
index f5d6917e73..14c26507ae 100644
--- a/board/nautilus/gpio.inc
+++ b/board/nautilus/gpio.inc
@@ -56,6 +56,7 @@ GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT)
/* NC pins */
GPIO(GPIO02_NC, PIN(0, 2), GPIO_INPUT | GPIO_PULL_UP)
+GPIO(GPIO32_NC, PIN(3, 2), GPIO_INPUT | GPIO_PULL_UP)
GPIO(GPIO71_NC, PIN(7, 1), GPIO_INPUT | GPIO_PULL_UP)
GPIO(GPIO80_NC, PIN(8, 0), GPIO_INPUT | GPIO_PULL_UP)
GPIO(GPIOD2_NC, PIN(D, 2), GPIO_INPUT | GPIO_PULL_UP)
@@ -90,8 +91,6 @@ GPIO(USB_C0_TCPC_PWR, PIN(8, 4), GPIO_OUT_LOW) /* Enable C0 TCPC Power */
GPIO(USB2_OTG_ID, PIN(A, 1), GPIO_ODR_LOW) /* OTG ID */
GPIO(USB2_OTG_VBUSSENSE, PIN(9, 5), GPIO_OUT_LOW) /* OTG VBUS Sense */
-GPIO(USB_POWERON_L, PIN(3, 2), GPIO_OUT_HIGH) /* USBPWRON */
-
/* USB Type-A control */
GPIO(USB_A_ILIM_SEL, PIN(0, 0), GPIO_OUT_LOW)
GPIO(USB1_ENABLE, PIN(0, 1), GPIO_OUT_LOW)