diff options
| author | Mike Lee <mike5@huaqin.corp-partner.google.com> | 2021-05-18 10:28:55 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-05-18 17:17:20 +0000 |
| commit | 86205854684f98d7092e47e974961bb94697b410 (patch) | |
| tree | fc819ab322fd510efc362e63230902ecc250b6e8 | |
| parent | 2e12c7da90df509e19de90bd1864bb972d6e1342 (diff) | |
| download | chrome-ec-86205854684f98d7092e47e974961bb94697b410.tar.gz | |
blipper: add a thermal sensor config
1.add a new thermal sensor for detect typeC field temp
2.modify sensor name
BUG=b:188367187
BRANCH=dedede
TEST=make BOARD=blipper,'ectool temps all' test ok
Signed-off-by: Mike Lee <mike5@huaqin.corp-partner.google.com>
Change-Id: Iae0624ca33a80125b58b92e5b564c6211c107931
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2902061
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/blipper/board.c | 13 | ||||
| -rw-r--r-- | board/blipper/board.h | 2 | ||||
| -rw-r--r-- | board/blipper/gpio.inc | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/board/blipper/board.c b/board/blipper/board.c index c73877e1c4..57e12dd973 100644 --- a/board/blipper/board.c +++ b/board/blipper/board.c @@ -132,6 +132,13 @@ const struct adc_t adc_channels[] = { .shift = 0, .channel = CHIP_ADC_CH13 }, + [ADC_TEMP_SENSOR_3] = { + .name = "TEMP_SENSOR3", + .factor_mul = ADC_MAX_MVOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + .channel = CHIP_ADC_CH15 + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -360,7 +367,7 @@ BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); /* Thermistors */ const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Memory", + [TEMP_SENSOR_1] = {.name = "Charge", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_51k1_47k_4050b, .idx = ADC_TEMP_SENSOR_1}, @@ -368,5 +375,9 @@ const struct temp_sensor_t temp_sensors[] = { .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_51k1_47k_4050b, .idx = ADC_TEMP_SENSOR_2}, + [TEMP_SENSOR_3] = {.name = "5V_Inductor", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_3}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/blipper/board.h b/board/blipper/board.h index 8776c57b8d..0844e843f0 100644 --- a/board/blipper/board.h +++ b/board/blipper/board.h @@ -88,12 +88,14 @@ enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC2 */ ADC_TEMP_SENSOR_2, /* ADC3 */ ADC_SUB_ANALOG, /* ADC13 */ + ADC_TEMP_SENSOR_3, /* ADC15 */ ADC_CH_COUNT }; enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, + TEMP_SENSOR_3, TEMP_SENSOR_COUNT }; diff --git a/board/blipper/gpio.inc b/board/blipper/gpio.inc index 5eeb6aec9f..2f6739b737 100644 --- a/board/blipper/gpio.inc +++ b/board/blipper/gpio.inc @@ -125,7 +125,6 @@ GPIO(GPIOJ3_NC, PIN(J, 3), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(GPIOJ4_NC, PIN(J, 4), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(GPIOJ5_NC, PIN(J, 5), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(GPIOJ6_NC, PIN(J, 6), GPIO_INPUT | GPIO_PULL_DOWN) -GPIO(GPIOL2_NC, PIN(L, 2), GPIO_INPUT | GPIO_PULL_DOWN) GPIO(GPIOM6_NC, PIN(M, 6), GPIO_INPUT | GPIO_PULL_DOWN) /* Alternate functions GPIO definitions */ @@ -139,7 +138,7 @@ ALTERNATE(PIN_MASK(F, BIT(6) | BIT(7)), 0, MODULE_I2C, GPIO_SEL_1P8V) /* I2C2 - ALTERNATE(PIN_MASK(A, BIT(4) | BIT(5)), 0, MODULE_I2C, 0) /* I2C5 */ /* ADC */ -ALTERNATE(PIN_MASK(L, BIT(0)), 0, MODULE_ADC, 0) /* ADC13: EC_SUB_ANALOG */ +ALTERNATE(PIN_MASK(L, BIT(0) | BIT(2)), 0, MODULE_ADC, 0) /* ADC13: EC_SUB_ANALOG, ADC15: TEMP_SENSOR_3 */ ALTERNATE(PIN_MASK(I, BIT(0) | BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC0: EC_VSNS_PP3300_A, ADC2: TEMP_SENSOR_1, ADC3: TEMP_SENSOR_2 */ /* DAC */ |