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/kahlee | |
| 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/kahlee')
| -rw-r--r-- | board/kahlee/board.c | 2 | ||||
| -rw-r--r-- | board/kahlee/board.h | 2 | ||||
| -rw-r--r-- | board/kahlee/gpio.inc | 4 | ||||
| -rw-r--r-- | board/kahlee/usb_pd_policy.c | 2 |
4 files changed, 5 insertions, 5 deletions
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) |