From 05c483fd1dde32b7f2caca1ffc432d6412cf0715 Mon Sep 17 00:00:00 2001 From: Zick Wei Date: Tue, 31 Aug 2021 17:12:03 +0800 Subject: nipperkin: add regulator thermistor This patch add 5v regulator thermistor. BUG=b:193395015 BRANCH=none TEST=verify 5v regulator thermistor can be read. Signed-off-by: Zick Wei Change-Id: I1fc0cd6b5341f18100ac80e24cb884d53df7e4a0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3132555 Reviewed-by: Devin Lu Reviewed-by: Rob Barnes Commit-Queue: Rob Barnes --- board/nipperkin/board.c | 20 +++++++++++++------- board/nipperkin/board.h | 5 +++-- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'board') diff --git a/board/nipperkin/board.c b/board/nipperkin/board.c index ae8ff661c0..cdb3b6e642 100644 --- a/board/nipperkin/board.c +++ b/board/nipperkin/board.c @@ -171,8 +171,8 @@ int board_get_ambient_temp_mk(int *temp_mk) /* ADC Channels */ const struct adc_t adc_channels[] = { - [ADC_TEMP_SENSOR_SOC] = { - .name = "SOC", + [ADC_TEMP_SENSOR_MEMORY] = { + .name = "MEMORY", .input_ch = NPCX_ADC_CH0, .factor_mul = ADC_MAX_VOLT, .factor_div = ADC_READ_MAX + 1, @@ -185,8 +185,8 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, - [ADC_TEMP_SENSOR_MEMORY] = { - .name = "MEMORY", + [ADC_TEMP_SENSOR_5V_REGULATOR] = { + .name = "5V_REGULATOR", .input_ch = NPCX_ADC_CH2, .factor_mul = ADC_MAX_VOLT, .factor_div = ADC_READ_MAX + 1, @@ -210,7 +210,7 @@ const struct adc_t adc_channels[] = { BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /* Temp Sensors */ -static int board_get_memory_temp(int, int *); +static int board_get_temp(int, int *); const struct tmp112_sensor_t tmp112_sensors[] = { { I2C_PORT_SENSOR, TMP112_I2C_ADDR_FLAGS0 }, @@ -234,9 +234,15 @@ const struct temp_sensor_t temp_sensors[] = { [TEMP_SENSOR_MEMORY] = { .name = "Memory", .type = TEMP_SENSOR_TYPE_BOARD, - .read = board_get_memory_temp, + .read = board_get_temp, .idx = ADC_TEMP_SENSOR_MEMORY, }, + [TEMP_SENSOR_5V_REGULATOR] = { + .name = "5V_REGULATOR", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = board_get_temp, + .idx = ADC_TEMP_SENSOR_5V_REGULATOR, + }, [TEMP_SENSOR_CPU] = { .name = "CPU", .type = TEMP_SENSOR_TYPE_CPU, @@ -309,7 +315,7 @@ struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT] = { }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); -static int board_get_memory_temp(int idx, int *temp_k) +static int board_get_temp(int idx, int *temp_k) { if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) return EC_ERROR_NOT_POWERED; diff --git a/board/nipperkin/board.h b/board/nipperkin/board.h index dd3238483d..df57cade06 100644 --- a/board/nipperkin/board.h +++ b/board/nipperkin/board.h @@ -47,9 +47,9 @@ enum battery_type { /* ADC Channels */ enum adc_channel { - ADC_TEMP_SENSOR_SOC = 0, + ADC_TEMP_SENSOR_MEMORY = 0, ADC_TEMP_SENSOR_CHARGER, - ADC_TEMP_SENSOR_MEMORY, + ADC_TEMP_SENSOR_5V_REGULATOR, ADC_CORE_IMON1, ADC_SOC_IMON2, ADC_CH_COUNT @@ -60,6 +60,7 @@ enum temp_sensor_id { TEMP_SENSOR_SOC = 0, TEMP_SENSOR_CHARGER, TEMP_SENSOR_MEMORY, + TEMP_SENSOR_5V_REGULATOR, TEMP_SENSOR_CPU, TEMP_SENSOR_AMBIENT, TEMP_SENSOR_COUNT -- cgit v1.2.1