diff options
| author | Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com> | 2021-03-11 14:10:07 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-11 20:08:06 +0000 |
| commit | e8cb700579e12ddb0c0f2cda784f04adb6de40f8 (patch) | |
| tree | 2abd75ee56064af9010503bd2f3ac4b775adaaee | |
| parent | 390c1ed7e7b9358a94050fea2bfb0de8f707645a (diff) | |
| download | chrome-ec-e8cb700579e12ddb0c0f2cda784f04adb6de40f8.tar.gz | |
Metaknight: modify thermal sensor/table label
TEMP_SENSOR_1 -> TEMP_SENSOR_MEMORY
TEMP_SENSOR_2 -> TEMP_SENSOR_CPU
BUG=None
BRANCH=dedede
TEST=check ec console temps, temperature is correct.
Signed-off-by: yu-an.chen@quanta.corp-partner.google.com
Change-Id: I8b47cc39ee2fc226b8f50b76fe440b0bd68d11af
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2751319
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/metaknight/board.c | 27 | ||||
| -rw-r--r-- | board/metaknight/board.h | 4 |
2 files changed, 17 insertions, 14 deletions
diff --git a/board/metaknight/board.c b/board/metaknight/board.c index cd800269c5..63c3c74187 100644 --- a/board/metaknight/board.c +++ b/board/metaknight/board.c @@ -176,18 +176,21 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* Thermistors */ const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Memory", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_1}, - [TEMP_SENSOR_2] = {.name = "Ambient", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_2}, + + [TEMP_SENSOR_MEMORY] = { + .name = "Memory", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_1}, + [TEMP_SENSOR_CPU] = { + .name = "CPU", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_2}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); -const static struct ec_thermal_config thermal_a = { +const static struct ec_thermal_config thermal_memory = { .temp_host = { [EC_TEMP_THRESH_WARN] = 0, [EC_TEMP_THRESH_HIGH] = C_TO_K(70), @@ -200,7 +203,7 @@ const static struct ec_thermal_config thermal_a = { }, }; -const static struct ec_thermal_config thermal_b = { +const static struct ec_thermal_config thermal_cpu = { .temp_host = { [EC_TEMP_THRESH_WARN] = 0, [EC_TEMP_THRESH_HIGH] = C_TO_K(75), @@ -217,8 +220,8 @@ struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; static void setup_thermal(void) { - thermal_params[TEMP_SENSOR_1] = thermal_a; - thermal_params[TEMP_SENSOR_2] = thermal_b; + thermal_params[TEMP_SENSOR_MEMORY] = thermal_memory; + thermal_params[TEMP_SENSOR_CPU] = thermal_cpu; } /* Enable HDMI any time the SoC is on */ diff --git a/board/metaknight/board.h b/board/metaknight/board.h index 7f579e0261..2c60781734 100644 --- a/board/metaknight/board.h +++ b/board/metaknight/board.h @@ -163,8 +163,8 @@ enum adc_channel { }; enum temp_sensor_id { - TEMP_SENSOR_1, - TEMP_SENSOR_2, + TEMP_SENSOR_MEMORY, + TEMP_SENSOR_CPU, TEMP_SENSOR_COUNT }; |