diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-02-18 13:05:41 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-20 01:07:50 +0000 |
| commit | e3bb29fb60440443c0cc8c81010436db7c90bd38 (patch) | |
| tree | 7239e31e5b0948f682b130fed7b88a7b39c40acd | |
| parent | 6ad13519e18822221d7b7fb6a3083f845ef70c48 (diff) | |
| download | chrome-ec-e3bb29fb60440443c0cc8c81010436db7c90bd38.tar.gz | |
Revert "Trogdor: Measure the rail PP868_S1C_S2C_S3C"
This reverts commit a7caa808133041759366f45b90d4fa8d252a5a62.
The ADC logic is removed on the next rev.
BRANCH=None
BUG=b:146470311
TEST=Built and booted successfully.
Change-Id: Ia32d41e17a40d715b15af8f18493a55b19d7c9d4
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2062763
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
| -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, 0 insertions, 11 deletions
diff --git a/board/trogdor/board.c b/board/trogdor/board.c index 120a840459..717392a1a2 100644 --- a/board/trogdor/board.c +++ b/board/trogdor/board.c @@ -164,14 +164,6 @@ 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 331e28e92b..6a63498ddb 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -211,7 +211,6 @@ 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 3410cc05fb..8c608451ca 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -106,7 +106,6 @@ 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) @@ -143,7 +142,6 @@ 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 */ |