diff options
| -rw-r--r-- | board/rambi/board.c | 7 | ||||
| -rw-r--r-- | board/rambi/board.h | 5 | ||||
| -rw-r--r-- | chip/lm4/lpc.c | 12 |
3 files changed, 1 insertions, 23 deletions
diff --git a/board/rambi/board.c b/board/rambi/board.c index 99624197fc..bbd9f46120 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -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); diff --git a/board/rambi/board.h b/board/rambi/board.h index 06b0c897ce..96de22ca74 100644 --- a/board/rambi/board.h +++ b/board/rambi/board.h @@ -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 diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index 63c6e9fece..aa15e1fbfe 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -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) |