diff options
| -rw-r--r-- | board/gimble/board.h | 6 | ||||
| -rw-r--r-- | board/gimble/sensors.c | 29 |
2 files changed, 26 insertions, 9 deletions
diff --git a/board/gimble/board.h b/board/gimble/board.h index 7411457935..3e75b0bf13 100644 --- a/board/gimble/board.h +++ b/board/gimble/board.h @@ -178,13 +178,15 @@ enum adc_channel { ADC_TEMP_SENSOR_1_DDR_SOC, - ADC_TEMP_SENSOR_2_CHARGER, + ADC_TEMP_SENSOR_2_FAN, + ADC_TEMP_SENSOR_3_CHARGER, ADC_CH_COUNT }; enum temp_sensor_id { TEMP_SENSOR_1_DDR_SOC, - TEMP_SENSOR_2_CHARGER, + TEMP_SENSOR_2_FAN, + TEMP_SENSOR_3_CHARGER, TEMP_SENSOR_COUNT }; diff --git a/board/gimble/sensors.c b/board/gimble/sensors.c index 47149b05d0..19acbd66fd 100644 --- a/board/gimble/sensors.c +++ b/board/gimble/sensors.c @@ -24,13 +24,20 @@ const struct adc_t adc_channels[] = { .factor_div = ADC_READ_MAX + 1, .shift = 0, }, - [ADC_TEMP_SENSOR_2_CHARGER] = { - .name = "TEMP_CHARGER", + [ADC_TEMP_SENSOR_2_FAN] = { + .name = "TEMP_FAN", .input_ch = NPCX_ADC_CH1, .factor_mul = ADC_MAX_VOLT, .factor_div = ADC_READ_MAX + 1, .shift = 0, }, + [ADC_TEMP_SENSOR_3_CHARGER] = { + .name = "TEMP_CHARGER", + .input_ch = NPCX_ADC_CH6, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + .shift = 0, + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -147,17 +154,23 @@ const struct temp_sensor_t temp_sensors[] = { .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1_DDR_SOC }, - [TEMP_SENSOR_2_CHARGER] = { + [TEMP_SENSOR_2_FAN] = { + .name = "Fan", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_30k9_47k_4050b, + .idx = ADC_TEMP_SENSOR_2_FAN + }, + [TEMP_SENSOR_3_CHARGER] = { .name = "Charger", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_30k9_47k_4050b, - .idx = ADC_TEMP_SENSOR_2_CHARGER + .idx = ADC_TEMP_SENSOR_3_CHARGER }, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); /* - * TODO(b/180681346): update for Alder Lake/brya + * TODO(b/194318801): confirm thermal limits setting for gimble * * Tiger Lake specifies 100 C as maximum TDP temperature. THRMTRIP# occurs at * 130 C. However, sensor is located next to DDR, so we need to use the lower @@ -176,7 +189,7 @@ static const struct ec_thermal_config thermal_cpu = { }; /* - * TODO(b/180681346): update for Alder Lake/brya + * TODO(b/194318801): confirm thermal limits setting for gimble * * Inductor limits - used for both charger and PP3300 regulator * @@ -203,6 +216,8 @@ static const struct ec_thermal_config thermal_inductor = { /* this should really be "const" */ struct ec_thermal_config thermal_params[] = { [TEMP_SENSOR_1_DDR_SOC] = thermal_cpu, - [TEMP_SENSOR_2_CHARGER] = thermal_inductor, + /* TODO(b/194318801): confirm thermal limits setting for gimble */ + [TEMP_SENSOR_2_FAN] = thermal_inductor, + [TEMP_SENSOR_3_CHARGER] = thermal_inductor, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); |