diff options
| author | Edward Hill <ecgh@chromium.org> | 2018-03-15 17:40:55 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-03-16 15:56:25 -0700 |
| commit | 27a0cf0233090737079373604da1469fafb6869a (patch) | |
| tree | 86756236c81a9d6b318ef4f3e4a6cd35dcf6a317 /board/grunt/board.h | |
| parent | 43d0769918a0c674423227bb9e81226a0dba6274 (diff) | |
| download | chrome-ec-27a0cf0233090737079373604da1469fafb6869a.tar.gz | |
grunt: GPIO changes for board version 2
Define GPIOs for board versions 0 and 2. Read version in board_init()
and configure GPIOs correctly.
BUG=b:74538637
BRANCH=none
TEST=build + boot grunt (version 0)
Change-Id: I1ff23d5c114cb12e3a32ef069f5e5dff50640d3f
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/966591
Reviewed-by: Martin Roth <martinroth@chromium.org>
Diffstat (limited to 'board/grunt/board.h')
| -rw-r--r-- | board/grunt/board.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/board/grunt/board.h b/board/grunt/board.h index 824e7d7714..65e3d1ebb5 100644 --- a/board/grunt/board.h +++ b/board/grunt/board.h @@ -92,19 +92,15 @@ #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_PD_VBUS_DETECT_PPC -#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT #define CONFIG_USBC_PPC_SN5S330 #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_SS_MUX_DFP_ONLY #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP -/* USB Type-A Port BC1.2 support */ -#define CONFIG_USB_PORT_POWER_SMART -#define CONFIG_USB_PORT_POWER_SMART_CDP_SDP_ONLY -#define CONFIG_USB_PORT_POWER_SMART_INVERTED -#define GPIO_USB1_ILIM_SEL GPIO_USB_A0_CHARGE_EN_L -#define GPIO_USB2_ILIM_SEL GPIO_USB_A1_CHARGE_EN_L +/* USB-A config */ +#define CONFIG_USB_PORT_POWER_DUMB +#define USB_PORT_COUNT 2 /* TODO(b/69683108): Use correct PD delay values */ #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ @@ -176,6 +172,7 @@ enum adc_channel { ADC_TEMP_SENSOR_CHARGER, ADC_TEMP_SENSOR_SOC, + ADC_VBUS, ADC_CH_COUNT }; |