rambi: Remove proto1 workaround which leaves PP5000_EN on

proto1.5 boards should not need this workaround.

BUG=chrome-os-partner:23673
BRANCH=none
TEST=boot a proto1.5 board -> boots
     apshutdown -> off
     gpioget PP5000_EN -> 0
     powerbtn -> boots
     gpioget PP5000_EN -> 1

Change-Id: Ie7bb962a9be0934506a6a5d0aefda0282ebb15ec
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/177668
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Randall Spangler
2013-11-21 15:52:22 -08:00
committed by chrome-internal-fetch
parent 3b0a4055d1
commit 804b24cc81
2 changed files with 4 additions and 19 deletions

View File

@@ -95,11 +95,7 @@ const struct gpio_info gpio_list[] = {
{"PP3300_DX_EN", LM4_GPIO_J, (1<<2), GPIO_OUT_LOW, NULL},
{"PP3300_LTE_EN", LM4_GPIO_D, (1<<4), GPIO_OUT_LOW, NULL},
{"PP3300_WLAN_EN", LM4_GPIO_J, (1<<0), GPIO_OUT_LOW, NULL},
/*
* TODO(crosbug.com/p/23673): PP5000_EN should default to GPIO_OUT_LOW
* once issues with Rev.1 boards are fixed.
*/
{"PP5000_EN", LM4_GPIO_H, (1<<7), GPIO_OUT_HIGH, NULL},
{"PP5000_EN", LM4_GPIO_H, (1<<7), GPIO_OUT_LOW, NULL},
{"PPSX_EN", LM4_GPIO_L, (1<<6), GPIO_OUT_LOW, NULL},
{"SUSP_VR_EN", LM4_GPIO_C, (1<<7), GPIO_OUT_LOW, NULL},
{"TOUCHSCREEN_RESET_L", LM4_GPIO_N, (1<<7), GPIO_OUT_LOW, NULL},

View File

@@ -126,12 +126,7 @@ enum x86_state x86_chipset_init(void)
gpio_set_level(GPIO_SUSP_VR_EN, 0);
gpio_set_level(GPIO_PP1350_EN, 0);
gpio_set_level(GPIO_PP3300_DX_EN, 0);
/*
* TODO(crosbug.com/p/23673): turn off PP5000 after
* Rev.1 hardware is obsolete:
*
* gpio_set_level(GPIO_PP5000_EN, 0);
*/
gpio_set_level(GPIO_PP5000_EN, 0);
gpio_set_level(GPIO_PCH_RSMRST_L, 0);
gpio_set_level(GPIO_PCH_SYS_PWROK, 0);
wireless_enable(0);
@@ -250,12 +245,7 @@ enum x86_state x86_handle_state(enum x86_state state)
chipset_force_shutdown();
wireless_enable(0);
gpio_set_level(GPIO_PP3300_DX_EN, 0);
/*
* TODO(crosbug.com/p/23673): turn off PP5000 after
* Rev.1 hardware is obsolete:
*
* gpio_set_level(GPIO_PP5000_EN, 0);
*/
gpio_set_level(GPIO_PP5000_EN, 0);
gpio_set_level(GPIO_TOUCHSCREEN_RESET_L, 0);
return X86_S3;
}
@@ -320,8 +310,7 @@ enum x86_state x86_handle_state(enum x86_state state)
/* Turn off power rails */
gpio_set_level(GPIO_PP3300_DX_EN, 0);
/* TODO(crosbug.com/p/23673): turn off PP5000 after rev.1 */
/* gpio_set_level(GPIO_PP5000_EN, 0); */
gpio_set_level(GPIO_PP5000_EN, 0);
return X86_S3;
case X86_S3S5: