diff options
| author | Sue Chen <sue.chen@quanta.corp-partner.google.com> | 2021-07-20 09:46:32 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-09-13 16:13:50 +0000 |
| commit | 4747adea502e9152264a89b8dc73f8221eb70c87 (patch) | |
| tree | 8095633e6d5d5da9462a1161fda1c5cb16f11357 | |
| parent | 73f2eea1f3a9c8295ce7b650a3615f3af7227a8f (diff) | |
| download | chrome-ec-4747adea502e9152264a89b8dc73f8221eb70c87.tar.gz | |
Scout: Update thermal table and add the 2nd temp sensor
Enable ADC1 to read TEMP_SENSOR_2 and update thermal table
for theset 2 temp sensors.
BUG=b:195602767
BRANCH=none
TEST=none
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Change-Id: I626aab0aabf1f094b97bd72f93afa783553c1d3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3038010
Reviewed-by: Jeff Chase <jnchase@google.com>
(cherry picked from commit 88128f6080ed52dc1855313fa38c7318cc7f2730)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3143409
Commit-Queue: Jeff Chase <jnchase@google.com>
Reviewed-by: Joe Tessler <jrt@chromium.org>
| -rw-r--r-- | board/scout/board.c | 24 | ||||
| -rw-r--r-- | board/scout/board.h | 2 | ||||
| -rw-r--r-- | board/scout/gpio.inc | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/board/scout/board.c b/board/scout/board.c index 60a26abffb..b917020791 100644 --- a/board/scout/board.c +++ b/board/scout/board.c @@ -182,6 +182,12 @@ const struct adc_t adc_channels[] = { .factor_mul = ADC_MAX_VOLT, .factor_div = ADC_READ_MAX + 1, }, + [ADC_TEMP_SENSOR_2] = { + .name = "TEMP_SENSOR_2", + .input_ch = NPCX_ADC_CH1, + .factor_mul = ADC_MAX_VOLT, + .factor_div = ADC_READ_MAX + 1, + }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -192,6 +198,12 @@ const struct temp_sensor_t temp_sensors[] = { .read = get_temp_3v3_30k9_47k_4050b, .idx = ADC_TEMP_SENSOR_1, }, + [TEMP_SENSOR_WIFI] = { + .name = "Wifi", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_30k9_47k_4050b, + .idx = ADC_TEMP_SENSOR_2, + }, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -213,7 +225,7 @@ const struct fan_conf fan_conf_0 = { const struct fan_rpm fan_rpm_0 = { .rpm_min = 2500, .rpm_start = 2500, - .rpm_max = 5200, + .rpm_max = 5300, }; const struct fan_t fans[] = { @@ -233,16 +245,16 @@ BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); const static struct ec_thermal_config thermal_a = { .temp_host = { [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(78), - [EC_TEMP_THRESH_HALT] = C_TO_K(85), + [EC_TEMP_THRESH_HIGH] = C_TO_K(85), + [EC_TEMP_THRESH_HALT] = C_TO_K(90), }, .temp_host_release = { [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(70), + [EC_TEMP_THRESH_HIGH] = C_TO_K(78), [EC_TEMP_THRESH_HALT] = 0, }, .temp_fan_off = C_TO_K(25), - .temp_fan_max = C_TO_K(84), + .temp_fan_max = C_TO_K(89), }; const static struct ec_thermal_config thermal_b = { @@ -260,6 +272,7 @@ const static struct ec_thermal_config thermal_b = { struct ec_thermal_config thermal_params[] = { [TEMP_SENSOR_CORE] = thermal_a, + [TEMP_SENSOR_WIFI] = thermal_a, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); @@ -393,6 +406,7 @@ static void setup_thermal(void) case 0: default: thermal_params[TEMP_SENSOR_CORE] = thermal_a; + thermal_params[TEMP_SENSOR_WIFI] = thermal_a; break; /* Table1 is fanless */ case 1: diff --git a/board/scout/board.h b/board/scout/board.h index 134e051bbe..1d141b0166 100644 --- a/board/scout/board.h +++ b/board/scout/board.h @@ -143,6 +143,7 @@ enum adc_channel { ADC_VBUS, /* ADC4 */ ADC_PPVAR_IMON, /* ADC9 */ ADC_TEMP_SENSOR_1, /* ADC0 */ + ADC_TEMP_SENSOR_2, /* ADC1 */ /* Number of ADC channels */ ADC_CH_COUNT }; @@ -169,6 +170,7 @@ enum mft_channel { enum temp_sensor_id { TEMP_SENSOR_CORE, + TEMP_SENSOR_WIFI, TEMP_SENSOR_COUNT }; diff --git a/board/scout/gpio.inc b/board/scout/gpio.inc index 32e077de50..af8fbfb25b 100644 --- a/board/scout/gpio.inc +++ b/board/scout/gpio.inc @@ -145,7 +145,7 @@ ALTERNATE(PIN_MASK(B, 0x80), 0, MODULE_PWM, 0) /* PWM5 - Fan 1 ALTERNATE(PIN_MASK(7, 0x08), 0, MODULE_PWM, 0) /* TA2 - Fan Tachometer */ /* ADC */ -ALTERNATE(PIN_MASK(4, 0x2E), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC2, ADC4 */ +ALTERNATE(PIN_MASK(4, 0x3E), 0, MODULE_ADC, 0) /* ADC0, ADC1, ADC2, ADC4 */ ALTERNATE(PIN_MASK(E, 0x02), 0, MODULE_ADC, 0) /* ADC7 */ ALTERNATE(PIN_MASK(F, 0x01), 0, MODULE_ADC, 0) /* ADC9 */ |