diff options
| author | Elsie Shih <elsie_shih@wistron.corp-partner.google.com> | 2022-05-09 09:54:20 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-09 07:37:49 +0000 |
| commit | 17d653cda8c3c38066ff3dd34f369505b8ee3cd5 (patch) | |
| tree | 44727a898dd7e80d4a0aa99ff0ae6cee3118346d | |
| parent | 127aeb547c8f39c0482bf734339f386d988c1216 (diff) | |
| download | chrome-ec-17d653cda8c3c38066ff3dd34f369505b8ee3cd5.tar.gz | |
moli: remove WIFI thermal sensor
BUG=b:231900728
TEST=make BOARD=moli
Signed-off-by: Elsie Shih <elsie_shih@wistron.corp-partner.google.com>
Change-Id: Ib02289aa71e9bd37d7dbf7b4c0fbb5e3fe889503
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3634168
Reviewed-by: Zhuohao Lee <zhuohao@chromium.org>
| -rw-r--r-- | board/moli/board.h | 6 | ||||
| -rw-r--r-- | board/moli/sensors.c | 22 |
2 files changed, 6 insertions, 22 deletions
diff --git a/board/moli/board.h b/board/moli/board.h index aea6aed220..59031a16e1 100644 --- a/board/moli/board.h +++ b/board/moli/board.h @@ -151,8 +151,7 @@ enum charge_port { enum adc_channel { ADC_TEMP_SENSOR_1_CPU, ADC_TEMP_SENSOR_2_CPU_VR, - ADC_TEMP_SENSOR_3_WIFI, - ADC_TEMP_SENSOR_4_DIMM, + ADC_TEMP_SENSOR_3_DIMM, ADC_VBUS, ADC_PPVAR_IMON, /* ADC3 */ ADC_CH_COUNT @@ -161,8 +160,7 @@ enum adc_channel { enum temp_sensor_id { TEMP_SENSOR_1_CPU, TEMP_SENSOR_2_CPU_VR, - TEMP_SENSOR_3_WIFI, - TEMP_SENSOR_4_DIMM, + TEMP_SENSOR_3_DIMM, TEMP_SENSOR_COUNT }; diff --git a/board/moli/sensors.c b/board/moli/sensors.c index 642b4ee8e1..c214ce71bb 100644 --- a/board/moli/sensors.c +++ b/board/moli/sensors.c @@ -26,14 +26,7 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, - [ADC_TEMP_SENSOR_3_WIFI] = { - .name = "TEMP_WIFI", - .input_ch = NPCX_ADC_CH6, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, - [ADC_TEMP_SENSOR_4_DIMM] = { + [ADC_TEMP_SENSOR_3_DIMM] = { .name = "TEMP_DIMM", .input_ch = NPCX_ADC_CH7, .factor_mul = ADC_MAX_VOLT, @@ -70,17 +63,11 @@ const struct temp_sensor_t temp_sensors[] = { .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_2_CPU_VR }, - [TEMP_SENSOR_3_WIFI] = { - .name = "WIFI", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_30k9_47k_4050b, - .idx = ADC_TEMP_SENSOR_3_WIFI - }, - [TEMP_SENSOR_4_DIMM] = { + [TEMP_SENSOR_3_DIMM] = { .name = "DIMM", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, - .idx = ADC_TEMP_SENSOR_4_DIMM + .idx = ADC_TEMP_SENSOR_3_DIMM }, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -116,7 +103,6 @@ __maybe_unused static const struct ec_thermal_config thermal_cpu = THERMAL_CPU; struct ec_thermal_config thermal_params[] = { [TEMP_SENSOR_1_CPU] = THERMAL_CPU, [TEMP_SENSOR_2_CPU_VR] = THERMAL_CPU, - [TEMP_SENSOR_3_WIFI] = THERMAL_CPU, - [TEMP_SENSOR_4_DIMM] = THERMAL_CPU, + [TEMP_SENSOR_3_DIMM] = THERMAL_CPU, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); |