stoney: Rename PGOOD GPIOs

Rename stoney power signals for clarity:
SPOK -> S5_PGOOD
VGATE -> S0_PGOOD

BUG=none
BRANCH=none
TEST=power grunt on and off

Change-Id: Iee8307138600c10868981a22971beace2de1ca91
Signed-off-by: Edward Hill <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/978952
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/982341
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Trybot-Ready: Furquan Shaikh <furquan@chromium.org>

9 files changed, 28 insertions, 28 deletions

diff --git a/board/grunt/board.c b/board/grunt/board.c
index 0d057f98dd..be997ffd49 100644
--- a/board/grunt/board.c
+++ b/board/grunt/board.c
@@ -137,10 +137,10 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT);
 
 /* Power signal list.  Must match order of enum power_signal. */
 const struct power_signal_info power_signal_list[] = {
-	{GPIO_PCH_SLP_S3_L,     POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
-	{GPIO_PCH_SLP_S5_L,     POWER_SIGNAL_ACTIVE_HIGH, "SLP_S5_DEASSERTED"},
-	{GPIO_VGATE,            POWER_SIGNAL_ACTIVE_HIGH, "VGATE"},
-	{GPIO_SPOK,             POWER_SIGNAL_ACTIVE_HIGH, "SPOK"},
+	{GPIO_PCH_SLP_S3_L,	POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
+	{GPIO_PCH_SLP_S5_L,	POWER_SIGNAL_ACTIVE_HIGH, "SLP_S5_DEASSERTED"},
+	{GPIO_S0_PGOOD,		POWER_SIGNAL_ACTIVE_HIGH, "S0_PGOOD"},
+	{GPIO_S5_PGOOD,		POWER_SIGNAL_ACTIVE_HIGH, "S5_PGOOD"},
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 
diff --git a/board/grunt/board.h b/board/grunt/board.h
index 046722ddf2..98fcc9823b 100644
--- a/board/grunt/board.h
+++ b/board/grunt/board.h
@@ -182,8 +182,8 @@ enum adc_channel {
 enum power_signal {
 	X86_SLP_S3_N,
 	X86_SLP_S5_N,
-	X86_VGATE,
-	X86_SPOK,
+	X86_S0_PGOOD,
+	X86_S5_PGOOD,
 	POWER_SIGNAL_COUNT
 };
 
diff --git a/board/grunt/gpio.inc b/board/grunt/gpio.inc
index 9522364776..bfdbd0e376 100644
--- a/board/grunt/gpio.inc
+++ b/board/grunt/gpio.inc
@@ -15,8 +15,8 @@ GPIO_INT(USB_C1_SWCTL_INT_ODL_V0, PIN(0, 4), GPIO_INT_FALLING,			ppc_interrupt)
 GPIO_INT(USB_C1_SWCTL_INT_ODL_V2, PIN(D, 4), GPIO_INT_FALLING,			ppc_interrupt)
 GPIO_INT(PCH_SLP_S3_L,		PIN(A, 6), GPIO_INT_BOTH,			power_signal_interrupt)
 GPIO_INT(PCH_SLP_S5_L,		PIN(A, 3), GPIO_INT_BOTH,			power_signal_interrupt)
-GPIO_INT(VGATE,			PIN(F, 4), GPIO_INT_BOTH,			power_signal_interrupt)
-GPIO_INT(SPOK,			PIN(6, 3), GPIO_INT_BOTH | GPIO_PULL_UP,	power_signal_interrupt)
+GPIO_INT(S0_PGOOD,		PIN(F, 4), GPIO_INT_BOTH,			power_signal_interrupt)
+GPIO_INT(S5_PGOOD,		PIN(6, 3), GPIO_INT_BOTH | GPIO_PULL_UP,	power_signal_interrupt)
 GPIO_INT(POWER_BUTTON_L,	PIN(0, 1), GPIO_INT_BOTH,			power_button_interrupt)
 GPIO_INT(LID_OPEN,		PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,	lid_interrupt)
 GPIO_INT(AC_PRESENT,		PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,	extpower_interrupt)
diff --git a/board/grunt/usb_pd_policy.c b/board/grunt/usb_pd_policy.c
index 52f9f9450c..e4cf87efa4 100644
--- a/board/grunt/usb_pd_policy.c
+++ b/board/grunt/usb_pd_policy.c
@@ -99,7 +99,7 @@ void pd_check_pr_role(int port, int pr_role, int flags)
 int pd_check_vconn_swap(int port)
 {
 	/* in G3, do not allow vconn swap since 5V rail is off */
-	return gpio_get_level(GPIO_SPOK);
+	return gpio_get_level(GPIO_S5_PGOOD);
 }
 
 void pd_execute_data_swap(int port, int data_role)
diff --git a/board/kahlee/board.c b/board/kahlee/board.c
index 38793783d0..670fc528c8 100644
--- a/board/kahlee/board.c
+++ b/board/kahlee/board.c
@@ -87,7 +87,7 @@ void usb1_evt(enum gpio_signal signal)
 const struct power_signal_info power_signal_list[] = {
 	{GPIO_PCH_SLP_S3_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S3_DEASSERTED"},
 	{GPIO_PCH_SLP_S5_L, POWER_SIGNAL_ACTIVE_HIGH, "SLP_S5_DEASSERTED"},
-	{GPIO_SPOK,	    POWER_SIGNAL_ACTIVE_HIGH, "SPOK_DEASSERTED"},
+	{GPIO_S5_PGOOD,	    POWER_SIGNAL_ACTIVE_HIGH, "S5_PGOOD_DEASSERTED"},
 	{GPIO_P095VALW_PG,  POWER_SIGNAL_ACTIVE_HIGH, "0.95VALW_DEASSERTED"},
 };
 BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
diff --git a/board/kahlee/board.h b/board/kahlee/board.h
index 307943c17a..e8eabc3447 100644
--- a/board/kahlee/board.h
+++ b/board/kahlee/board.h
@@ -220,7 +220,7 @@ enum mft_channel {
 enum power_signal {
 	X86_SLP_S3_N = 0,
 	X86_SLP_S5_N,
-	X86_SPOK,
+	X86_S5_PGOOD,
 	X86_ALW_PG,
 
 	/* Number of X86 signals */
diff --git a/board/kahlee/gpio.inc b/board/kahlee/gpio.inc
index c9ab3b7b75..d2ba8da802 100644
--- a/board/kahlee/gpio.inc
+++ b/board/kahlee/gpio.inc
@@ -61,8 +61,8 @@ GPIO(EC_BATT_PRES_L,		PIN(3, 4), GPIO_INPUT)
 
 GPIO(PCH_RSMRST_L,		PIN(7, 0), GPIO_OUT_LOW)
 GPIO(VR_ON,			PIN(3, 3), GPIO_OUTPUT)
-GPIO(VGATE,			PIN(5, 0), GPIO_INPUT)
-GPIO(SPOK,			PIN(6, 0), GPIO_INPUT)
+GPIO(S0_PGOOD,			PIN(5, 0), GPIO_INPUT)
+GPIO(S5_PGOOD,			PIN(6, 0), GPIO_INPUT)
 GPIO(P095VALW_EN,		PIN(C, 6), GPIO_OUTPUT)
 GPIO(P095VALW_PG,		PIN(7, 1), GPIO_INPUT)
 GPIO(PCH_SYS_PWROK,		PIN(E, 7), GPIO_OUT_LOW)		/* EC_PCH_PWROK */
diff --git a/board/kahlee/usb_pd_policy.c b/board/kahlee/usb_pd_policy.c
index 64b32ed937..7ed4ff6450 100644
--- a/board/kahlee/usb_pd_policy.c
+++ b/board/kahlee/usb_pd_policy.c
@@ -155,7 +155,7 @@ int pd_check_data_swap(int port, int data_role)
 int pd_check_vconn_swap(int port)
 {
 	/* in G3, do not allow vconn swap since 5V rail is off */
-	return gpio_get_level(GPIO_SPOK);
+	return gpio_get_level(GPIO_S5_PGOOD);
 }
 
 void pd_execute_data_swap(int port, int data_role)
diff --git a/power/stoney.c b/power/stoney.c
index 7c1c8261c3..936ae21a65 100644
--- a/power/stoney.c
+++ b/power/stoney.c
@@ -26,7 +26,7 @@
 #define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
 #define CPRINTS(format, args...) cprints(CC_CHIPSET, format, ## args)
 
-#define IN_SPOK POWER_SIGNAL_MASK(X86_SPOK)
+#define IN_S5_PGOOD POWER_SIGNAL_MASK(X86_S5_PGOOD)
 
 static int forcing_coldreset; /* Forced coldreset in progress? */
 static int forcing_shutdown;  /* Forced shutdown in progress? */
@@ -96,7 +96,7 @@ enum power_state power_chipset_init(void)
 	 * through G3.
 	 */
 	if (system_jumped_to_this_image()) {
-		if (gpio_get_level(GPIO_VGATE)) {
+		if (gpio_get_level(GPIO_S0_PGOOD)) {
 			/* Disable idle task deep sleep when in S0. */
 			disable_sleep(SLEEP_MASK_AP_RUN);
 
@@ -121,10 +121,10 @@ static void handle_pass_through(enum gpio_signal pin_in,
 	int out_level = gpio_get_level(pin_out);
 
 	/*
-	 * Only pass through high VGATE (S0 power) when SPOK (system power, S5)
-	 * is also high (VGATE is pulled high in G3 when SPOK is low).
+	 * Only pass through high S0_PGOOD (S0 power) when S5_PGOOD (S5 power)
+	 * is also high (S0_PGOOD is pulled high in G3 when S5_PGOOD is low).
 	 */
-	if ((pin_in == GPIO_VGATE) && !gpio_get_level(GPIO_SPOK))
+	if ((pin_in == GPIO_S0_PGOOD) && !gpio_get_level(GPIO_S5_PGOOD))
 		in_level = 0;
 
 	/* Nothing to do. */
@@ -135,7 +135,7 @@ static void handle_pass_through(enum gpio_signal pin_in,
 	 * SOC requires a delay of 1ms with stable power before
 	 * asserting PWR_GOOD.
 	 */
-	if ((pin_in == GPIO_VGATE) && in_level)
+	if ((pin_in == GPIO_S0_PGOOD) && in_level)
 		msleep(1);
 
 	gpio_set_level(pin_out, in_level);
@@ -145,9 +145,9 @@ static void handle_pass_through(enum gpio_signal pin_in,
 
 enum power_state power_handle_state(enum power_state state)
 {
-	handle_pass_through(GPIO_SPOK, GPIO_PCH_RSMRST_L);
+	handle_pass_through(GPIO_S5_PGOOD, GPIO_PCH_RSMRST_L);
 
-	handle_pass_through(GPIO_VGATE, GPIO_PCH_SYS_PWROK);
+	handle_pass_through(GPIO_S0_PGOOD, GPIO_PCH_SYS_PWROK);
 
 	if (state == POWER_S5 && forcing_shutdown) {
 		power_button_pch_release();
@@ -171,7 +171,7 @@ enum power_state power_handle_state(enum power_state state)
 		/* Call hooks to initialize PMIC */
 		hook_notify(HOOK_CHIPSET_PRE_INIT);
 
-		if (power_wait_signals(IN_SPOK)) {
+		if (power_wait_signals(IN_S5_PGOOD)) {
 			chipset_force_g3();
 			return POWER_G3;
 		}
@@ -181,7 +181,7 @@ enum power_state power_handle_state(enum power_state state)
 		return POWER_S5;
 
 	case POWER_S5:
-		if (!power_has_signals(IN_SPOK)) {
+		if (!power_has_signals(IN_S5_PGOOD)) {
 			/* Required rail went away */
 			return POWER_S5G3;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S5_L) == 1) {
@@ -191,7 +191,7 @@ enum power_state power_handle_state(enum power_state state)
 		break;
 
 	case POWER_S5S3:
-		if (!power_has_signals(IN_SPOK)) {
+		if (!power_has_signals(IN_S5_PGOOD)) {
 			/* Required rail went away */
 			return POWER_S5G3;
 		}
@@ -202,7 +202,7 @@ enum power_state power_handle_state(enum power_state state)
 		return POWER_S3;
 
 	case POWER_S3:
-		if (!power_has_signals(IN_SPOK)) {
+		if (!power_has_signals(IN_S5_PGOOD)) {
 			/* Required rail went away */
 			return POWER_S5G3;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S3_L) == 1) {
@@ -215,7 +215,7 @@ enum power_state power_handle_state(enum power_state state)
 		break;
 
 	case POWER_S3S0:
-		if (!power_has_signals(IN_SPOK)) {
+		if (!power_has_signals(IN_S5_PGOOD)) {
 			/* Required rail went away */
 			return POWER_S5G3;
 		}
@@ -235,7 +235,7 @@ enum power_state power_handle_state(enum power_state state)
 		return POWER_S0;
 
 	case POWER_S0:
-		if (!power_has_signals(IN_SPOK)) {
+		if (!power_has_signals(IN_S5_PGOOD)) {
 			/* Required rail went away */
 			return POWER_S5G3;
 		} else if (gpio_get_level(GPIO_PCH_SLP_S3_L) == 0) {