From 8b51215355ee8222f5ff6ec86b3420efee45f0b7 Mon Sep 17 00:00:00 2001 From: Edward Hill Date: Thu, 18 Jan 2018 19:37:02 -0800 Subject: [PATCH] grunt: Enable TCPC/PPC interrupts in board_tcpc_init Move enable of TCPC and PPC interrupts from board_init to board_tcpc_init so they are enabled after the PD tasks have been initialized. BUG=b:69378796 BRANCH=none TEST=PD still works on both ports Change-Id: Ia6c91e78d95f126b9049994f8f0568ac2e4cec4f Signed-off-by: Edward Hill Reviewed-on: https://chromium-review.googlesource.com/876642 Reviewed-by: Aaron Durbin Reviewed-by: Jett Rink --- board/grunt/board.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/board/grunt/board.c b/board/grunt/board.c index 7a5005df34..c3ba3b7374 100644 --- a/board/grunt/board.c +++ b/board/grunt/board.c @@ -208,14 +208,6 @@ static void board_init(void) { /* Enable Gyro interrupts */ gpio_enable_interrupt(GPIO_6AXIS_INT_L); - - /* Enable PPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_C0_SWCTL_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_SWCTL_INT_ODL); - - /* Enable TCPC interrupts. */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); @@ -299,10 +291,12 @@ void board_tcpc_init(void) if (!system_jumped_to_this_image()) board_reset_pd_mcu(); - /* Enable TCPC0 interrupt */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); + /* Enable PPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_SWCTL_INT_ODL); + gpio_enable_interrupt(GPIO_USB_C1_SWCTL_INT_ODL); - /* Enable TCPC1 interrupt */ + /* Enable TCPC interrupts. */ + gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); #ifdef CONFIG_USB_PD_TCPC_LOW_POWER