diff options
| author | YongBeum.Ha <ybha@samsung.corp-partner.google.com> | 2020-03-30 16:11:26 +0900 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-01 02:10:01 +0000 |
| commit | 903534647fa0143b6948be1c9d1fe160f01427ed (patch) | |
| tree | 43c6df85bda6e6756fb2c866ccaa7d325ebba4e8 | |
| parent | 35474c0873bed490042d58d28d68b8e37125500e (diff) | |
| download | chrome-ec-903534647fa0143b6948be1c9d1fe160f01427ed.tar.gz | |
nightfury : remove ambient thermal sensor
nightfury has 3 thermal sensor for Charger, IA and GT
BUG=b:149226871
BRANCH=firmware-hatch-12672.B
TEST=make -j BOARD=nightfury
Signed-off-by: YongBeum.Ha <ybha@samsung.corp-partner.google.com>
Change-Id: I9d1c33949577126deb3e4345ee0d679c98f9d977
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2126627
Reviewed-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Tested-by: Bob Moragues <moragues@chromium.org>
Commit-Queue: Bob Moragues <moragues@chromium.org>
| -rw-r--r-- | board/nightfury/board.c | 17 | ||||
| -rw-r--r-- | board/nightfury/board.h | 4 |
2 files changed, 6 insertions, 15 deletions
diff --git a/board/nightfury/board.c b/board/nightfury/board.c index c896d16c8b..825fd755bf 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -336,33 +336,27 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); /* ADC channels */ const struct adc_t adc_channels[] = { [ADC_TEMP_SENSOR_1] = { - "TEMP_AMB", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, + "TEMP_CHARGER", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, [ADC_TEMP_SENSOR_2] = { - "TEMP_CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, + "TEMP_IA", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, [ADC_TEMP_SENSOR_3] = { - "TEMP_IA", NPCX_ADC_CH2, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - [ADC_TEMP_SENSOR_4] = { "TEMP_GT", NPCX_ADC_CH3, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Ambient", + [TEMP_SENSOR_1] = {.name = "Charger", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1}, - [TEMP_SENSOR_2] = {.name = "Charger", + [TEMP_SENSOR_2] = {.name = "IA", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_2}, - [TEMP_SENSOR_3] = {.name = "IA", + [TEMP_SENSOR_3] = {.name = "GT", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_3}, - [TEMP_SENSOR_4] = {.name = "GT", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_30k9_47k_4050b, - .idx = ADC_TEMP_SENSOR_4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -391,7 +385,6 @@ struct ec_thermal_config thermal_params[] = { [TEMP_SENSOR_1] = thermal_a, [TEMP_SENSOR_2] = thermal_a, [TEMP_SENSOR_3] = thermal_a, - [TEMP_SENSOR_4] = thermal_a, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); diff --git a/board/nightfury/board.h b/board/nightfury/board.h index 5f27fa632a..1acb067e0b 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -156,8 +156,7 @@ extern enum gpio_signal gpio_en_pp5000_a; enum adc_channel { ADC_TEMP_SENSOR_1, /* ADC0 */ ADC_TEMP_SENSOR_2, /* ADC1 */ - ADC_TEMP_SENSOR_3, /* ADC2 */ - ADC_TEMP_SENSOR_4, /* ADC3 */ + ADC_TEMP_SENSOR_3, /* ADC3 */ ADC_CH_COUNT }; @@ -191,7 +190,6 @@ enum temp_sensor_id { TEMP_SENSOR_1, TEMP_SENSOR_2, TEMP_SENSOR_3, - TEMP_SENSOR_4, TEMP_SENSOR_COUNT }; |