diff options
| author | ChromeOS Developer <dparker@chromium.org> | 2013-11-09 16:49:13 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2013-12-07 00:57:28 +0000 |
| commit | 53d219f5552f595dde8e885a7ec41ee81e9d56af (patch) | |
| tree | 69bbdf87feacb7a1012232ff5b8e85e391c871d0 | |
| parent | d53fe7b79b18441ee88058c09010be44c7b43761 (diff) | |
| download | chrome-ec-53d219f5552f595dde8e885a7ec41ee81e9d56af.tar.gz | |
Rambi: Switch from g781 to tmp432 temperature sensor
BUG=chrome-os-partner:23985
BRANCH=rambi
TEST=Run 'tmp432' and 'temps' command on EC console.
Signed-off-by: Dave Parker <dparker@chromium.org>
Change-Id: I0f246c82ea5f9d5d153b7dc57f7371ea931d6189
Reviewed-on: https://chromium-review.googlesource.com/178689
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | board/rambi/board.c | 13 | ||||
| -rw-r--r-- | board/rambi/board.h | 10 |
2 files changed, 13 insertions, 10 deletions
diff --git a/board/rambi/board.c b/board/rambi/board.c index 1d075eca56..f7912767b4 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -9,7 +9,7 @@ #include "backlight.h" #include "chipset_x86_common.h" #include "common.h" -#include "driver/temp_sensor/g781.h" +#include "driver/temp_sensor/tmp432.h" #include "extpower.h" #include "gpio.h" #include "host_command.h" @@ -178,10 +178,12 @@ const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); /* Temperature sensors data; must be in same order as enum temp_sensor_id. */ const struct temp_sensor_t temp_sensors[] = { {"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4}, - {"G781Internal", TEMP_SENSOR_TYPE_BOARD, g781_get_val, - G781_IDX_INTERNAL, 4}, - {"G781External", TEMP_SENSOR_TYPE_BOARD, g781_get_val, - G781_IDX_EXTERNAL, 4}, + {"TMP432_Internal", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, + TMP432_IDX_LOCAL, 4}, + {"TMP432_Power_top", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, + TMP432_IDX_REMOTE1, 4}, + {"TMP432_CPU_bottom", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, + TMP432_IDX_REMOTE2, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); @@ -192,5 +194,6 @@ struct ec_thermal_config thermal_params[] = { {{0, 0, 0}, 0, 0}, {{0, 0, 0}, 0, 0}, {{0, 0, 0}, 0, 0}, + {{0, 0, 0}, 0, 0}, }; BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT); diff --git a/board/rambi/board.h b/board/rambi/board.h index 8d4731db70..3cf17b4580 100644 --- a/board/rambi/board.h +++ b/board/rambi/board.h @@ -32,8 +32,7 @@ #define CONFIG_PWM #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L #define CONFIG_TEMP_SENSOR -#define CONFIG_TEMP_SENSOR_G781 -#define CONFIG_TEMP_SENSOR_POWER_GPIO GPIO_PP3300_DX_EN +#define CONFIG_TEMP_SENSOR_TMP432 #define CONFIG_USB_PORT_POWER_SMART #define CONFIG_WIRELESS @@ -163,9 +162,10 @@ enum temp_sensor_id { /* EC internal temperature sensor */ TEMP_SENSOR_EC_INTERNAL = 0, - /* G781 internal and external sensors */ - TEMP_SENSOR_I2C_G781_INTERNAL, - TEMP_SENSOR_I2C_G781_EXTERNAL, + /* TMP432 local and remote sensors */ + TEMP_SENSOR_I2C_TMP432_LOCAL, + TEMP_SENSOR_I2C_TMP432_REMOTE1, + TEMP_SENSOR_I2C_TMP432_REMOTE2, TEMP_SENSOR_COUNT }; |