From 38288aee7391efaabea2fca5575494d5e26f0238 Mon Sep 17 00:00:00 2001 From: philipchen Date: Sun, 29 Jan 2017 23:19:18 -0800 Subject: [PATCH] scarlet: remove USB-A control pins No USB-A ports on Scarlet. BUG=chrome-os-partner:62207, b:62307687 CQ-DEPEND=CL:524980 BRANCH=gru TEST=make BOARD=scarlet TEST=manually test on gru, USB-A ports don't work anymore. Change-Id: If8a802067e942e8b73ee7f10285d0752b263727f Reviewed-on: https://chromium-review.googlesource.com/434502 Reviewed-by: Aseda Aboagye Commit-Queue: Philip Chen Tested-by: Philip Chen Reviewed-on: https://chromium-review.googlesource.com/524977 Commit-Ready: Philip Chen Reviewed-by: Philip Chen --- board/scarlet/board.c | 16 ---------------- board/scarlet/gpio.inc | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/board/scarlet/board.c b/board/scarlet/board.c index 152687a0c6..9f13137214 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -543,22 +543,6 @@ struct motion_sensor_t motion_sensors[] = { const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); #endif /* defined(HAS_TASK_MOTIONSENSE) */ -static void usb_charge_resume(void) -{ - /* Turn on USB-A ports on as we go into S0 from S3. */ - gpio_set_level(GPIO_USB_A_EN, 1); - gpio_set_level(GPIO_USB_A_CHARGE_EN, 1); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, usb_charge_resume, HOOK_PRIO_DEFAULT); - -static void usb_charge_shutdown(void) -{ - /* Turn off USB-A ports as we go back to S5. */ - gpio_set_level(GPIO_USB_A_CHARGE_EN, 0); - gpio_set_level(GPIO_USB_A_EN, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, usb_charge_shutdown, HOOK_PRIO_DEFAULT); - #define PWM_DISPLIGHT_SYSJUMP_TAG 0x5044 /* "PD" */ #define PWM_HOOK_VERSION 1 diff --git a/board/scarlet/gpio.inc b/board/scarlet/gpio.inc index 9f227b08f6..13db2c6ca0 100644 --- a/board/scarlet/gpio.inc +++ b/board/scarlet/gpio.inc @@ -107,11 +107,9 @@ GPIO(SPI_SENSOR_CS_L, PIN(9, 4), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) GPIO(USB_C0_DISCHARGE, PIN(0, 3), GPIO_OUT_LOW) GPIO(USB_C1_DISCHARGE, PIN(B, 1), GPIO_OUT_LOW) -GPIO(USB_A_EN, PIN(C, 3), GPIO_OUT_LOW) -GPIO(USB_A_CHARGE_EN, PIN(8, 4), GPIO_OUT_LOW) +GPIO(GPIOB6_NC, PIN(B, 6), GPIO_INPUT | GPIO_PULL_UP) /* Scarlet LEDs */ -GPIO(POWER_LED, PIN(B, 6), GPIO_OUT_LOW) GPIO(BAT_LED_GREEN, PIN(4, 4), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) GPIO(BAT_LED_RED, PIN(8, 0), GPIO_OUT_HIGH | GPIO_OPEN_DRAIN)