diff options
| author | Wai-Hong Tam <waihong@google.com> | 2019-12-07 16:59:59 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-10 22:21:32 +0000 |
| commit | a7caa808133041759366f45b90d4fa8d252a5a62 (patch) | |
| tree | c7d32dfd9d55896d0f5ef1851e5df359c5009ba7 /board | |
| parent | 633bca2829532c6cad19cf49774a57f6baf8d1bf (diff) | |
| download | chrome-ec-a7caa808133041759366f45b90d4fa8d252a5a62.tar.gz | |
Trogdor: Measure the rail PP868_S1C_S2C_S3C
Add ADC5 which measure the rail PP868_S1C_S2C_S3C.
BRANCH=None
BUG=b:143616352
TEST=Checked the ADC values when AP on and off.
Change-Id: I8b33e199a9c7214d748c5435d9a77d0bf1fd7c15
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1954981
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/trogdor/board.c | 8 | ||||
| -rw-r--r-- | board/trogdor/board.h | 1 | ||||
| -rw-r--r-- | board/trogdor/gpio.inc | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/board/trogdor/board.c b/board/trogdor/board.c index edbdf53740..3925051ba7 100644 --- a/board/trogdor/board.c +++ b/board/trogdor/board.c @@ -146,6 +146,14 @@ const struct adc_t adc_channels[] = { 2, 0 }, + /* Expected to be within 2.8V. No multiplier. */ + [ADC_PP868_S1C_S2C_S3C] = { + "PP868_S1C_S2C_S3C", + NPCX_ADC_CH5, + ADC_MAX_VOLT, + ADC_READ_MAX + 1, + 0 + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); diff --git a/board/trogdor/board.h b/board/trogdor/board.h index e848c11811..e9bcda4f79 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -209,6 +209,7 @@ enum adc_channel { ADC_VBUS, ADC_AMON_BMON, ADC_PSYS, + ADC_PP868_S1C_S2C_S3C, ADC_CH_COUNT }; diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index 8821a74e65..4a8530c9eb 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -106,6 +106,7 @@ GPIO(EDP_BKLTCTL, PIN(B, 7), GPIO_INPUT) /* PWM5 */ GPIO(PPVAR_BOOSTIN_SENSE, PIN(4, 4), GPIO_INPUT) /* ADC1 */ GPIO(CHARGER_IADP, PIN(4, 3), GPIO_INPUT) /* ADC2 */ GPIO(CHARGER_PMON, PIN(4, 2), GPIO_INPUT) /* ADC3 */ +GPIO(PP868_S1C_S2C_S3C, PIN(3, 7), GPIO_INPUT) /* ADC5 */ /* I2C */ GPIO(EC_I2C_POWER_SCL, PIN(B, 5), GPIO_INPUT) @@ -142,6 +143,7 @@ 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, 0x1C), 0, MODULE_ADC, 0) /* ADC1 (GPIO44), ADC2 (GPIO43), ADC3 (GPIO42) */ +ALTERNATE(PIN_MASK(3, 0x80), 0, MODULE_ADC, 0) /* ADC5 (GPIO37) */ 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(8, 0x01), 0, MODULE_PWM, 0) /* PWM3 (GPIO80) - KB_BL_PWM */ |