From 44b9f9df83b3c54b46eb09f593cce32fe822f30a Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Mon, 17 Apr 2017 11:37:18 -0700 Subject: Fizz: Enable/disable USB Type-A ports This change makes Fizz enable USB type-A ports on resume and disable them on shutdown. BUG=b:38226666 BRANCH=none TEST=Boot Fizz off of USB flash drive on a USB-A port. Change-Id: I7f22438271ffc080e950f5f300937d89706e08a4 Signed-off-by: Daisuke Nojiri Reviewed-on: https://chromium-review.googlesource.com/481078 --- board/fizz/board.c | 8 ++++++++ board/fizz/board.h | 4 ++++ board/fizz/gpio.inc | 6 ++++++ 3 files changed, 18 insertions(+) (limited to 'board/fizz') diff --git a/board/fizz/board.c b/board/fizz/board.c index d60e5c41e9..87221606ca 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -128,6 +128,14 @@ struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { } }; +const int usb_port_enable[USB_PORT_COUNT] = { + GPIO_USB1_ENABLE, + GPIO_USB2_ENABLE, + GPIO_USB3_ENABLE, + GPIO_USB4_ENABLE, + GPIO_USB5_ENABLE, +}; + void board_reset_pd_mcu(void) { gpio_set_level(GPIO_USB_C0_PD_RST_ODL, 0); diff --git a/board/fizz/board.h b/board/fizz/board.h index c18b145642..ce35934640 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -117,6 +117,10 @@ #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP +/* USB-A config */ +#define CONFIG_USB_PORT_POWER_DUMB +#define USB_PORT_COUNT 5 + /* Optional feature to configure npcx chip */ #define NPCX_UART_MODULE2 1 /* 1:GPIO64/65 as UART */ #define NPCX_JTAG_MODULE2 0 /* 0:GPIO21/17/16/20 as JTAG */ diff --git a/board/fizz/gpio.inc b/board/fizz/gpio.inc index 3ae2672c2b..c8ed8389f1 100644 --- a/board/fizz/gpio.inc +++ b/board/fizz/gpio.inc @@ -77,6 +77,12 @@ GPIO(USB_C0_PD_RST_ODL, PIN(0, 3), GPIO_OUT_LOW) /* C0 PD Reset */ GPIO(USB_C0_DP_HPD, PIN(9, 4), GPIO_INPUT) /* C0 DP Hotplug Detect */ GPIO(USB_C0_TCPC_PWR, PIN(8, 4), GPIO_OUT_LOW) /* Enable C0 TCPC Power */ GPIO(FAN_PWR_EN, PIN(9, 5), GPIO_OUT_HIGH) /* Fan power */ +GPIO(USB1_ENABLE, PIN(3, 2), GPIO_OUT_LOW) /* Rear port, bottom */ +GPIO(USB2_ENABLE, PIN(C, 6), GPIO_OUT_LOW) /* Rear port, top */ +GPIO(USB3_ENABLE, PIN(A, 1), GPIO_OUT_LOW) /* Rear port, single */ +GPIO(USB4_ENABLE, PIN(0, 0), GPIO_OUT_LOW) /* Front port 1 */ +GPIO(USB5_ENABLE, PIN(B, 1), GPIO_OUT_LOW) /* Front port 2 */ +GPIO(USB_A_CHARGE_EN_L, PIN(A, 5), GPIO_OUT_LOW) /* Board ID */ GPIO(BOARD_VERSION1, PIN(C, 4), GPIO_INPUT) /* Board ID bit0 */ -- cgit v1.2.1