diff options
| author | Edward Hill <ecgh@chromium.org> | 2018-03-23 16:18:37 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-03-26 02:07:27 -0700 |
| commit | 36e7c2498c90df0a4c5672ae8347dec6cca98689 (patch) | |
| tree | ef7842ed178adb42e41eaeb9694e0e79df0b388a /board/grunt | |
| parent | 5c611cedbfcff0c2fed25462b0477efcff014c36 (diff) | |
| download | chrome-ec-36e7c2498c90df0a4c5672ae8347dec6cca98689.tar.gz | |
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>
Diffstat (limited to 'board/grunt')
| -rw-r--r-- | board/grunt/board.c | 8 | ||||
| -rw-r--r-- | board/grunt/board.h | 4 | ||||
| -rw-r--r-- | board/grunt/gpio.inc | 4 | ||||
| -rw-r--r-- | board/grunt/usb_pd_policy.c | 2 |
4 files changed, 9 insertions, 9 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) |