diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-04 09:17:15 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-05 11:28:51 -0700 |
| commit | 765c50ef5fc77aec2ef0abca7a76f000b4167d57 (patch) | |
| tree | 1e6829625db6a36432484600f90c1f33d7ec0fa6 /board/spring | |
| parent | 0d1c48ea7c4dd25a718f63ce3cbcee8ee0fa026a (diff) | |
| download | chrome-ec-765c50ef5fc77aec2ef0abca7a76f000b4167d57.tar.gz | |
Move board hard reset code into tpschrome driver
Hard reset is done by shorting 3.3V to ground. This is only really
necessary to work around the PMU's I2C engine getting into a weird /
uncommunicative state.
This should not make any functional changes; the code is behaving the
same way it did before.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build daisy, snow, spring
Change-Id: I0edbdfc11bd5f6643075ffc83f4df3e11fc14675
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47199
Diffstat (limited to 'board/spring')
| -rw-r--r-- | board/spring/board.c | 18 | ||||
| -rw-r--r-- | board/spring/board.h | 7 |
2 files changed, 4 insertions, 21 deletions
diff --git a/board/spring/board.c b/board/spring/board.c index 2eb324929d..e40e3c1e3a 100644 --- a/board/spring/board.c +++ b/board/spring/board.c @@ -27,8 +27,6 @@ #define INT_BOTH_FLOATING (GPIO_INPUT | GPIO_INT_BOTH) #define INT_BOTH_PULL_UP (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH) -#define HARD_RESET_TIMEOUT_MS 5 - void usb_charge_interrupt(enum gpio_signal signal); /* GPIO signal list. Must match order from enum gpio_signal. */ @@ -201,22 +199,6 @@ static void board_shutdown_hook(void) } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_shutdown_hook, HOOK_PRIO_DEFAULT); -/* - * Force the pmic to reset completely. This forces an entire system reset, - * and therefore should never return - */ -void board_hard_reset(void) -{ - /* Force a hard reset of tps Chrome */ - gpio_set_level(GPIO_PMIC_RESET, 1); - - /* Delay while the power is cut */ - udelay(HARD_RESET_TIMEOUT_MS * 1000); - - /* Shouldn't get here unless the board doesn't have this capability */ - panic_puts("Hard reset failed! (this board may not be capable)\n"); -} - #ifdef CONFIG_PMU_BOARD_INIT int pmu_board_init(void) { diff --git a/board/spring/board.h b/board/spring/board.h index 32b3612d24..36775dd6fd 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -15,17 +15,18 @@ #define CONFIG_CONSOLE_UART 1 /* Debug features */ -#define CONFIG_PANIC_HELP #define CONFIG_ASSERT_HELP #define CONFIG_CONSOLE_CMDHELP +#define CONFIG_PANIC_HELP +#undef CONFIG_TASK_PROFILING +#define CONFIG_WATCHDOG_HELP /* Optional features */ #define CONFIG_CHIPSET_GAIA #define CONFIG_HOST_COMMAND_STATUS #define CONFIG_I2C #define CONFIG_KEYBOARD_PROTOCOL_MKBP -#undef CONFIG_TASK_PROFILING -#define CONFIG_WATCHDOG_HELP +#define CONFIG_PMU_HARD_RESET /* use STOP mode when we have nothing to do */ #define CONFIG_LOW_POWER_IDLE |