Remove duplicate KBD_IRQ_L signals

The SERIRQ signal will now be high-Z on the EC, which removes a
leakage path.  This requires the BIOS to use PM3 for its keyboard IRQ.

BUG=chrome-os-partner:24424
BRANCH=rambi
TEST=boot system; keyboard still works

Change-Id: I0acf425125ced11a9ef6da58ee49979b83c92d5c
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181718
This commit is contained in:
Randall Spangler
2014-01-07 11:16:12 -08:00
committed by chrome-internal-fetch
parent 59602b41e8
commit 7964fa2bdc
3 changed files with 1 additions and 23 deletions

View File

@@ -106,12 +106,7 @@ const struct gpio_info gpio_list[] = {
{"VCORE_EN", LM4_GPIO_C, (1<<5), GPIO_OUT_LOW, NULL},
{"WLAN_OFF_L", LM4_GPIO_J, (1<<4), GPIO_OUT_LOW, NULL},
{"PCH_SCI_L", LM4_GPIO_M, (1<<1), GPIO_ODR_HIGH, NULL},
/*
* TODO(crosbug.com/p/24424): Remove old assignment and remove _NEW
* from the new one when we deprecate the 1.5 boards.
*/
{"KBD_IRQ_L", LM4_GPIO_M, (1<<4), GPIO_OUT_HIGH, NULL},
{"KBD_IRQ_NEW_L", LM4_GPIO_M, (1<<3), GPIO_ODR_HIGH, NULL},
{"KBD_IRQ_L", LM4_GPIO_M, (1<<3), GPIO_ODR_HIGH, NULL},
};
BUILD_ASSERT(ARRAY_SIZE(gpio_list) == GPIO_COUNT);

View File

@@ -122,12 +122,7 @@ enum gpio_signal {
GPIO_VCORE_EN, /* Enable core power supplies */
GPIO_WLAN_OFF_L, /* Disable WiFi radio */
GPIO_PCH_SCI_L, /* Assert SCI to PCH */
/*
* TODO(crosbug.com/p/24424): Remove old assignment and remove _NEW
* from the new one when we deprecate the 1.5 boards.
*/
GPIO_KBD_IRQ_L, /* Negative edge triggered irq. */
GPIO_KBD_IRQ_NEW_L, /* Duplicate of KBD_IRQ# for 2.0 boards */
/* Number of GPIOs; not an actual GPIO */
GPIO_COUNT

View File

@@ -88,20 +88,8 @@ 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)