diff options
| author | Philip Chen <philipchen@google.com> | 2018-08-30 12:18:09 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-08-31 05:23:46 -0700 |
| commit | 9bb5117aa350e21f6c15257d7d7a464af4b6d08c (patch) | |
| tree | 434016fc90d9b4da5b5b7c7e2663939191511ce5 | |
| parent | 7a377aff01e61a324bfa6a39087808f1b12e7dc9 (diff) | |
| download | chrome-ec-stabilize-atlas-11022.B.tar.gz | |
cheza: Measure VBUS by ADCstabilize-atlas-11022.B
BRANCH=none
BUG=b:112441618
TEST=manually test adc command on a reworked rev2 board:
(1)When a Type-C charger is plugged, VBUS is measured ~5000mV.
(2)When a 15V PD charger is plugged, VBUS is measured ~15000mV.
(3)When no charger is plgged, VBUS drops to ~0mV.
Change-Id: I0340d1e4428260e6898eccdac930a9d96d9836bd
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1196847
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
| -rw-r--r-- | board/cheza/board.c | 8 | ||||
| -rw-r--r-- | board/cheza/board.h | 2 | ||||
| -rw-r--r-- | board/cheza/gpio.inc | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/board/cheza/board.c b/board/cheza/board.c index badbfbef6c..c514a0875e 100644 --- a/board/cheza/board.c +++ b/board/cheza/board.c @@ -125,6 +125,14 @@ const struct adc_t adc_channels[] = { ADC_READ_MAX + 1, 0 }, + /* Measure VBUS through a 1/10 voltage divider */ + [ADC_VBUS] = { + "VBUS", + NPCX_ADC_CH1, + ADC_MAX_VOLT * 10, + ADC_READ_MAX + 1, + 0 + }, /* * Adapter current output or battery charging/discharging current (uV) * 18x amplification on charger side. diff --git a/board/cheza/board.h b/board/cheza/board.h index 6c7ac79229..1e675ea94f 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -103,7 +103,6 @@ #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_PD_VBUS_DETECT_CHARGER -#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT #define CONFIG_USB_PD_5V_EN_CUSTOM #define CONFIG_USBC_PPC_SN5S330 #define CONFIG_USBC_SS_MUX @@ -164,6 +163,7 @@ enum power_signal { enum adc_channel { ADC_BASE_DET, + ADC_VBUS, ADC_AMON_BMON, ADC_PSYS, ADC_CH_COUNT diff --git a/board/cheza/gpio.inc b/board/cheza/gpio.inc index e355462f79..954bf88200 100644 --- a/board/cheza/gpio.inc +++ b/board/cheza/gpio.inc @@ -150,7 +150,7 @@ ALTERNATE(PIN_MASK(9, 0x07), 1, MODULE_I2C, 0) /* I2C1 SDA (GPIO90), ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* I2C1 SCL (GPIO87) */ ALTERNATE(PIN_MASK(3, 0x48), 1, MODULE_I2C, 0) /* I2C5 (GPIO33/36) */ ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, GPIO_SEL_1P8V) /* I2C7 (GPIOB2/B3) - 1.8V */ -ALTERNATE(PIN_MASK(4, 0x0C), 0, MODULE_ADC, 0) /* ADC2 (GPIO43), ADC3 (GPIO42) */ +ALTERNATE(PIN_MASK(4, 0x1C), 0, MODULE_ADC, 0) /* ADC1 (GPIO44), ADC2 (GPIO43), ADC3 (GPIO42) */ ALTERNATE(PIN_MASK(4, 0xC0), 1, MODULE_SPI, GPIO_SEL_1P8V) /* SHI_SDO (GPIO47), SHI_SDI (GPIO46) */ ALTERNATE(PIN_MASK(5, 0x28), 1, MODULE_SPI, GPIO_SEL_1P8V) /* SHI_SCLK (GPIO55), SHI_CS# (GPIO53) */ ALTERNATE(PIN_MASK(B, 0x80), 1, MODULE_PWM, 0) /* PWM5 (GPIOB7) */ |