From 37754f9b70a4300fe9d8e40ce6fb7bc6e57d7ec8 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Tue, 31 Jul 2012 10:03:59 +0800 Subject: Rename TMP006 sensors BUG=chrome-os-partner:12010 TEST=Build success Change-Id: I2557ec1568bc0b13a4dd25bbd85dffb9dccd6468 Reviewed-on: https://gerrit.chromium.org/gerrit/28764 Reviewed-by: Randall Spangler Commit-Ready: Vic Yang Tested-by: Vic Yang --- board/link/board_temp_sensor.c | 66 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/board/link/board_temp_sensor.c b/board/link/board_temp_sensor.c index 9499ed70c0..90b96c4ae3 100644 --- a/board/link/board_temp_sensor.c +++ b/board/link/board_temp_sensor.c @@ -13,44 +13,44 @@ #include "tmp006.h" #include "util.h" -#define TEMP_CPU_REG_ADDR ((0x40 << 1) | I2C_FLAG_BIG_ENDIAN) +#define TEMP_HEATPIPE_REG_ADDR ((0x40 << 1) | I2C_FLAG_BIG_ENDIAN) #define TEMP_PCH_REG_ADDR ((0x41 << 1) | I2C_FLAG_BIG_ENDIAN) -#define TEMP_DDR_REG_ADDR ((0x45 << 1) | I2C_FLAG_BIG_ENDIAN) +#define TEMP_MEMORY_REG_ADDR ((0x45 << 1) | I2C_FLAG_BIG_ENDIAN) #define TEMP_CHARGER_REG_ADDR ((0x43 << 1) | I2C_FLAG_BIG_ENDIAN) #define TEMP_DCJACK_REG_ADDR ((0x47 << 1) | I2C_FLAG_BIG_ENDIAN) -#define TEMP_MINIDP_REG_ADDR ((0x46 << 1) | I2C_FLAG_BIG_ENDIAN) +#define TEMP_USB_REG_ADDR ((0x46 << 1) | I2C_FLAG_BIG_ENDIAN) #define TEMP_HINGE_REG_ADDR ((0x44 << 1) | I2C_FLAG_BIG_ENDIAN) -#define TEMP_AMBIENT_REG_ADDR ((0x42 << 1) | I2C_FLAG_BIG_ENDIAN) +#define TEMP_SDCARD_REG_ADDR ((0x42 << 1) | I2C_FLAG_BIG_ENDIAN) -#define TEMP_CPU_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_CPU_REG_ADDR) +#define TEMP_HEATPIPE_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_HEATPIPE_REG_ADDR) #define TEMP_PCH_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_PCH_REG_ADDR) -#define TEMP_DDR_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_DDR_REG_ADDR) +#define TEMP_MEMORY_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_MEMORY_REG_ADDR) #define TEMP_CHARGER_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_CHARGER_REG_ADDR) #define TEMP_DCJACK_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_DCJACK_REG_ADDR) -#define TEMP_MINIDP_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_MINIDP_REG_ADDR) +#define TEMP_USB_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_USB_REG_ADDR) #define TEMP_HINGE_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_HINGE_REG_ADDR) -#define TEMP_AMBIENT_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_AMBIENT_REG_ADDR) +#define TEMP_SDCARD_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_SDCARD_REG_ADDR) /* Temperature sensors data. Must be in the same order as enum * temp_sensor_id. */ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { #ifdef CONFIG_TMP006 - {"I2C_CPU-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CPU, + {"I2C-Heat Pipe D-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 0, 7}, - {"I2C_CPU-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, - tmp006_get_val, 1, 7}, - {"I2C_PCH-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, + {"I2C-Heat Pipe D-Object", TEMP_SENSOR_POWER_VS, + TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 1, 7}, + {"I2C-PCH D-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 2, 7}, - {"I2C_PCH-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, + {"I2C-PCH D-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 3, 7}, - {"I2C_DDR-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, + {"I2C-Memory D-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 4, 7}, - {"I2C_DDR-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, + {"I2C-Memory D-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 5, 7}, - {"I2C_Charger-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, + {"I2C-Charger D-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 6, 7}, - {"I2C_Charger-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, + {"I2C-Charger D-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 7, 7}, #endif #ifdef CONFIG_TASK_TEMPSENSOR @@ -62,33 +62,33 @@ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { peci_temp_sensor_get_val, 0, 2}, #endif #ifdef CONFIG_TMP006 - {"I2C_DCJack-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-DCJack C-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 8, 7}, - {"I2C_DCJack-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-DCJack C-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 9, 7}, - {"I2C_MiniDP-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-USB C-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 10, 7}, - {"I2C_MiniDP-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-USB C-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 11, 7}, - {"I2C_Hinge-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-Hinge C-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 12, 7}, - {"I2C_Hinge-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-Hinge C-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 13, 7}, - {"I2C_Ambient-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-SDCard D-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 14, 7}, - {"I2C_Ambient-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, + {"I2C-SDCard D-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 15, 7}, #endif }; const struct tmp006_t tmp006_sensors[TMP006_COUNT] = { /* TODO: Calibrate sensitivity factors. See crosbug.com/p/9599 */ - {"CPU", TEMP_CPU_ADDR, 2771}, - {"PCH", TEMP_PCH_ADDR, 14169}, - {"DDR", TEMP_DDR_ADDR, 6400}, - {"Charger", TEMP_CHARGER_ADDR, 10521}, - {"DCJack", TEMP_DCJACK_ADDR, 6400}, - {"MiniDP", TEMP_MINIDP_ADDR, 6400}, - {"Hinge", TEMP_HINGE_ADDR, 6400}, - {"Ambient", TEMP_AMBIENT_ADDR, 6400}, + {"Heat pipe D", TEMP_HEATPIPE_ADDR, 2771}, + {"PCH D", TEMP_PCH_ADDR, 14169}, + {"Memory D", TEMP_MEMORY_ADDR, 6400}, + {"Charger D", TEMP_CHARGER_ADDR, 10521}, + {"DCJack C", TEMP_DCJACK_ADDR, 6400}, + {"USB C", TEMP_USB_ADDR, 6400}, + {"Hinge C", TEMP_HINGE_ADDR, 6400}, + {"SD Card D", TEMP_SDCARD_ADDR, 6400}, }; -- cgit v1.2.1