diff options
| author | Edward Hill <ecgh@chromium.org> | 2018-01-18 19:37:02 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-19 20:35:47 -0800 |
| commit | 8b51215355ee8222f5ff6ec86b3420efee45f0b7 (patch) | |
| tree | 5dc8a5d1016f2ea4652cd12899015dae47e618e7 /board/grunt/board.c | |
| parent | dfda7899b7eb703e987851abe01b2d8d4e35e90f (diff) | |
| download | chrome-ec-8b51215355ee8222f5ff6ec86b3420efee45f0b7.tar.gz | |
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 <ecgh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/876642
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board/grunt/board.c')
| -rw-r--r-- | board/grunt/board.c | 16 |
1 files 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 |