diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-06-10 08:24:57 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-10 19:48:03 +0000 |
| commit | 5d7c4f0cd6b7b020e70c9f9ec5f60a8457b90f12 (patch) | |
| tree | 0097d925ec618a0fac9ddba73579593ed8b243d9 | |
| parent | e8dc5e7d836f8861fe5dd816cad2b0f6cd3cbd81 (diff) | |
| download | chrome-ec-5d7c4f0cd6b7b020e70c9f9ec5f60a8457b90f12.tar.gz | |
glados: enable battery present detection
Change battery temperature ADC into an input with a
pull-up and use it for battery detection.
BUG=none
BRANCH=none
TEST=boot with and without battery and check gpio
accurately reflects battery status.
Change-Id: Id30a6c2d7eaad2e6f3c69be4bab33dbcf0682e29
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/276650
Reviewed-by: Rong Chang <rongchang@chromium.org>
| -rw-r--r-- | board/glados/board.c | 2 | ||||
| -rw-r--r-- | board/glados/board.h | 2 | ||||
| -rw-r--r-- | board/glados/gpio.inc | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/board/glados/board.c b/board/glados/board.c index e72e631b17..7c62e36939 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -80,8 +80,6 @@ BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); /* ADC channels */ const struct adc_t adc_channels[] = { - /* Battery pack thermisor */ - [ADC_BATT_TEMP] = {"BATT_TEMP", 1, 1, 0, 0}, /* Vbus sensing. Converted to mV, full ADC is equivalent to 33V. */ [ADC_VBUS] = {"VBUS", 33000, 1024, 0, 1}, /* Adapter current output or battery discharging current */ diff --git a/board/glados/board.h b/board/glados/board.h index 6b431c6d4a..d9be43cc95 100644 --- a/board/glados/board.h +++ b/board/glados/board.h @@ -10,6 +10,7 @@ /* Optional features */ #define CONFIG_ADC +#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BAT_PRESENT_L #define CONFIG_BATTERY_SMART #define CONFIG_BUTTON_COUNT 2 #define CONFIG_CHARGE_MANAGER @@ -75,7 +76,6 @@ /* ADC signal */ enum adc_channel { - ADC_BATT_TEMP, ADC_VBUS, ADC_AMON_BMON, ADC_PSYS, diff --git a/board/glados/gpio.inc b/board/glados/gpio.inc index 34a9ee850f..5b488ab2ae 100644 --- a/board/glados/gpio.inc +++ b/board/glados/gpio.inc @@ -52,6 +52,7 @@ GPIO(USB_C0_DP_HPD, PIN(46), GPIO_OUT_LOW) GPIO(USB_C1_DP_HPD, PIN(51), GPIO_OUT_LOW) GPIO(CPU_PROCHOT, PIN(52), GPIO_OUT_LOW) GPIO(ENABLE_TOUCHPAD, PIN(53), GPIO_OUT_LOW) +GPIO(BAT_PRESENT_L, PIN(56), GPIO_INPUT | GPIO_PULL_UP) GPIO(USB_PD_WAKE, PIN(60), GPIO_OUT_LOW) /* When asserted, ME does not lock security descriptor */ GPIO(PCH_SEC_DISABLE_L, PIN(65), GPIO_OUT_HIGH) @@ -143,8 +144,8 @@ ALTERNATE(PIN_MASK(2, 0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH) ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH) /* ADC pins */ -/* ADC0 - GPIO056 / EC_BATT_TMP. ADC1 - GPIO057 / PPVAR_BOOSTIN_SENSE */ -ALTERNATE(PIN_MASK(5, 0xc0), 1, MODULE_ADC, GPIO_ANALOG) +/* ADC1 - GPIO057 / PPVAR_BOOSTIN_SENSE */ +ALTERNATE(PIN_MASK(5, 0x80), 1, MODULE_ADC, GPIO_ANALOG) /* ADC3 - GPIO061 / IADP_ACMON_BMON. ADC4 - GPIO062 / PMON_PSYS */ ALTERNATE(PIN_MASK(6, 0x06), 1, MODULE_ADC, GPIO_ANALOG) |