diff options
author | Scott Collyer <scollyer@google.com> | 2019-05-29 10:37:10 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-06-21 18:44:26 +0000 |
commit | c39005ccf95e393e930f3c7b26df2bcb0f8b2636 (patch) | |
tree | 7f2b660cc02a11ac10f2b33a27df8d41ba6a766b /board/helios | |
parent | c00ca2d3d8e8662dd048f107999f09fee4a301f4 (diff) | |
download | chrome-ec-c39005ccf95e393e930f3c7b26df2bcb0f8b2636.tar.gz |
helios: Remove support for USB-A
Helios will not have any USB-A ports so can remove EC support for that
feature. The GPIO signals for this feature are routed to test points
and so have kept those signals, but changed them to GPIO_INPUTS to
avoid any potential leakage issues.
BUG=b:133501368
BRANCH=none
TEST=make -j BOARD=helios
Change-Id: Ia6ee1436abd26b428fa5381fe64b7ad837783d2b
Signed-off-by: Scott Collyer <scollyer@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1636432
Tested-by: Scott Collyer <scollyer@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Scott Collyer <scollyer@chromium.org>
Auto-Submit: Scott Collyer <scollyer@chromium.org>
Diffstat (limited to 'board/helios')
-rw-r--r-- | board/helios/board.c | 5 | ||||
-rw-r--r-- | board/helios/board.h | 7 | ||||
-rw-r--r-- | board/helios/gpio.inc | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/board/helios/board.c b/board/helios/board.c index e7b51f83b8..3c587059b4 100644 --- a/board/helios/board.c +++ b/board/helios/board.c @@ -45,11 +45,6 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) -/* GPIO to enable/disable the USB Type-A port. */ -const int usb_port_enable[CONFIG_USB_PORT_POWER_SMART_PORT_COUNT] = { - GPIO_EN_USB_A_5V, -}; - static void ppc_interrupt(enum gpio_signal signal) { switch (signal) { diff --git a/board/helios/board.h b/board/helios/board.h index e353ce9e4b..2047f21208 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -58,13 +58,6 @@ #define GPIO_USB_C0_TCPC_RST GPIO_USB_C0_TCPC_RST_ODL #define GPIO_USB_C1_TCPC_RST GPIO_USB_C1_TCPC_RST_ODL -/* USB Type A Features */ -#define CONFIG_USB_PORT_POWER_SMART -#undef CONFIG_USB_PORT_POWER_SMART_PORT_COUNT -#define CONFIG_USB_PORT_POWER_SMART_PORT_COUNT 1 -#define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY -#define GPIO_USB1_ILIM_SEL GPIO_EN_USB_A_LOW_PWR_OD - /* BC 1.2 */ #define CONFIG_BC12_DETECT_PI3USB9201 diff --git a/board/helios/gpio.inc b/board/helios/gpio.inc index a6d1b62691..a3c37362fd 100644 --- a/board/helios/gpio.inc +++ b/board/helios/gpio.inc @@ -59,8 +59,7 @@ GPIO(EC_INT_L, PIN(7, 0), GPIO_ODR_HIGH) GPIO(USB_C_OC_ODL, PIN(B, 1), GPIO_ODR_HIGH) GPIO(USB_C0_TCPC_RST_ODL, PIN(9, 7), GPIO_ODR_HIGH) GPIO(USB_C1_TCPC_RST_ODL, PIN(3, 2), GPIO_ODR_HIGH) -GPIO(EN_USB_A_5V, PIN(3, 5), GPIO_OUT_LOW) -GPIO(EN_USB_A_LOW_PWR_OD, PIN(9, 4), GPIO_OUT_LOW) +GPIO(NC_94, PIN(9, 4), GPIO_INPUT | GPIO_PULL_UP) /* Misc Signals */ GPIO(EC_BATT_PRES_ODL, PIN(E, 1), GPIO_INPUT) |