diff options
| author | Devin Lu <devin.lu@quantatw.com> | 2020-06-20 19:05:06 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-22 20:40:07 +0000 |
| commit | 9009125752041c05fdb288935aa1f3906ce2997e (patch) | |
| tree | 366db14f7dbe3cd750b4cb8855101714723f6068 | |
| parent | e2cbaec65479a7bb80afc773002a25d3ec3ee322 (diff) | |
| download | chrome-ec-9009125752041c05fdb288935aa1f3906ce2997e.tar.gz | |
drawcia: remove board version 0 unused code
BUG=none
BRANCH=none
TEST=make -j buildall
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: Ief6645b4103fd91a3441f2bcec3dd6fe13e25eb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2255827
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
| -rw-r--r-- | board/drawcia/board.c | 17 | ||||
| -rw-r--r-- | board/drawcia/gpio.inc | 3 |
2 files changed, 4 insertions, 16 deletions
diff --git a/board/drawcia/board.c b/board/drawcia/board.c index e3fabb08b4..849c172066 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -44,9 +44,6 @@ #define INT_RECHECK_US 5000 -/* C1 interrupt line swapped between board versions, track it in a variable */ -static enum gpio_signal c1_int_line; - /* C0 interrupt line shared by BC 1.2 and charger */ static void check_c0_line(void); DECLARE_DEFERRED(check_c0_line); @@ -98,7 +95,7 @@ static void check_c1_line(void) * If line is still being held low, see if there's more to process from * one of the chips. */ - if (!gpio_get_level(c1_int_line)) { + if (!gpio_get_level(GPIO_USB_C1_INT_ODL)) { notify_c1_chips(); hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); } @@ -200,16 +197,8 @@ void board_init(void) { int on; - if (system_get_board_version() <= 0) { - pd_set_max_voltage(5000); - c1_int_line = GPIO_USB_C1_INT_V0_ODL; - } else { - c1_int_line = GPIO_USB_C1_INT_V1_ODL; - } - - gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); - gpio_enable_interrupt(c1_int_line); + gpio_enable_interrupt(GPIO_USB_C1_INT_ODL); gpio_enable_interrupt(GPIO_USB_C0_CCSBU_OVP_ODL); /* Charger on the MB will be outputting PROCHOT_ODL and OD CHG_DET */ @@ -255,7 +244,7 @@ uint16_t tcpc_get_alert_status(void) int regval; /* Check whether TCPC 1 pulled the shared interrupt line */ - if (!gpio_get_level(c1_int_line)) { + if (!gpio_get_level(GPIO_USB_C1_INT_ODL)) { if (!tcpc_read16(1, TCPC_REG_ALERT, ®val)) { if (regval) status = PD_STATUS_TCPC_ALERT_1; diff --git a/board/drawcia/gpio.inc b/board/drawcia/gpio.inc index cfa9841d5e..df8524c7c2 100644 --- a/board/drawcia/gpio.inc +++ b/board/drawcia/gpio.inc @@ -30,8 +30,7 @@ GPIO_INT(UART1_RX, PIN(B, 0), GPIO_INT_BOTH, uart_deepsleep_interrupt) /* UART_ /* USB-C interrupts */ GPIO_INT(USB_C0_INT_ODL, PIN(K, 0), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c0_interrupt) /* BC12 and charger */ -GPIO_INT(USB_C1_INT_V0_ODL, PIN(B, 5), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c1_interrupt) /* TCPC, charger, BC12 - board version 0 */ -GPIO_INT(USB_C1_INT_V1_ODL, PIN(E, 6), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c1_interrupt) /* TCPC, charger, BC12 - board version 1 */ +GPIO_INT(USB_C1_INT_ODL, PIN(E, 6), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c1_interrupt) /* TCPC, charger, BC12 */ GPIO_INT(USB_C0_CCSBU_OVP_ODL, PIN(K, 6), GPIO_INT_FALLING | GPIO_PULL_UP, c0_ccsbu_ovp_interrupt) /* Fault protection */ /* Other interrupts */ |