Use CONFIG_DPTF flag instead of THROTTLE_AP.

Signed-off-by: Ravi Chandra Sadineni <ravisadineni@chromium.org> BRANCH=none BUG=chromium:631848 TEST=make buildall -j CQ-DEPEND=CL:363008 Change-Id: I3c35f5ab2e3a1537ac6e8c750171d5c2b3a6570f Reviewed-on: https://chromium-review.googlesource.com/363583 Commit-Ready: David Hendricks <dhendrix@chromium.org> Tested-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: David Hendricks <dhendrix@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Duncan Laurie <dlaurie@google.com>
2025-12-28 02:35:28 +00:00 · 2016-07-26 18:04:09 -07:00
parent ea91c71c08
commit bcb0de22a4
17 changed files with 8 additions and 122 deletions
--- a/board/amenia/board.c
+++ b/board/amenia/board.c
@@ -227,19 +227,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor.  All temps are in degrees K.  Must be in
- * same order as enum temp_sensor_id.  To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	/* {Twarn, Thigh, Thalt}, fan_off, fan_max */
-	{{0, 0, 0}, 0, 0},	/* G782_Internal */
-	{{0, 0, 0}, 0, 0},	/* G782_Sensor_1 */
-	{{0, 0, 0}, 0, 0},	/* G782_Sensor_2 */
-	{{0, 0, 0}, 0, 0},	/* Battery */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 /* ALS instances. Must be in same order as enum als_id. */
 struct als_t als[] = {
 	{"ISL", isl29035_init, isl29035_read_lux, 5},
--- a/board/amenia/board.h
+++ b/board/amenia/board.h
@@ -120,7 +120,7 @@

 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_G782
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /* Optional feature - used by nuvoton */
 #define NPCX_I2C0_BUS2       0 /* 0:GPIOB4/B5 1:GPIOB2/B3 as I2C0 */
--- a/board/chell/board.c
+++ b/board/chell/board.c
@@ -223,20 +223,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor.  All temps are in degrees K.  Must be in
- * same order as enum temp_sensor_id.  To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	/* {Twarn, Thigh, Thalt}, fan_off, fan_max */
-	{{0, 0, 0}, 0, 0},	/* Battery */
-	{{0, 0, 0}, 0, 0},	/* Ambient */
-	{{0, 0, 0}, 0, 0},	/* Charger */
-	{{0, 0, 0}, 0, 0},	/* DRAM */
-	{{0, 0, 0}, 0, 0},	/* Wifi */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 static void board_pmic_init(void)
 {
 	/* DISCHGCNT3 - enable 100 ohm discharge on V1.00A */
--- a/board/chell/board.h
+++ b/board/chell/board.h
@@ -97,7 +97,7 @@
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_BD99992GW
 #define CONFIG_THERMISTOR_NCP15WB
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /*
 * Enable 1 slot of secure temporary storage to support
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -155,20 +155,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor. All temps are in degrees K. Must be in
- * same order as enum temp_sensor_id. To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-#ifdef CONFIG_TEMP_SENSOR_TMP432
-	{{0, 0, 0}, 0, 0}, /* TMP432_Internal */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_1 */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_2 */
-#endif
-	{{0, 0, 0}, 0, 0}, /* Battery Sensor */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 	{
 		.port_addr = 0, /* port idx */
--- a/board/elm/board.h
+++ b/board/elm/board.h
@@ -79,7 +79,7 @@
 #undef  CONFIG_UART_CONSOLE
 #define CONFIG_UART_CONSOLE 1
 #define CONFIG_TEMP_SENSOR
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /* Type-C */
 #define CONFIG_USBC_SS_MUX
--- a/board/glados/board.c
+++ b/board/glados/board.c
@@ -196,20 +196,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor.  All temps are in degrees K.  Must be in
- * same order as enum temp_sensor_id.  To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	/* {Twarn, Thigh, Thalt}, fan_off, fan_max */
-	{{0, 0, 0}, 0, 0},	/* Battery */
-	{{0, 0, 0}, 0, 0},	/* Ambient */
-	{{0, 0, 0}, 0, 0},	/* Charger */
-	{{0, 0, 0}, 0, 0},	/* DRAM */
-	{{0, 0, 0}, 0, 0},	/* Wifi */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 /* ALS instances. Must be in same order as enum als_id. */
 struct als_t als[] = {
 	{"TI", opt3001_init, opt3001_read_lux, 5},
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -99,7 +99,7 @@
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_BD99992GW
 #define CONFIG_THERMISTOR_NCP15WB
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /*
 * Enable 1 slot of secure temporary storage to support
--- a/board/lucid/board.c
+++ b/board/lucid/board.c
@@ -148,16 +148,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor.  All temps are in degrees K.  Must be in
- * same order as enum temp_sensor_id.  To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	/* {Twarn, Thigh, Thalt}, fan_off, fan_max */
-	{{0, 0, 0}, 0, 0},	/* Battery */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 /* Initialize board. */
 static void board_init(void)
 {
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -160,17 +160,6 @@ struct als_t als[] = {
 BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT);
 #endif

-/* Thermal limits for each temp sensor. All temps are in degrees K. Must be in
- * same order as enum temp_sensor_id. To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	{{0, 0, 0}, 0, 0}, /* TMP432_Internal */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_1 */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_2 */
-	{{0, 0, 0}, 0, 0}, /* Battery Sensor */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = {
 	{
 		.port_addr = 0x54 << 1,
--- a/board/oak/board.h
+++ b/board/oak/board.h
@@ -114,7 +114,7 @@
 #define CONFIG_UART_CONSOLE 1
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_TMP432
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /* UART DMA */
 #undef CONFIG_UART_TX_DMA
--- a/board/rambi/board.c
+++ b/board/rambi/board.c
@@ -103,16 +103,3 @@ const struct temp_sensor_t temp_sensors[] = {
 	{"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4},
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
-
-/* Thermal limits for each temp sensor. All temps are in degrees K. Must be in
- * same order as enum temp_sensor_id. To always ignore any temp, use 0.
- */
-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},
-	{{0, 0, 0}, 0, 0},
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -42,7 +42,7 @@
 #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_TMP432
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF
 #define CONFIG_USB_PORT_POWER_IN_S3
 #define CONFIG_USB_PORT_POWER_SMART
 #define CONFIG_USB_PORT_POWER_SMART_SIMPLE
--- a/board/strago/board.c
+++ b/board/strago/board.c
@@ -162,17 +162,6 @@ struct als_t als[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT);

-/* Thermal limits for each temp sensor. All temps are in degrees K. Must be in
- * same order as enum temp_sensor_id. To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	{{0, 0, 0}, 0, 0}, /* TMP432_Internal */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_1 */
-	{{0, 0, 0}, 0, 0}, /* TMP432_Sensor_2 */
-	{{0, 0, 0}, 0, 0}, /* Battery Sensor */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 const struct button_config buttons[] = {
 	{"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN,
 		30 * MSEC, 0},
--- a/board/strago/board.h
+++ b/board/strago/board.h
@@ -60,7 +60,7 @@

 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_TMP432
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 #define CONFIG_PMIC

--- a/board/wheatley/board.c
+++ b/board/wheatley/board.c
@@ -190,20 +190,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);

-/*
- * Thermal limits for each temp sensor.  All temps are in degrees K.  Must be in
- * same order as enum temp_sensor_id.  To always ignore any temp, use 0.
- */
-struct ec_thermal_config thermal_params[] = {
-	/* {Twarn, Thigh, Thalt}, fan_off, fan_max */
-	{{0, 0, 0}, 0, 0},	/* Battery */
-	{{0, 0, 0}, 0, 0},	/* Ambient */
-	{{0, 0, 0}, 0, 0},	/* Charger */
-	{{0, 0, 0}, 0, 0},	/* DRAM */
-	{{0, 0, 0}, 0, 0},	/* Wifi */
-};
-BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
-
 /* ALS instances. Must be in same order as enum als_id. */
 struct als_t als[] = {
 	{"TI", opt3001_init, opt3001_read_lux, 5},
--- a/board/wheatley/board.h
+++ b/board/wheatley/board.h
@@ -96,7 +96,7 @@
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_TEMP_SENSOR_BD99992GW
 #define CONFIG_THERMISTOR_NCP15WB
-#define CONFIG_THROTTLE_AP
+#define CONFIG_DPTF

 /* Optional feature - used by nuvoton */
 #define NPCX_I2C0_BUS2       0 /* 0:GPIOB4/B5 1:GPIOB2/B3 as I2C0 */