From 8e6d7f5fef9baab2d7a9d88b984f1cf460841cdd Mon Sep 17 00:00:00 2001 From: Dave Tu Date: Mon, 27 Feb 2012 11:32:18 -0800 Subject: [PATCH] Revert "Only deassert RCINn in S0" This change broke the tree. This reverts commit 1d1a38a6ccc352c3f9e1c5636def9dd63bf5951b --- board/link/board.c | 2 +- common/x86_power.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/board/link/board.c b/board/link/board.c index 0b18e8ba93..830426743b 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -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}, diff --git a/common/x86_power.c b/common/x86_power.c index f1454fe93e..d587897d8a 100644 --- a/common/x86_power.c +++ b/common/x86_power.c @@ -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);