diff options
Diffstat (limited to 'power/haswell.c')
| -rw-r--r-- | power/haswell.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/power/haswell.c b/power/haswell.c index 4bc83c5ff6..cd00300f25 100644 --- a/power/haswell.c +++ b/power/haswell.c @@ -28,10 +28,10 @@ #define IN_PGOOD_PP1350 X86_SIGNAL_MASK(X86_PGOOD_PP1350) #define IN_PGOOD_PP1050 X86_SIGNAL_MASK(X86_PGOOD_PP1050) #define IN_PGOOD_VCORE X86_SIGNAL_MASK(X86_PGOOD_VCORE) -#define IN_PCH_SLP_S0n_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_S0n_DEASSERTED) -#define IN_PCH_SLP_S3n_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_S3n_DEASSERTED) -#define IN_PCH_SLP_S5n_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_S5n_DEASSERTED) -#define IN_PCH_SLP_SUSn_DEASSERTED X86_SIGNAL_MASK(X86_PCH_SLP_SUSn_DEASSERTED) +#define IN_SLP_S0_DEASSERTED X86_SIGNAL_MASK(X86_SLP_S0_DEASSERTED) +#define IN_SLP_S3_DEASSERTED X86_SIGNAL_MASK(X86_SLP_S3_DEASSERTED) +#define IN_SLP_S5_DEASSERTED X86_SIGNAL_MASK(X86_SLP_S5_DEASSERTED) +#define IN_SLP_SUS_DEASSERTED X86_SIGNAL_MASK(X86_SLP_SUS_DEASSERTED) /* All always-on supplies */ #define IN_PGOOD_ALWAYS_ON (IN_PGOOD_PP5000) @@ -45,8 +45,8 @@ #define IN_PGOOD_S0 (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE) /* All PM_SLP signals from PCH deasserted */ -#define IN_ALL_PM_SLP_DEASSERTED (IN_PCH_SLP_S3n_DEASSERTED | \ - IN_PCH_SLP_S5n_DEASSERTED) +#define IN_ALL_PM_SLP_DEASSERTED (IN_SLP_S3_DEASSERTED | \ + IN_SLP_S5_DEASSERTED) /* All inputs in the right state for S0 */ #define IN_ALL_S0 (IN_PGOOD_ALWAYS_ON | IN_PGOOD_ALL_NONCORE | \ IN_PGOOD_ALL_CORE | IN_ALL_PM_SLP_DEASSERTED) @@ -206,7 +206,7 @@ enum x86_state x86_handle_state(enum x86_state state) /* Assert DPWROK */ gpio_set_level(GPIO_PCH_DPWROK, 1); - if (x86_wait_signals(IN_PCH_SLP_SUSn_DEASSERTED)) { + if (x86_wait_signals(IN_SLP_SUS_DEASSERTED)) { chipset_force_shutdown(); return X86_G3; } |