From 48f662d5ba1928c166fc4befe58165a471ebcc60 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 19 Sep 2018 11:53:59 -0700 Subject: Fizz: Remove remote temp sensor 2 Fizz has been shipped with TMP431, which has only one remote sensor. This patch removes the one which doesn't exist on the boards. Signed-off-by: Daisuke Nojiri BUG=chromium:880705 BRANCH=none TEST=Verify local and remote sensor report expected temperatures. Verify the fan spins as expected. > temps TMP431_Internal : 304 K = 31 C 37% TMP431_Sensor_1 : 301 K = 28 C $ ectool temps all 0: 304 K 1: 301 K Change-Id: I2346444f1331faaf32b407a18ba96302b7a166e6 Reviewed-on: https://chromium-review.googlesource.com/1234735 Commit-Queue: Daisuke Nojiri Tested-by: Daisuke Nojiri Reviewed-by: Randall Spangler (cherry picked from commit d8de510aa7bdfb7c43621c7d48b7ca3ab372e3c7) Reviewed-on: https://chromium-review.googlesource.com/1234746 Commit-Ready: Daisuke Nojiri Reviewed-by: Daisuke Nojiri --- board/fizz/board.c | 13 ++++++------- board/fizz/board.h | 1 - 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/board/fizz/board.c b/board/fizz/board.c index b3617155fa..a2b3aace39 100644 --- a/board/fizz/board.c +++ b/board/fizz/board.c @@ -274,17 +274,17 @@ uint16_t tcpc_get_alert_status(void) } /* + * TMP431 has one local and one remote sensor. + * * Temperature sensors data; must be in same order as enum temp_sensor_id. * Sensor index and name must match those present in coreboot: * src/mainboard/google/${board}/acpi/dptf.asl */ const struct temp_sensor_t temp_sensors[] = { - {"TMP432_Internal", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, + {"TMP431_Internal", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_LOCAL, 4}, - {"TMP432_Sensor_1", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, + {"TMP431_Sensor_1", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_REMOTE1, 4}, - {"TMP432_Sensor_2", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, - TMP432_IDX_REMOTE2, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -298,9 +298,8 @@ struct ec_thermal_config thermal_params[] = { * fan_off, fan_max */ {{0, C_TO_K(80), C_TO_K(81)}, {0, C_TO_K(78), 0}, - C_TO_K(4), C_TO_K(76)}, /* TMP432_Internal */ - {{0, 0, 0}, {0, 0, 0}, 0, 0}, /* TMP432_Sensor_1 */ - {{0, 0, 0}, {0, 0, 0}, 0, 0}, /* TMP432_Sensor_2 */ + C_TO_K(4), C_TO_K(76)}, /* TMP431_Internal */ + {{0, 0, 0}, {0, 0, 0}, 0, 0}, /* TMP431_Sensor_1 */ }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); diff --git a/board/fizz/board.h b/board/fizz/board.h index fd6646fec1..e01676cd05 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -204,7 +204,6 @@ enum power_signal { enum temp_sensor_id { TEMP_SENSOR_CHARGER, /* BD99992GW SYSTHERM1 */ TEMP_SENSOR_DRAM, /* BD99992GW SYSTHERM2 */ - TEMP_SENSOR_EMMC, /* BD99992GW SYSTHERM3 */ TEMP_SENSOR_COUNT }; -- cgit v1.2.1