Revert "Only deassert RCINn in S0"

This change broke the tree.

This reverts commit 1d1a38a6cc
This commit is contained in:
Dave Tu
2012-02-27 11:32:18 -08:00
committed by Gerrit Code Review
parent 1d1a38a6cc
commit 8e6d7f5fef
2 changed files with 1 additions and 7 deletions

View File

@@ -83,7 +83,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"PCH_NMIn", LM4_GPIO_M, (1<<2), GPIO_OUT_HIGH, NULL},
{"PCH_PWRBTNn", LM4_GPIO_G, (1<<7), GPIO_OUT_HIGH, NULL},
{"PCH_PWROK", LM4_GPIO_F, (1<<5), GPIO_OUT_LOW, NULL},
{"PCH_RCINn", LM4_GPIO_Q, (1<<7), GPIO_OUT_LOW, NULL},
{"PCH_RCINn", LM4_GPIO_Q, (1<<7), GPIO_OUT_HIGH, NULL},
/* Exception: RSMRST# is asserted at power-on */
{"PCH_RSMRSTn", LM4_GPIO_F, (1<<1), GPIO_OUT_LOW, NULL},
{"PCH_SMIn", LM4_GPIO_F, (1<<4), GPIO_OUT_HIGH, NULL},

View File

@@ -255,9 +255,6 @@ void x86_power_task(void)
break;
case X86_S3S0:
/* Deassert RCINn */
gpio_set_level(GPIO_PCH_RCINn, 1);
/* Turn on power rails */
gpio_set_level(GPIO_ENABLE_VS, 1);
@@ -290,9 +287,6 @@ void x86_power_task(void)
/* Disable +CPU_CORE and +VGFX_CORE */
gpio_set_level(GPIO_ENABLE_VCORE, 0);
/* Assert RCINn */
gpio_set_level(GPIO_PCH_RCINn, 0);
/* Turn off power rails */
gpio_set_level(GPIO_ENABLE_VS, 0);