diff options
| author | Keith Short <keithshort@chromium.org> | 2019-10-29 14:56:16 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-31 23:28:01 +0000 |
| commit | 510df8cb6ae9f78fea9a5f8bbac09c5d131ad357 (patch) | |
| tree | 799757869ffaea9d3cee1781ced5827433b48835 /power | |
| parent | 622228af41f6ff0e1059b9fe439d56a550b8dc6b (diff) | |
| download | chrome-ec-510df8cb6ae9f78fea9a5f8bbac09c5d131ad357.tar.gz | |
cometlake: cleanup power signal names
Add X86 prefix to the Comet Lake signals names for consistency with
other Intel APs.
BUG=none
BRANCH=none
TEST=make buildall
Change-Id: I70b2a261fd6fbc0e6de70e5d4cf3a90b35078d4e
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1888596
Reviewed-by: Vijay P Hiremath <vijay.p.hiremath@intel.com>
Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/cometlake.c | 41 | ||||
| -rw-r--r-- | power/cometlake.h | 6 |
2 files changed, 24 insertions, 23 deletions
diff --git a/power/cometlake.c b/power/cometlake.c index 62d5fbe6f7..4a28cd418d 100644 --- a/power/cometlake.c +++ b/power/cometlake.c @@ -20,34 +20,35 @@ /* Power signals list. Must match order of enum power_signal. */ const struct power_signal_info power_signal_list[] = { [X86_SLP_S0_DEASSERTED] = { - GPIO_PCH_SLP_S0_L, - POWER_SIGNAL_ACTIVE_HIGH | POWER_SIGNAL_DISABLE_AT_BOOT, - "SLP_S0_DEASSERTED", + .gpio = GPIO_PCH_SLP_S0_L, + .flags = POWER_SIGNAL_ACTIVE_HIGH | + POWER_SIGNAL_DISABLE_AT_BOOT, + .name = "SLP_S0_DEASSERTED", }, [X86_SLP_S3_DEASSERTED] = { - SLP_S3_SIGNAL_L, - POWER_SIGNAL_ACTIVE_HIGH, - "SLP_S3_DEASSERTED", + .gpio = SLP_S3_SIGNAL_L, + .flags = POWER_SIGNAL_ACTIVE_HIGH, + .name = "SLP_S3_DEASSERTED", }, [X86_SLP_S4_DEASSERTED] = { - SLP_S4_SIGNAL_L, - POWER_SIGNAL_ACTIVE_HIGH, - "SLP_S4_DEASSERTED", + .gpio = SLP_S4_SIGNAL_L, + .flags = POWER_SIGNAL_ACTIVE_HIGH, + .name = "SLP_S4_DEASSERTED", }, [X86_RSMRST_L_PGOOD] = { - GPIO_RSMRST_L_PGOOD, - POWER_SIGNAL_ACTIVE_HIGH, - "RSMRST_L_PGOOD", + .gpio = GPIO_RSMRST_L_PGOOD, + .flags = POWER_SIGNAL_ACTIVE_HIGH, + .name = "RSMRST_L_PGOOD", }, - [PP5000_A_PGOOD] = { - GPIO_PP5000_A_PG_OD, - POWER_SIGNAL_ACTIVE_HIGH, - "PP5000_A_PGOOD", + [X86_PP5000_A_PGOOD] = { + .gpio = GPIO_PP5000_A_PG_OD, + .flags = POWER_SIGNAL_ACTIVE_HIGH, + .name = "PP5000_A_PGOOD", }, - [ALL_SYS_PGOOD] = { - GPIO_PG_EC_ALL_SYS_PWRGD, - POWER_SIGNAL_ACTIVE_HIGH, - "ALL_SYS_PWRGD", + [X86_ALL_SYS_PGOOD] = { + .gpio = GPIO_PG_EC_ALL_SYS_PWRGD, + .flags = POWER_SIGNAL_ACTIVE_HIGH, + .name = "ALL_SYS_PWRGD", }, }; BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); diff --git a/power/cometlake.h b/power/cometlake.h index 5c9762ca58..261e747eeb 100644 --- a/power/cometlake.h +++ b/power/cometlake.h @@ -21,7 +21,7 @@ PP5000_PGOOD_POWER_SIGNAL_MASK) #define CHIPSET_G3S5_POWERUP_SIGNAL (POWER_SIGNAL_MASK(X86_RSMRST_L_PGOOD) | \ - POWER_SIGNAL_MASK(PP5000_A_PGOOD)) + POWER_SIGNAL_MASK(X86_PP5000_A_PGOOD)) #define CHARGER_INITIALIZED_DELAY_MS 100 #define CHARGER_INITIALIZED_TRIES 40 @@ -32,8 +32,8 @@ enum power_signal { X86_SLP_S3_DEASSERTED, X86_SLP_S4_DEASSERTED, X86_RSMRST_L_PGOOD, - PP5000_A_PGOOD, - ALL_SYS_PGOOD, + X86_PP5000_A_PGOOD, + X86_ALL_SYS_PGOOD, /* Number of X86 signals */ POWER_SIGNAL_COUNT |