x86: generalize power state machine for all platforms (2/2)

Rename x86_* to power_signal_* and X86_* to POWER_*.

BUG=chrome-os-partner:24832
BRANCH=link,falco,samus,rambi,peppy,squawks,snow,spring,nyan
TEST=make -j buildall run_tests

Change-Id: Ifaa06391da5a483851ff56eca91fbf6d038dff0a
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181719
Reviewed-by: Randall Spangler <rspangler@chromium.org>

17 files changed, 172 insertions, 154 deletions

diff --git a/board/falco/board.c b/board/falco/board.c
index b343261ebc..54143cc6ce 100644
--- a/board/falco/board.c
+++ b/board/falco/board.c
@@ -8,7 +8,6 @@
 #include "adc_chip.h"
 #include "backlight.h"
 #include "board.h"
-#include "power.h"
 #include "common.h"
 #include "driver/charger/bq24738.h"
 #include "driver/temp_sensor/g781.h"
@@ -21,6 +20,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "registers.h"
 #include "switch.h"
@@ -43,21 +43,21 @@ const struct gpio_info gpio_list[] = {
 	{"PCH_BKLTEN",           LM4_GPIO_M, (1<<3), GPIO_INT_BOTH,
 	 backlight_interrupt},
 	{"PCH_SLP_S0_L",         LM4_GPIO_G, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S5_L",         LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_SUS_L",        LM4_GPIO_G, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1050_PGOOD",         LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1350_PGOOD",         LM4_GPIO_H, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP5000_PGOOD",         LM4_GPIO_N, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_EDP_VDD_EN",       LM4_GPIO_J, (1<<1), GPIO_INT_BOTH,
 	 lcdvcc_interrupt},
 	{"RECOVERY_L",           LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
@@ -151,8 +151,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP5000_PGOOD,  1, "PGOOD_PP5000"},
 	{GPIO_PP1350_PGOOD,  1, "PGOOD_PP1350"},
 	{GPIO_PP1050_PGOOD,  1, "PGOOD_PP1050"},
@@ -162,7 +162,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SLP_S5_L,  1, "SLP_S5#_DEASSERTED"},
 	{GPIO_PCH_SLP_SUS_L, 1, "SLP_SUS#_DEASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/falco/board.h b/board/falco/board.h
index bf25f8263b..347da3b0e2 100644
--- a/board/falco/board.h
+++ b/board/falco/board.h
@@ -133,8 +133,8 @@ enum gpio_signal {
 	GPIO_COUNT
 };
 
-/* x86 signal definitions */
-enum x86_signal {
+/* power signal definitions */
+enum power_signal {
 	X86_PGOOD_PP5000 = 0,
 	X86_PGOOD_PP1350,
 	X86_PGOOD_PP1050,
@@ -145,7 +145,7 @@ enum x86_signal {
 	X86_SLP_SUS_DEASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 /* Charger module */
diff --git a/board/link/board.c b/board/link/board.c
index 95694b25ea..9faadcbfce 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -8,7 +8,6 @@
 #include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
-#include "power.h"
 #include "common.h"
 #include "driver/temp_sensor/tmp006.h"
 #include "extpower.h"
@@ -18,6 +17,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "pwm.h"
 #include "pwm_chip.h"
@@ -47,35 +47,35 @@ const struct gpio_info gpio_list[] = {
 	{"PCH_BKLTEN",           LM4_GPIO_J, (1<<3), GPIO_INT_BOTH,
 	 backlight_interrupt},
 	{"PCH_SLP_A_L",          LM4_GPIO_G, (1<<5), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_ME_CSW_DEV_L", LM4_GPIO_G, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_J, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S4_L",         LM4_GPIO_J, (1<<1), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S5_L",         LM4_GPIO_J, (1<<2), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_SUS_L",        LM4_GPIO_G, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SUSWARN_L",        LM4_GPIO_G, (1<<2), GPIO_INT_BOTH,
 	 power_interrupt},
 	{"PGOOD_1_5V_DDR",       LM4_GPIO_K, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_1_5V_PCH",       LM4_GPIO_K, (1<<1), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_1_8VS",          LM4_GPIO_K, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_5VALW",          LM4_GPIO_H, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_CPU_CORE",       LM4_GPIO_M, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_VCCP",           LM4_GPIO_K, (1<<2), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_VCCSA",          LM4_GPIO_H, (1<<1), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PGOOD_VGFX_CORE",      LM4_GPIO_D, (1<<2), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"RECOVERY_L",           LM4_GPIO_H, (1<<7), GPIO_INT_BOTH,
 	 switch_interrupt},
 	{"USB1_STATUS_L",        LM4_GPIO_E, (1<<7), GPIO_INPUT, NULL},
@@ -146,8 +146,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PGOOD_5VALW,		1, "PGOOD_5VALW"},
 	{GPIO_PGOOD_1_5V_DDR,		1, "PGOOD_1_5V_DDR"},
 	{GPIO_PGOOD_1_5V_PCH,		1, "PGOOD_1_5V_PCH"},
@@ -163,7 +163,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SLP_SUS_L,		1, "SLP_SUS#_DEASSERTED"},
 	{GPIO_PCH_SLP_ME_CSW_DEV_L,	1, "SLP_ME#_DEASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/link/board.h b/board/link/board.h
index 64aee14198..743f77a72c 100644
--- a/board/link/board.h
+++ b/board/link/board.h
@@ -174,7 +174,7 @@ enum x86_signal {
 	X86_SLP_ME_DEASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 enum temp_sensor_id {
diff --git a/board/nyan/board.c b/board/nyan/board.c
index 060b9a40e1..0daa122fe9 100644
--- a/board/nyan/board.c
+++ b/board/nyan/board.c
@@ -14,6 +14,7 @@
 #include "lid_switch.h"
 #include "pmu_tpschrome.h"
 #include "power_button.h"
+#include "power.h"
 #include "pwm.h"
 #include "pwm_chip.h"
 #include "registers.h"
@@ -30,9 +31,11 @@ const struct gpio_info gpio_list[] = {
 	/* Inputs with interrupt handlers are first for efficiency */
 	{"POWER_BUTTON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH,
 	 power_button_interrupt},
-	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH, power_interrupt},
+	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt},
-	{"SUSPEND_L",   GPIO_C, (1<<7),  GPIO_KB_INPUT, power_interrupt},
+	{"SUSPEND_L",   GPIO_C, (1<<7),  GPIO_KB_INPUT,
+	 power_signal_interrupt},
 	{"SPI1_NSS",    GPIO_A, (1<<4),  GPIO_INT_BOTH | GPIO_PULL_UP,
 	 spi_event},
 	{"AC_PRESENT",  GPIO_A, (1<<0),  GPIO_INT_BOTH, extpower_interrupt},
diff --git a/board/peppy/board.c b/board/peppy/board.c
index 5c85ead4d4..72e98278bd 100644
--- a/board/peppy/board.c
+++ b/board/peppy/board.c
@@ -8,7 +8,6 @@
 #include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
-#include "power.h"
 #include "common.h"
 #include "driver/temp_sensor/g781.h"
 #include "extpower.h"
@@ -20,6 +19,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "registers.h"
 #include "switch.h"
@@ -42,21 +42,21 @@ const struct gpio_info gpio_list[] = {
 	{"PCH_BKLTEN",           LM4_GPIO_M, (1<<3), GPIO_INT_BOTH,
 	 backlight_interrupt},
 	{"PCH_SLP_S0_L",         LM4_GPIO_G, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S5_L",         LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_SUS_L",        LM4_GPIO_G, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1050_PGOOD",         LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1350_PGOOD",         LM4_GPIO_H, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP5000_PGOOD",         LM4_GPIO_N, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_EDP_VDD_EN",       LM4_GPIO_J, (1<<1), GPIO_INT_BOTH,
 	 power_interrupt},
 	{"RECOVERY_L",           LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
@@ -149,8 +149,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP5000_PGOOD,  1, "PGOOD_PP5000"},
 	{GPIO_PP1350_PGOOD,  1, "PGOOD_PP1350"},
 	{GPIO_PP1050_PGOOD,  1, "PGOOD_PP1050"},
@@ -160,7 +160,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SLP_S5_L,  1, "SLP_S5#_DEASSERTED"},
 	{GPIO_PCH_SLP_SUS_L, 1, "SLP_SUS#_DEASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/peppy/board.h b/board/peppy/board.h
index c01d218313..c4ceaf93ee 100644
--- a/board/peppy/board.h
+++ b/board/peppy/board.h
@@ -135,8 +135,8 @@ enum gpio_signal {
 	GPIO_COUNT
 };
 
-/* x86 signal definitions */
-enum x86_signal {
+/* power signal definitions */
+enum power_signal {
 	X86_PGOOD_PP5000 = 0,
 	X86_PGOOD_PP1350,
 	X86_PGOOD_PP1050,
@@ -147,7 +147,7 @@ enum x86_signal {
 	X86_SLP_SUS_DEASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 /* Charger module */
diff --git a/board/pit/board.c b/board/pit/board.c
index 414986a94b..afd8112f94 100644
--- a/board/pit/board.c
+++ b/board/pit/board.c
@@ -14,6 +14,7 @@
 #include "keyboard_raw.h"
 #include "lid_switch.h"
 #include "pmu_tpschrome.h"
+#include "power.h"
 #include "pwm.h"
 #include "pwm_chip.h"
 #include "registers.h"
@@ -28,12 +29,16 @@
 /* GPIO signal list.  Must match order from enum gpio_signal. */
 const struct gpio_info gpio_list[] = {
 	/* Inputs with interrupt handlers are first for efficiency */
-	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH, power_interrupt},
-	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH, power_interrupt},
-	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_RISING, power_interrupt},
+	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_RISING,
+	 power_signal_interrupt},
 	{"CHARGER_INT_L", GPIO_C, (1<<6),  GPIO_INT_FALLING, pmu_irq_handler},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt},
-	{"SUSPEND_L",   GPIO_C, (1<<7),  GPIO_INT_BOTH, power_interrupt},
+	{"SUSPEND_L",   GPIO_C, (1<<7),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
 	{"SPI1_NSS",    GPIO_A, (1<<4),  GPIO_INT_BOTH | GPIO_PULL_UP,
 	 spi_event},
 	{"AC_PRESENT",  GPIO_A, (1<<0),  GPIO_INT_BOTH, extpower_interrupt},
diff --git a/board/rambi/board.c b/board/rambi/board.c
index bbd9f46120..2ad37debdf 100644
--- a/board/rambi/board.c
+++ b/board/rambi/board.c
@@ -7,7 +7,6 @@
 #include "adc.h"
 #include "adc_chip.h"
 #include "backlight.h"
-#include "power.h"
 #include "common.h"
 #include "driver/temp_sensor/tmp432.h"
 #include "extpower.h"
@@ -18,6 +17,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "pwm.h"
 #include "pwm_chip.h"
@@ -41,20 +41,20 @@ const struct gpio_info gpio_list[] = {
 	 extpower_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP |
 							GPIO_PULL_UP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S4_L",         LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP |
 							GPIO_PULL_UP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1050_PGOOD",         LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP3300_PCH_PGOOD",     LM4_GPIO_C, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP5000_PGOOD",         LM4_GPIO_N, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"S5_PGOOD",             LM4_GPIO_G, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"WP_L",                 LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
 	 switch_interrupt},
 	{"JTAG_TCK",             LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
@@ -124,8 +124,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP1050_PGOOD,      1, "PGOOD_PP1050"},
 	{GPIO_PP3300_PCH_PGOOD,  1, "PGOOD_PP3300_PCH"},
 	{GPIO_PP5000_PGOOD,      1, "PGOOD_PP5000"},
@@ -138,7 +138,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SUS_STAT_L,    0, "SUS_STAT#_ASSERTED"},
 	{GPIO_PCH_SUSPWRDNACK,   1, "SUSPWRDNACK_ASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/rambi/board.h b/board/rambi/board.h
index 71feaa2c6b..1cde39f89b 100644
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -128,8 +128,8 @@ enum gpio_signal {
 	GPIO_COUNT
 };
 
-/* x86 signal definitions */
-enum x86_signal {
+/* power signal definitions */
+enum power_signal {
 	X86_PGOOD_PP1050 = 0,
 	X86_PGOOD_PP3300_PCH,
 	X86_PGOOD_PP5000,
@@ -143,7 +143,7 @@ enum x86_signal {
 	X86_SUSPWRDNACK_ASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 enum adc_channel {
diff --git a/board/samus/board.c b/board/samus/board.c
index 96139a5b0c..3ae8e9d590 100644
--- a/board/samus/board.c
+++ b/board/samus/board.c
@@ -8,7 +8,6 @@
 #include "adc.h"
 #include "adc_chip.h"
 #include "backlight.h"
-#include "power.h"
 #include "common.h"
 #include "driver/temp_sensor/tmp006.h"
 #include "driver/als_isl29035.h"
@@ -20,6 +19,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "pwm.h"
 #include "pwm_chip.h"
@@ -41,23 +41,23 @@ const struct gpio_info gpio_list[] = {
 	{"AC_PRESENT",           LM4_GPIO_H, (1<<3), GPIO_INT_BOTH,
 	 extpower_interrupt},
 	{"PCH_SLP_S0_L",         LM4_GPIO_G, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_G, (1<<7), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S5_L",         LM4_GPIO_H, (1<<1), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_SUS_L",        LM4_GPIO_G, (1<<3), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SUSWARN_L",        LM4_GPIO_G, (1<<2), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1050_PGOOD",         LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1200_PGOOD",         LM4_GPIO_H, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1800_PGOOD",         LM4_GPIO_L, (1<<7), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"RECOVERY_L",           LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
 	 switch_interrupt},
 	{"WP_L",                 LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
@@ -150,8 +150,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP1050_PGOOD,  1, "PGOOD_PP1050"},
 	{GPIO_PP1200_PGOOD,  1, "PGOOD_PP1200"},
 	{GPIO_PP1800_PGOOD,  1, "PGOOD_PP1800"},
@@ -162,7 +162,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SLP_SUS_L, 1, "SLP_SUS_DEASSERTED"},
 	{GPIO_PCH_SUSWARN_L, 1, "SUSWARN_DEASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/samus/board.h b/board/samus/board.h
index e295282d7c..fac709c313 100644
--- a/board/samus/board.h
+++ b/board/samus/board.h
@@ -168,7 +168,7 @@ enum x86_signal {
 	X86_SUSWARN_DEASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 enum adc_channel {
diff --git a/board/samus/power_sequence.c b/board/samus/power_sequence.c
index efd367ccb4..74efef873e 100644
--- a/board/samus/power_sequence.c
+++ b/board/samus/power_sequence.c
@@ -6,13 +6,13 @@
 /* X86 chipset power control module for Chrome EC */
 
 #include "chipset.h"
-#include "power.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
 #include "lid_switch.h"
+#include "power.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
@@ -25,15 +25,15 @@
 #define CPRINTF(format, args...) cprintf(CC_CHIPSET, format, ## args)
 
 /* Input state flags */
-#define IN_PGOOD_PP1050           X86_SIGNAL_MASK(X86_PGOOD_PP1050)
-#define IN_PGOOD_PP1200           X86_SIGNAL_MASK(X86_PGOOD_PP1200)
-#define IN_PGOOD_PP1800           X86_SIGNAL_MASK(X86_PGOOD_PP1800)
-#define IN_PGOOD_VCORE            X86_SIGNAL_MASK(X86_PGOOD_VCORE)
+#define IN_PGOOD_PP1050           POWER_SIGNAL_MASK(X86_PGOOD_PP1050)
+#define IN_PGOOD_PP1200           POWER_SIGNAL_MASK(X86_PGOOD_PP1200)
+#define IN_PGOOD_PP1800           POWER_SIGNAL_MASK(X86_PGOOD_PP1800)
+#define IN_PGOOD_VCORE            POWER_SIGNAL_MASK(X86_PGOOD_VCORE)
 
-#define IN_PCH_SLP_S0_DEASSERTED  X86_SIGNAL_MASK(X86_SLP_S0_DEASSERTED)
-#define IN_PCH_SLP_S3_DEASSERTED  X86_SIGNAL_MASK(X86_SLP_S3_DEASSERTED)
-#define IN_PCH_SLP_S5_DEASSERTED  X86_SIGNAL_MASK(X86_SLP_S5_DEASSERTED)
-#define IN_PCH_SLP_SUS_DEASSERTED X86_SIGNAL_MASK(X86_SLP_SUS_DEASSERTED)
+#define IN_PCH_SLP_S0_DEASSERTED  POWER_SIGNAL_MASK(X86_SLP_S0_DEASSERTED)
+#define IN_PCH_SLP_S3_DEASSERTED  POWER_SIGNAL_MASK(X86_SLP_S3_DEASSERTED)
+#define IN_PCH_SLP_S5_DEASSERTED  POWER_SIGNAL_MASK(X86_SLP_S5_DEASSERTED)
+#define IN_PCH_SLP_SUS_DEASSERTED POWER_SIGNAL_MASK(X86_SLP_SUS_DEASSERTED)
 
 
 /* All non-core power rails */
@@ -66,7 +66,7 @@ void chipset_force_shutdown(void)
 	CPRINTF("[%T %s()]\n", __func__);
 
 	/*
-	 * Force x86 off. This condition will reset once the state machine
+	 * Force off. This condition will reset once the state machine
 	 * transitions to G3.
 	 */
 	gpio_set_level(GPIO_PCH_DPWROK, 0);
@@ -115,7 +115,7 @@ void chipset_throttle_cpu(int throttle)
 		gpio_set_level(GPIO_CPU_PROCHOT, throttle);
 }
 
-enum x86_state x86_chipset_init(void)
+enum power_state power_chipset_init(void)
 {
 	/*
 	 * If we're switching between images without rebooting, see if the x86
@@ -123,12 +123,12 @@ enum x86_state x86_chipset_init(void)
 	 * through G3.
 	 */
 	if (system_jumped_to_this_image()) {
-		if ((x86_get_signals() & IN_ALL_S0) == IN_ALL_S0) {
-			CPRINTF("[%T x86 already in S0]\n");
-			return X86_S0;
+		if ((power_get_signals() & IN_ALL_S0) == IN_ALL_S0) {
+			CPRINTF("[%T already in S0]\n");
+			return POWER_S0;
 		} else {
 			/* Force all signals to their G3 states */
-			CPRINTF("[%T x86 forcing G3]\n");
+			CPRINTF("[%T forcing G3]\n");
 			gpio_set_level(GPIO_PCH_PWROK, 0);
 			gpio_set_level(GPIO_SYS_PWROK, 0);
 			gpio_set_level(GPIO_PP1050_EN, 0);
@@ -143,22 +143,22 @@ enum x86_state x86_chipset_init(void)
 		}
 	}
 
-	return X86_G3;
+	return POWER_G3;
 }
 
-enum x86_state x86_handle_state(enum x86_state state)
+enum power_state power_handle_state(enum power_state state)
 {
 	switch (state) {
-	case X86_G3:
+	case POWER_G3:
 		break;
 
-	case X86_S5:
+	case POWER_S5:
 		if (gpio_get_level(GPIO_PCH_SLP_S5_L) == 1)
-			return X86_S5S3; /* Power up to next state */
+			return POWER_S5S3; /* Power up to next state */
 
 		break;
 
-	case X86_S3:
+	case POWER_S3:
 		/*
 		 * If lid is closed; hold touchscreen in reset to cut
 		 * power usage.  If lid is open, take touchscreen out
@@ -167,31 +167,31 @@ enum x86_state x86_handle_state(enum x86_state state)
 		gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, lid_is_open());
 
 		/* Check for state transitions */
-		if (!x86_has_signals(IN_PGOOD_S3)) {
+		if (!power_has_signals(IN_PGOOD_S3)) {
 			/* Required rail went away */
 			chipset_force_shutdown();
-			return X86_S3S5;
+			return POWER_S3S5;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S3_L) == 1) {
 			/* Power up to next state */
-			return X86_S3S0;
+			return POWER_S3S0;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S5_L) == 0) {
 			/* Power down to next state */
-			return X86_S3S5;
+			return POWER_S3S5;
 		}
 		break;
 
-	case X86_S0:
-		if (!x86_has_signals(IN_PGOOD_S0)) {
+	case POWER_S0:
+		if (!power_has_signals(IN_PGOOD_S0)) {
 			/* Required rail went away */
 			chipset_force_shutdown();
-			return X86_S0S3;
+			return POWER_S0S3;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S3_L) == 0) {
 			/* Power down to next state */
-			return X86_S0S3;
+			return POWER_S0S3;
 		}
 		break;
 
-	case X86_G3S5:
+	case POWER_G3S5:
 		/* Enable 3.3V DSW */
 		gpio_set_level(GPIO_PP3300_DSW_EN, 1);
 
@@ -207,11 +207,11 @@ enum x86_state x86_handle_state(enum x86_state state)
 
 		/* Wait for PP1050/PP1200 PGOOD to go LOW to
 		 * indicate that PP5000 is stable */
-		while ((x86_get_signals() & IN_PGOOD_PP5000) != 0) {
+		while ((power_get_signals() & IN_PGOOD_PP5000) != 0) {
 			if (task_wait_event(SECOND) == TASK_EVENT_TIMER) {
 				CPRINTF("[%T timeout waiting for PP5000\n");
 				chipset_force_shutdown();
-				return X86_G3;
+				return POWER_G3;
 			}
 		}
 
@@ -225,10 +225,10 @@ enum x86_state x86_handle_state(enum x86_state state)
 		gpio_set_level(GPIO_PP1050_EN, 1);
 
 		/* Wait for 1.05V to come up and CPU to notice */
-		if (x86_wait_signals(IN_PGOOD_PP1050 |
+		if (power_wait_signals(IN_PGOOD_PP1050 |
 				     IN_PCH_SLP_SUS_DEASSERTED)) {
 			chipset_force_shutdown();
-			return X86_G3;
+			return POWER_G3;
 		}
 
 		/* Wait 5ms for SUSCLK to stabilize */
@@ -236,15 +236,15 @@ enum x86_state x86_handle_state(enum x86_state state)
 
 		/* Call hook to indicate out of G3 state */
 		hook_notify(HOOK_CHIPSET_PRE_INIT);
-		return X86_S5;
+		return POWER_S5;
 
-	case X86_S5S3:
+	case POWER_S5S3:
 		/* Turn on power to RAM */
 		gpio_set_level(GPIO_PP1800_EN, 1);
 		gpio_set_level(GPIO_PP1200_EN, 1);
-		if (x86_wait_signals(IN_PGOOD_S3)) {
+		if (power_wait_signals(IN_PGOOD_S3)) {
 			chipset_force_shutdown();
-			return X86_S5;
+			return POWER_S5;
 		}
 
 		/*
@@ -265,9 +265,9 @@ enum x86_state x86_handle_state(enum x86_state state)
 
 		/* Call hooks now that rails are up */
 		hook_notify(HOOK_CHIPSET_STARTUP);
-		return X86_S3;
+		return POWER_S3;
 
-	case X86_S3S0:
+	case POWER_S3S0:
 		/* Wait 20ms before allowing VCCST_PGOOD to rise. */
 		msleep(20);
 
@@ -282,10 +282,10 @@ enum x86_state x86_handle_state(enum x86_state state)
 		gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 1);
 
 		/* Wait for non-core power rails good */
-		if (x86_wait_signals(IN_PGOOD_S0)) {
+		if (power_wait_signals(IN_PGOOD_S0)) {
 			chipset_force_shutdown();
 			wireless_enable(0);
-			return X86_S3;
+			return POWER_S3;
 		}
 
 		/* Call hooks now that rails are up */
@@ -303,9 +303,9 @@ enum x86_state x86_handle_state(enum x86_state state)
 		/* Set PCH_PWROK */
 		gpio_set_level(GPIO_PCH_PWROK, 1);
 		gpio_set_level(GPIO_SYS_PWROK, 1);
-		return X86_S0;
+		return POWER_S0;
 
-	case X86_S0S3:
+	case POWER_S0S3:
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SUSPEND);
 
@@ -326,9 +326,9 @@ enum x86_state x86_handle_state(enum x86_state state)
 		 */
 		gpio_set_level(GPIO_CPU_PROCHOT, 0);
 
-		return X86_S3;
+		return POWER_S3;
 
-	case X86_S3S5:
+	case POWER_S3S5:
 		/* Call hooks before we remove power rails */
 		hook_notify(HOOK_CHIPSET_SHUTDOWN);
 
@@ -356,9 +356,9 @@ enum x86_state x86_handle_state(enum x86_state state)
 		gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0);
 		gpio_set_level(GPIO_LIGHTBAR_RESET_L, 0);
 
-		return pause_in_s5 ? X86_S5 : X86_S5G3;
+		return pause_in_s5 ? POWER_S5 : POWER_S5G3;
 
-	case X86_S5G3:
+	case POWER_S5G3:
 		/* Deassert DPWROK */
 		gpio_set_level(GPIO_PCH_DPWROK, 0);
 
@@ -368,7 +368,7 @@ enum x86_state x86_handle_state(enum x86_state state)
 		gpio_set_level(GPIO_PP5000_EN, 0);
 		/* Disable 3.3V DSW */
 		gpio_set_level(GPIO_PP3300_DSW_EN, 0);
-		return X86_G3;
+		return POWER_G3;
 	}
 
 	return state;
diff --git a/board/snow/board.c b/board/snow/board.c
index 7f2b6a44a1..bf89ebc467 100644
--- a/board/snow/board.c
+++ b/board/snow/board.c
@@ -15,6 +15,7 @@
 #include "keyboard_raw.h"
 #include "lid_switch.h"
 #include "pmu_tpschrome.h"
+#include "power.h"
 #include "power_led.h"
 #include "pwm.h"
 #include "pwm_chip.h"
@@ -33,12 +34,16 @@
 /* GPIO signal list.  Must match order from enum gpio_signal. */
 const struct gpio_info gpio_list[] = {
 	/* Inputs with interrupt handlers are first for efficiency */
-	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH, power_interrupt},
-	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH, power_interrupt},
-	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH, power_interrupt},
+	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
 	{"CHARGER_INT_L", GPIO_C, (1<<4),  GPIO_INT_FALLING, pmu_irq_handler},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt},
-	{"SUSPEND_L",   GPIO_A, (1<<7),  INT_BOTH_FLOATING, power_interrupt},
+	{"SUSPEND_L",   GPIO_A, (1<<7),  INT_BOTH_FLOATING,
+	 power_signal_interrupt},
 	{"WP_L",        GPIO_B, (1<<4),  GPIO_INPUT, NULL},
 	{"KB_IN00",     GPIO_C, (1<<8),  GPIO_KB_INPUT,
 	 keyboard_raw_gpio_interrupt},
diff --git a/board/spring/board.c b/board/spring/board.c
index faa0c179c0..965da81283 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -18,6 +18,7 @@
 #include "keyboard_raw.h"
 #include "lid_switch.h"
 #include "pmu_tpschrome.h"
+#include "power.h"
 #include "pwm.h"
 #include "pwm_chip.h"
 #include "registers.h"
@@ -33,12 +34,16 @@
 /* GPIO signal list.  Must match order from enum gpio_signal. */
 const struct gpio_info gpio_list[] = {
 	/* Inputs with interrupt handlers are first for efficiency */
-	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH, power_interrupt},
-	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH, power_interrupt},
-	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH, power_interrupt},
+	{"KB_PWR_ON_L", GPIO_B, (1<<5),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"PP1800_LDO2", GPIO_A, (1<<1),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
+	{"XPSHOLD",     GPIO_A, (1<<3),  GPIO_INT_BOTH,
+	 power_signal_interrupt},
 	{"CHARGER_INT_L", GPIO_C, (1<<4),  GPIO_INT_FALLING, pmu_irq_handler},
 	{"LID_OPEN",    GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt},
-	{"SUSPEND_L",   GPIO_A, (1<<7),  INT_BOTH_FLOATING, power_interrupt},
+	{"SUSPEND_L",   GPIO_A, (1<<7),  INT_BOTH_FLOATING,
+	 power_signal_interrupt},
 	{"WP_L",        GPIO_A, (1<<13), GPIO_INPUT, NULL},
 	{"KB_IN00",     GPIO_C, (1<<8),  GPIO_KB_INPUT,
 	 keyboard_raw_gpio_interrupt},
diff --git a/board/squawks/board.c b/board/squawks/board.c
index b15bd65f1b..825d551c78 100644
--- a/board/squawks/board.c
+++ b/board/squawks/board.c
@@ -7,7 +7,6 @@
 #include "adc.h"
 #include "adc_chip.h"
 #include "backlight.h"
-#include "power.h"
 #include "common.h"
 #include "driver/temp_sensor/tmp432.h"
 #include "extpower.h"
@@ -18,6 +17,7 @@
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "peci.h"
+#include "power.h"
 #include "power_button.h"
 #include "pwm.h"
 #include "pwm_chip.h"
@@ -41,20 +41,20 @@ const struct gpio_info gpio_list[] = {
 	 extpower_interrupt},
 	{"PCH_SLP_S3_L",         LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP |
 							GPIO_PULL_UP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PCH_SLP_S4_L",         LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP |
 							GPIO_PULL_UP,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP1050_PGOOD",         LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP3300_PCH_PGOOD",     LM4_GPIO_C, (1<<4), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"PP5000_PGOOD",         LM4_GPIO_N, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"S5_PGOOD",             LM4_GPIO_G, (1<<0), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"VCORE_PGOOD",          LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
-	 x86_interrupt},
+	 power_signal_interrupt},
 	{"WP_L",                 LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
 	 switch_interrupt},
 	{"JTAG_TCK",             LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
@@ -125,8 +125,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = {
 };
 const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs);
 
-/* x86 signal list.  Must match order of enum x86_signal. */
-const struct x86_signal_info x86_signal_list[] = {
+/* power signal list.  Must match order of enum power_signal. */
+const struct power_signal_info power_signal_list[] = {
 	{GPIO_PP1050_PGOOD,      1, "PGOOD_PP1050"},
 	{GPIO_PP3300_PCH_PGOOD,  1, "PGOOD_PP3300_PCH"},
 	{GPIO_PP5000_PGOOD,      1, "PGOOD_PP5000"},
@@ -139,7 +139,7 @@ const struct x86_signal_info x86_signal_list[] = {
 	{GPIO_PCH_SUS_STAT_L,    0, "SUS_STAT#_ASSERTED"},
 	{GPIO_PCH_SUSPWRDNACK,   1, "SUSPWRDNACK_ASSERTED"},
 };
-BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT);
+BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
 /* ADC channels. Must be in the exactly same order as in enum adc_channel. */
 const struct adc_t adc_channels[] = {
diff --git a/board/squawks/board.h b/board/squawks/board.h
index af9f4a7208..1b93ecab22 100644
--- a/board/squawks/board.h
+++ b/board/squawks/board.h
@@ -128,8 +128,8 @@ enum gpio_signal {
 	GPIO_COUNT
 };
 
-/* x86 signal definitions */
-enum x86_signal {
+/* power signal definitions */
+enum power_signal {
 	X86_PGOOD_PP1050 = 0,
 	X86_PGOOD_PP3300_PCH,
 	X86_PGOOD_PP5000,
@@ -143,7 +143,7 @@ enum x86_signal {
 	X86_SUSPWRDNACK_ASSERTED,
 
 	/* Number of X86 signals */
-	X86_SIGNAL_COUNT
+	POWER_SIGNAL_COUNT
 };
 
 enum adc_channel {