diff options
| author | Rob Barnes <robbarnes@google.com> | 2021-03-11 17:04:58 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-12 02:16:18 +0000 |
| commit | b2c96a8fff263cc26bca24afc310c3de248fe53b (patch) | |
| tree | 13f8683e2ac406e14947cea6aaf9b0bc6c3fc3d2 | |
| parent | 01e7c7cc367f1e17804640f7820f071738b2f83a (diff) | |
| download | chrome-ec-b2c96a8fff263cc26bca24afc310c3de248fe53b.tar.gz | |
kconfig: Alias EN_PWR_A to EN_PWR_S5
EN_PWR_A should alias to EN_PWR_S5. EN_PWR_Z1 is PSL_OUT.
BUG=b:182512084
TEST=Build
BRANCH=None
Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: Iabec65bb573d200a12e727d281f8c97cf1ee0ec4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2753816
Reviewed-by: Diana Z <dzigterman@chromium.org>
| -rw-r--r-- | baseboard/guybrush/base_gpio.inc | 1 | ||||
| -rw-r--r-- | baseboard/guybrush/baseboard.h | 2 | ||||
| -rw-r--r-- | baseboard/mancomb/base_gpio.inc | 1 | ||||
| -rw-r--r-- | baseboard/mancomb/baseboard.h | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/baseboard/guybrush/base_gpio.inc b/baseboard/guybrush/base_gpio.inc index 16c3e6e97c..9f704a51bd 100644 --- a/baseboard/guybrush/base_gpio.inc +++ b/baseboard/guybrush/base_gpio.inc @@ -25,7 +25,6 @@ GPIO_INT(PG_GROUPC_S0_OD, PIN(A, 3), GPIO_INT_BOTH, baseboard_en_pwr_pcore_s0 GPIO_INT(PG_LPDDR4X_S3_OD, PIN(9, 5), GPIO_INT_BOTH, baseboard_en_pwr_pcore_s0) /* Power Group LPDDR4 S3 */ GPIO(EN_PWR_S5, PIN(B, 7), GPIO_OUT_LOW) /* Enable S5 Power */ GPIO(EN_PWR_S0_R, PIN(F, 1), GPIO_OUT_LOW) -GPIO(EN_PWR_Z1, PIN(8, 5), GPIO_OUT_LOW) /* Enable Z1 Power */ GPIO(EN_PWR_PCORE_S0_R, PIN(E, 1), GPIO_OUT_LOW) ALTERNATE(/*MECH_PWR_BTN_ODL*/ PIN_MASK(D, BIT(2)), 0, MODULE_PMU, 0) /* PSL - Mechanical Power Button */ ALTERNATE(/*LID_OPEN*/ PIN_MASK(0, BIT(2)), 0, MODULE_PMU, 0) /* PSL - Lid Open */ diff --git a/baseboard/guybrush/baseboard.h b/baseboard/guybrush/baseboard.h index fae022c393..619a48b351 100644 --- a/baseboard/guybrush/baseboard.h +++ b/baseboard/guybrush/baseboard.h @@ -38,7 +38,7 @@ #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE #define G3_TO_PWRBTN_DELAY_MS 80 #define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_EN_PWR_A GPIO_EN_PWR_Z1 +#define GPIO_EN_PWR_A GPIO_EN_PWR_S5 #define GPIO_PCH_PWRBTN_L GPIO_EC_SOC_PWR_BTN_L #define GPIO_PCH_RSMRST_L GPIO_EC_SOC_RSMRST_L #define GPIO_PCH_SLP_S0_L GPIO_SLP_S3_S0I3_L diff --git a/baseboard/mancomb/base_gpio.inc b/baseboard/mancomb/base_gpio.inc index f5de862a7c..e987c8208d 100644 --- a/baseboard/mancomb/base_gpio.inc +++ b/baseboard/mancomb/base_gpio.inc @@ -28,7 +28,6 @@ GPIO(BJ_ADP_PRESENT_L, PIN(3, 0), GPIO_INPUT) /* Barrel Jack Adapter Pres GPIO(EC_RECOVERY_BTN_ODL, PIN(3, 1), GPIO_INT_BOTH) GPIO(EN_PWR_S5, PIN(B, 7), GPIO_OUT_LOW) /* Enable S5 Power */ GPIO(EN_PWR_S0_R, PIN(F, 1), GPIO_OUT_LOW) -GPIO(EN_PWR_Z1, PIN(8, 5), GPIO_OUT_LOW) /* Enable Z1 Power */ GPIO(EN_PWR_PCORE_S0_R, PIN(E, 1), GPIO_OUT_LOW) GPIO(EN_PPVAR_BJ_ADP_L, PIN(2, 1), GPIO_OUT_HIGH) /* Enable Barrel Jack Adapter Power */ ALTERNATE(/*MECH_PWR_BTN_ODL*/ PIN_MASK(D, BIT(2)), 0, MODULE_PMU, 0) /* PSL - Mechanical Power Button */ diff --git a/baseboard/mancomb/baseboard.h b/baseboard/mancomb/baseboard.h index a1fe9e4c2f..5aeb82787b 100644 --- a/baseboard/mancomb/baseboard.h +++ b/baseboard/mancomb/baseboard.h @@ -44,7 +44,7 @@ #define CONFIG_POWER_SLEEP_FAILURE_DETECTION #define CONFIG_POWER_TRACK_HOST_SLEEP_STATE #define G3_TO_PWRBTN_DELAY_MS 80 -#define GPIO_EN_PWR_A GPIO_EN_PWR_Z1 +#define GPIO_EN_PWR_A GPIO_EN_PWR_S5 #define GPIO_PCH_PWRBTN_L GPIO_EC_SOC_PWR_BTN_L #define GPIO_PCH_RSMRST_L GPIO_EC_SOC_RSMRST_L #define GPIO_PCH_SLP_S0_L GPIO_SLP_S3_S0I3_L |