diff options
| author | Ben Chen <ben.chen2@quanta.corp-partner.google.com> | 2020-07-09 12:59:42 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-15 00:04:15 +0000 |
| commit | dbba8666cf70142b6f36f22a0ef71a10499f6fe0 (patch) | |
| tree | a1e264c6bfaf3a2f29b56611079180bc5f9f9889 /board/voxel | |
| parent | c6a84e237a69e04bbaa9cdac054894aac25b1b71 (diff) | |
| download | chrome-ec-dbba8666cf70142b6f36f22a0ef71a10499f6fe0.tar.gz | |
voxel: reconfig GPIO and enable/disable USB-A power
config GPIO EN_DRAM_VDDQ to GPIOC6, and enable
CONFIG_USB_PORT_POWER_DUMB for enabling/disabling
charging from USB-A ports. This change also disables
the USB1 low power limit by default.
BUG=b:155062762
BRANCH=none
TEST=make buildall PASS
Change-Id: I1f4c0e4d93364f4a73a96a3e72b363594efa72cd
Signed-off-by: Ben Chen <ben.chen2@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2289472
Commit-Queue: Keith Short <keithshort@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'board/voxel')
| -rw-r--r-- | board/voxel/board.c | 7 | ||||
| -rw-r--r-- | board/voxel/board.h | 5 | ||||
| -rw-r--r-- | board/voxel/gpio.inc | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/board/voxel/board.c b/board/voxel/board.c index 7ae244570c..02b83b4bf3 100644 --- a/board/voxel/board.c +++ b/board/voxel/board.c @@ -232,6 +232,13 @@ __override void board_cbi_init(void) } /******************************************************************************/ +/* USB-A charging control */ + +const int usb_port_enable[USB_PORT_COUNT] = { + GPIO_EN_PP5000_USBA, +}; + +/******************************************************************************/ /* USBC PPC configuration */ struct ppc_config_t ppc_chips[] = { [USBC_PORT_C0] = { diff --git a/board/voxel/board.h b/board/voxel/board.h index eb9624af0b..de4ed37592 100644 --- a/board/voxel/board.h +++ b/board/voxel/board.h @@ -24,6 +24,9 @@ #undef CONFIG_UART_TX_BUF_SIZE #define CONFIG_UART_TX_BUF_SIZE 4096 +/* Chipset features */ +#define CONFIG_POWER_PP5000_CONTROL + /* LED defines */ #define CONFIG_LED_ONOFF_STATES @@ -73,6 +76,8 @@ #define CONFIG_USB_PD_USB4 /* USB Type A Features */ +#define USB_PORT_COUNT 1 +#define CONFIG_USB_PORT_POWER_DUMB /* USBC PPC*/ #define CONFIG_USBC_PPC_SYV682X /* USBC port C0/C1 */ diff --git a/board/voxel/gpio.inc b/board/voxel/gpio.inc index 977e0ef694..549cc10582 100644 --- a/board/voxel/gpio.inc +++ b/board/voxel/gpio.inc @@ -59,7 +59,7 @@ UNIMPLEMENTED(PCH_DSW_PWROK) #ifdef VOLTEER_POWER_SEQUENCE /* Optional power sequencing signals that are not stuffed by default */ -GPIO(EN_DRAM_VDDQ, PIN(F, 2), GPIO_OUT_LOW) +GPIO(EN_DRAM_VDDQ, PIN(C, 6), GPIO_OUT_LOW) GPIO(EN_PP1050_STG, PIN(C, 0), GPIO_OUT_LOW) GPIO(EN_PP5000_USB_AG, PIN(A, 7), GPIO_OUT_LOW) GPIO(EN_PPVAR_VCCIN_AUX, PIN(8, 1), GPIO_OUT_LOW) @@ -94,6 +94,8 @@ GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH) GPIO(EC_PCH_INT_ODL, PIN(B, 0), GPIO_ODR_HIGH) /* USB and USBC Signals */ +GPIO(EN_PP5000_USBA, PIN(3, 5), GPIO_OUT_LOW) /* Enable USB-A charging - all ports */ +GPIO(USB_A_LOW_PWR_OD, PIN(6, 6), GPIO_ODR_LOW) /* Don't limit USB-A charging by default - all ports */ /* * USB_C1 moved from GPIO32 to GPIO83 on boards with board ID >=1. |