diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2016-08-25 21:11:14 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2016-08-26 04:18:31 +0000 |
| commit | 87a0b0a878ac390a34a54a6839bc32a4ce7cf674 (patch) | |
| tree | 158ab51e09023b8c1e488d48921ffbb52a35d9a8 | |
| parent | e880402f74c7c76b269222caad6c3c80d3d6549e (diff) | |
| download | chrome-ec-87a0b0a878ac390a34a54a6839bc32a4ce7cf674.tar.gz | |
Revert "cr50: remove internal pull up on DIOM0"
This reverts commit d0383d88146e19c64230670aa6769528e5228c76.
Change-Id: I76cac7902b0cd25300393efcf205cdbe9ade82c0
Reviewed-on: https://chromium-review.googlesource.com/376132
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
Tested-by: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | board/cr50/board.c | 5 | ||||
| -rw-r--r-- | board/cr50/gpio.inc | 3 | ||||
| -rw-r--r-- | chip/g/rbox.c | 5 | ||||
| -rw-r--r-- | chip/g/rbox.h | 14 |
4 files changed, 4 insertions, 23 deletions
diff --git a/board/cr50/board.c b/board/cr50/board.c index 008e9372b0..bc2df48a84 100644 --- a/board/cr50/board.c +++ b/board/cr50/board.c @@ -15,8 +15,6 @@ #include "init_chip.h" #include "registers.h" #include "nvmem.h" -#include "rbox.h" -#include "spi.h" #include "system.h" #include "task.h" #include "trng.h" @@ -24,6 +22,7 @@ #include "usb_descriptor.h" #include "usb_hid.h" #include "util.h" +#include "spi.h" #include "usb_spi.h" /* Define interrupt and gpio structs */ @@ -276,7 +275,7 @@ void sys_rst_asserted(enum gpio_signal signal) * asserting this signal should not cause a system reset. */ CPRINTS("%s resceived signal %d)", __func__, signal); - if (usb_spi_update_in_progress() || rbox_is_asserting_ec_reset()) + if (usb_spi_update_in_progress()) return; cflush(); diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index 293c8207a4..e35de11aa3 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -14,7 +14,8 @@ * TODO: Remove this internal pullup at some point. It's only here so that * boards that don't have an external pullup don't trigger due to noise. */ -GPIO_INT(SYS_RST_L_IN, PIN(1, 0), GPIO_INT_FALLING, sys_rst_asserted) +GPIO_INT(SYS_RST_L_IN, PIN(1, 0), GPIO_INT_FALLING | GPIO_PULL_UP, + sys_rst_asserted) GPIO_INT(AP_ON, PIN(1, 1), GPIO_INT_RISING, device_state_on) GPIO_INT(EC_ON, PIN(1, 2), GPIO_INT_RISING, device_state_on) GPIO_INT(SERVO_UART1_ON, PIN(1, 3), GPIO_INT_RISING | GPIO_PULL_DOWN, diff --git a/chip/g/rbox.c b/chip/g/rbox.c index b46591d7a3..d4c01b27ce 100644 --- a/chip/g/rbox.c +++ b/chip/g/rbox.c @@ -7,11 +7,6 @@ #include "hooks.h" #include "registers.h" -int rbox_is_asserting_ec_reset(void) -{ - return GREAD(RBOX, ASSERT_EC_RST); -} - static void rbox_release_ec_reset(void) { /* Let the EC go (the RO bootloader asserts it ASAP after POR) */ diff --git a/chip/g/rbox.h b/chip/g/rbox.h deleted file mode 100644 index 5a99b11a2a..0000000000 --- a/chip/g/rbox.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef __CROS_RBOX_H -#define __CROS_RBOX_H - -/* - * RBOX may be used to hold the EC in reset. Returns 1 if RBOX_ASSERT_EC_RST is - * being used to hold the EC in reset and 0 if it isn't. - */ -int rbox_is_asserting_ec_reset(void); -#endif /* __CROS_RBOX_H */ |