diff options
Diffstat (limited to 'board/trogdor')
| -rw-r--r-- | board/trogdor/board.c | 23 | ||||
| -rw-r--r-- | board/trogdor/gpio.inc | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/board/trogdor/board.c b/board/trogdor/board.c index 7c5a06cb1a..39ebec5506 100644 --- a/board/trogdor/board.c +++ b/board/trogdor/board.c @@ -42,7 +42,6 @@ static void usb0_evt(enum gpio_signal signal); static void usb1_evt(enum gpio_signal signal); static void usba_oc_interrupt(enum gpio_signal signal); static void ppc_interrupt(enum gpio_signal signal); -static void board_connect_c0_sbu(enum gpio_signal s); #include "gpio_list.h" @@ -102,21 +101,6 @@ static void ppc_interrupt(enum gpio_signal signal) } } -static void board_connect_c0_sbu_deferred(void) -{ - /* - * If CCD_MODE_ODL asserts, it means there's a debug accessory connected - * and we should enable the SBU FETs. - */ - ppc_set_sbu(0, 1); -} -DECLARE_DEFERRED(board_connect_c0_sbu_deferred); - -static void board_connect_c0_sbu(enum gpio_signal s) -{ - hook_call_deferred(&board_connect_c0_sbu_deferred_data, 0); -} - /* Keyboard scan setting */ struct keyboard_scan_config keyscan_config = { /* Use 80 us, because KSO_02 passes through the H1. */ @@ -281,13 +265,6 @@ static void board_init(void) /* Enable interrupt for BMI160 sensor */ gpio_enable_interrupt(GPIO_ACCEL_GYRO_INT_L); - /* - * The H1 SBU line for CCD are behind PPC chip. The PPC internal FETs - * for SBU may be disconnected after DP alt mode is off. Should enable - * the CCD_MODE_ODL interrupt to make sure the SBU FETs are connected. - */ - gpio_enable_interrupt(GPIO_CCD_MODE_ODL); - /* Set the backlight duty cycle to 0. AP will override it later. */ pwm_set_duty(PWM_CH_DISPLIGHT, 0); } diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index 067b904125..aaac15839e 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -19,7 +19,6 @@ GPIO_INT(USB_A0_OC_ODL, PIN(D, 1), GPIO_INT_BOTH | GPIO_PULL_UP, usba_oc_ /* System interrupts */ GPIO_INT(CHG_ACOK_OD, PIN(0, 0), GPIO_INT_BOTH, extpower_interrupt) /* ACOK */ -GPIO_INT(CCD_MODE_ODL, PIN(E, 3), GPIO_INT_FALLING, board_connect_c0_sbu) /* Case Closed Debug Mode */ GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* Power button */ GPIO_INT(EC_VOLDN_BTN_ODL, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Up button */ GPIO_INT(EC_VOLUP_BTN_ODL, PIN(F, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* Volume Down button */ @@ -49,6 +48,7 @@ GPIO_INT(ACCEL_GYRO_INT_L, PIN(A, 0), GPIO_INT_FALLING, bmi160_interrupt) /* A */ GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INPUT) /* EC reset */ GPIO(EC_ENTERING_RW, PIN(E, 1), GPIO_OUT_LOW) /* Indicate when EC is entering RW code */ +GPIO(CCD_MODE_ODL, PIN(E, 3), GPIO_INPUT) /* Case Closed Debug Mode */ GPIO(EC_BATT_PRES_ODL, PIN(E, 5), GPIO_INPUT) /* Battery Present */ /* PMIC/AP 1.8V */ |