diff options
| author | Jett Rink <jettrink@chromium.org> | 2018-03-30 12:18:55 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-02 16:26:45 -0700 |
| commit | 7c0d2d02f65ba8caf01f753b98e06a74218f1303 (patch) | |
| tree | 3faffe05640901a8f2a581bdc490d691a6f263d9 | |
| parent | 2c5f85f6662920eabc33caa1c37aefb748c3eded (diff) | |
| download | chrome-ec-7c0d2d02f65ba8caf01f753b98e06a74218f1303.tar.gz | |
ite: disable interrupts if no keyboard task
We also need to ensure that the interrupts are not firing.
BRANCH=none
BUG=none
TEST=buildall
Change-Id: I3311c8667fab2c575ff6bbe8b26b010a3340e600
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/988229
| -rw-r--r-- | chip/it83xx/intc.h | 2 | ||||
| -rw-r--r-- | chip/it83xx/lpc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chip/it83xx/intc.h b/chip/it83xx/intc.h index ed2590c91a..268930eee5 100644 --- a/chip/it83xx/intc.h +++ b/chip/it83xx/intc.h @@ -25,7 +25,7 @@ void espi_interrupt(void); void espi_vw_interrupt(void); void espi_init(void); -#ifdef HAS_TASK_KEYPROTO +#if defined(CONFIG_LPC) && defined(HAS_TASK_KEYPROTO) void lpc_kbc_ibf_interrupt(void); void lpc_kbc_obe_interrupt(void); #endif diff --git a/chip/it83xx/lpc.c b/chip/it83xx/lpc.c index eb46cbaa29..2a9756665c 100644 --- a/chip/it83xx/lpc.c +++ b/chip/it83xx/lpc.c @@ -669,11 +669,13 @@ static void lpc_init(void) gpio_enable_interrupt(GPIO_PCH_PLTRST_L); #endif +#ifdef HAS_TASK_KEYPROTO task_clear_pending_irq(IT83XX_IRQ_KBC_OUT); task_disable_irq(IT83XX_IRQ_KBC_OUT); task_clear_pending_irq(IT83XX_IRQ_KBC_IN); task_enable_irq(IT83XX_IRQ_KBC_IN); +#endif task_clear_pending_irq(IT83XX_IRQ_PMC_IN); pm_set_status(LPC_ACPI_CMD, EC_LPC_STATUS_PROCESSING, 0); |