Set correct name for new TMP006 sensors

BUG=chrome-os-partner:11491
TEST=none

Change-Id: I00a59554fb5819c0942d917f8d558c1a00570a73
Reviewed-on: https://gerrit.chromium.org/gerrit/28251
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>

1 files changed, 24 insertions, 24 deletions

diff --git a/board/link/board_temp_sensor.c b/board/link/board_temp_sensor.c
index 2bd4d1d87c..9499ed70c0 100644
--- a/board/link/board_temp_sensor.c
+++ b/board/link/board_temp_sensor.c
@@ -13,23 +13,23 @@
 #include "tmp006.h"
 #include "util.h"
 
-#define TEMP_CPU_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_CHARGER_REG_ADDR ((0x43 << 1) | I2C_FLAG_BIG_ENDIAN)
-#define TEMP_U15_REG_ADDR ((0x47 << 1) | I2C_FLAG_BIG_ENDIAN)
-#define TEMP_U20_REG_ADDR ((0x46 << 1) | I2C_FLAG_BIG_ENDIAN)
-#define TEMP_U27_REG_ADDR ((0x44 << 1) | I2C_FLAG_BIG_ENDIAN)
-#define TEMP_U29_REG_ADDR ((0x42 << 1) | I2C_FLAG_BIG_ENDIAN)
+#define TEMP_CPU_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_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_HINGE_REG_ADDR	((0x44 << 1) | I2C_FLAG_BIG_ENDIAN)
+#define TEMP_AMBIENT_REG_ADDR	((0x42 << 1) | I2C_FLAG_BIG_ENDIAN)
 
 #define TEMP_CPU_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_CPU_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_CHARGER_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_CHARGER_REG_ADDR)
-#define TEMP_U15_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_U15_REG_ADDR)
-#define TEMP_U20_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_U20_REG_ADDR)
-#define TEMP_U27_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_U27_REG_ADDR)
-#define TEMP_U29_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_U29_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_HINGE_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_HINGE_REG_ADDR)
+#define TEMP_AMBIENT_ADDR TMP006_ADDR(I2C_PORT_THERMAL, TEMP_AMBIENT_REG_ADDR)
 
 /* Temperature sensors data. Must be in the same order as enum
  * temp_sensor_id.
@@ -62,21 +62,21 @@ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = {
 	 peci_temp_sensor_get_val, 0, 2},
 #endif
 #ifdef CONFIG_TMP006
-	{"I2C_U15-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_DCJack-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 8, 7},
-	{"I2C_U15-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_DCJack-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 9, 7},
-	{"I2C_U20-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_MiniDP-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 10, 7},
-	{"I2C_U20-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_MiniDP-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 11, 7},
-	{"I2C_U27-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_Hinge-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 12, 7},
-	{"I2C_U27-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_Hinge-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 13, 7},
-	{"I2C_U29-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_Ambient-Die", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 14, 7},
-	{"I2C_U29-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
+	{"I2C_Ambient-Object", TEMP_SENSOR_POWER_VS, TEMP_SENSOR_TYPE_IGNORED,
 	 tmp006_get_val, 15, 7},
 #endif
 };
@@ -87,8 +87,8 @@ const struct tmp006_t tmp006_sensors[TMP006_COUNT] = {
 	{"PCH", TEMP_PCH_ADDR, 14169},
 	{"DDR", TEMP_DDR_ADDR, 6400},
 	{"Charger", TEMP_CHARGER_ADDR, 10521},
-	{"U15", TEMP_U15_ADDR, 6400},
-	{"U20", TEMP_U20_ADDR, 6400},
-	{"U27", TEMP_U27_ADDR, 6400},
-	{"U29", TEMP_U29_ADDR, 6400},
+	{"DCJack", TEMP_DCJACK_ADDR, 6400},
+	{"MiniDP", TEMP_MINIDP_ADDR, 6400},
+	{"Hinge", TEMP_HINGE_ADDR, 6400},
+	{"Ambient", TEMP_AMBIENT_ADDR, 6400},
 };