From 0c7fa10264ca27807e46c2d7ba562fdcf1fc17cc Mon Sep 17 00:00:00 2001 From: Owen_Ou Date: Tue, 31 Aug 2021 14:36:58 +0800 Subject: brya: Modify thermal_params Modify brya's thermal_params. BUG=b:181271666 BRANCH=none TEST=make -j BOARD=brya and flash brya p2 can boot. Signed-off-by: Owen_Ou Change-Id: I00c3991e2b27d1ac16489bed43204d388a557ae5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3132312 Tested-by: Owen Ou Auto-Submit: Owen Ou Commit-Queue: caveh jalali Reviewed-by: Boris Mittelberg Reviewed-by: SamSP Liu --- board/brya/fans.c | 9 +++++---- board/brya/sensors.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 26 deletions(-) (limited to 'board') diff --git a/board/brya/fans.c b/board/brya/fans.c index d966056331..021f0de8e2 100644 --- a/board/brya/fans.c +++ b/board/brya/fans.c @@ -31,15 +31,16 @@ static const struct fan_conf fan_conf_0 = { }; /* - * TOOD(b/180681346): need to update for real fan + * TOOD(b/181271666): thermistor placement and calibration * - * Prototype fan spins at about 7200 RPM at 100% PWM. - * Set minimum at around 30% PWM. + * Prototype fan spins at about 4200 RPM at 100% PWM, this + * is specific to board ID 2 and might also apears in later + * boards as well. */ static const struct fan_rpm fan_rpm_0 = { .rpm_min = 2200, .rpm_start = 2200, - .rpm_max = 7200, + .rpm_max = 4200, }; const struct fan_t fans[FAN_CH_COUNT] = { diff --git a/board/brya/sensors.c b/board/brya/sensors.c index 57d70471ba..d4fd905884 100644 --- a/board/brya/sensors.c +++ b/board/brya/sensors.c @@ -290,20 +290,20 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); /* * TODO(b/180681346): update for Alder Lake/brya * - * Tiger Lake specifies 100 C as maximum TDP temperature. THRMTRIP# occurs at + * Alder 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 * DDR temperature limit (85 C) */ static const struct ec_thermal_config thermal_cpu = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(70), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), + [EC_TEMP_THRESH_HIGH] = C_TO_K(85), + [EC_TEMP_THRESH_HALT] = C_TO_K(90), }, .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), + [EC_TEMP_THRESH_HIGH] = C_TO_K(80), }, .temp_fan_off = C_TO_K(35), - .temp_fan_max = C_TO_K(50), + .temp_fan_max = C_TO_K(60), }; /* @@ -321,14 +321,14 @@ static const struct ec_thermal_config thermal_cpu = { */ static const struct ec_thermal_config thermal_ambient = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), + [EC_TEMP_THRESH_HIGH] = C_TO_K(85), + [EC_TEMP_THRESH_HALT] = C_TO_K(90), }, .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), + [EC_TEMP_THRESH_HIGH] = C_TO_K(80), }, - .temp_fan_off = C_TO_K(40), - .temp_fan_max = C_TO_K(55), + .temp_fan_off = C_TO_K(35), + .temp_fan_max = C_TO_K(60), }; /* @@ -336,22 +336,22 @@ static const struct ec_thermal_config thermal_ambient = { * * Need to use the lower of the charger IC, PP3300 regulator, and the inductors * - * Charger max recommended temperature 100C, max absolute temperature 125C - * PP3300 regulator: operating range -40 C to 145 C + * Charger max recommended temperature 125C, max absolute temperature 150C + * PP3300 regulator: operating range -40 C to 125 C * * Inductors: limit of 125c * PCB: limit is 80c */ const static struct ec_thermal_config thermal_charger = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), + [EC_TEMP_THRESH_HIGH] = C_TO_K(105), + [EC_TEMP_THRESH_HALT] = C_TO_K(120), }, .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), + [EC_TEMP_THRESH_HIGH] = C_TO_K(90), }, - .temp_fan_off = C_TO_K(40), - .temp_fan_max = C_TO_K(55), + .temp_fan_off = C_TO_K(35), + .temp_fan_max = C_TO_K(65), }; /* @@ -359,14 +359,14 @@ const static struct ec_thermal_config thermal_charger = { */ static const struct ec_thermal_config thermal_wwan = { .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), + [EC_TEMP_THRESH_HIGH] = C_TO_K(130), + [EC_TEMP_THRESH_HALT] = C_TO_K(130), }, .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), + [EC_TEMP_THRESH_HIGH] = C_TO_K(100), }, - .temp_fan_off = C_TO_K(40), - .temp_fan_max = C_TO_K(55), + .temp_fan_off = C_TO_K(35), + .temp_fan_max = C_TO_K(60), }; struct ec_thermal_config thermal_params[] = { -- cgit v1.2.1