summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2013-12-06 13:20:49 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2013-12-16 22:57:31 +0000
commit400d7758bd4dbf705611c2cab3ba0da2f4b292fa (patch)
tree5ce81cb5b4b7bf387d2179968c6d9315b7443318 /chip
parent05bd0cdec7a3132fda3127c3c9daeed0ebae0dae (diff)
downloadchrome-ec-400d7758bd4dbf705611c2cab3ba0da2f4b292fa.tar.gz
rambi: Add duplicate GPIO outputs for proto 2.0 board
Proto 2.0 makes these changes: KBD_IRQ# moves from PM4 to PM3. EC_PWROK moves from PH2 to PJ1. Since PM3 and PJ1 are unused on proto 1.5, it's harmless to duplicate the current functionality on those outputs. We can remove the old outputs when we deprecate the 1.5 boards. BUG=chrome-os-partner:24424 BRANCH=none TEST=boot rambi Change-Id: Iff77651ef575a8405878fe75f025a0507b02b771 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/180081 Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/lm4/lpc.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c
index f77dd363ed..57844bd2e9 100644
--- a/chip/lm4/lpc.c
+++ b/chip/lm4/lpc.c
@@ -88,8 +88,20 @@ static void keyboard_irq_assert(void)
{
/* Negative edge-triggered keyboard interrupt. */
gpio_set_level(CONFIG_KEYBOARD_IRQ_GPIO, 0);
+#ifdef BOARD_RAMBI
+ /*
+ * TODO(crosbug.com/p/24424): Remove duplicate IRQ output when we
+ * finish transitioning from proto 1.5 to proto 2.0.
+ */
+ gpio_set_level(GPIO_KBD_IRQ_NEW_L, 0);
+#endif
+
wait_irq_sent();
+
gpio_set_level(CONFIG_KEYBOARD_IRQ_GPIO, 1);
+#ifdef BOARD_RAMBI
+ gpio_set_level(GPIO_KBD_IRQ_NEW_L, 1);
+#endif
}
#else
static void wait_send_serirq(uint32_t lpcirqctl)