From 7d727e6ec9d487530c909027adcaa0d91c9794d2 Mon Sep 17 00:00:00 2001 From: "arthur.lin" Date: Mon, 8 May 2023 14:14:05 +0800 Subject: boxy: remove barreljack related code Remove barreljack related code. Default use type-c port0 as power source for bring up. BUG=none TEST=make -j BOARD=boxy TEST=flash boxy ec on dibbi, and it can power on by type-c AC only Change-Id: I92ca1a1fdd8dd2c5eeeba02f217771ddbbe792e5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4505786 Commit-Queue: Arthur Lin Tested-by: Arthur Lin Reviewed-by: Derek Huang --- board/boxy/board.c | 67 ++++------------------------------------------------- board/boxy/board.h | 1 - board/boxy/gpio.inc | 1 - 3 files changed, 4 insertions(+), 65 deletions(-) (limited to 'board') diff --git a/board/boxy/board.c b/board/boxy/board.c index e02bb17462..10ad5aec30 100644 --- a/board/boxy/board.c +++ b/board/boxy/board.c @@ -158,8 +158,6 @@ BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); void board_init(void) { - gpio_enable_interrupt(GPIO_BJ_ADP_PRESENT); - /* Enable PPC interrupt */ gpio_enable_interrupt(GPIO_USB_C0_FAULT_L); } @@ -219,50 +217,6 @@ void board_pd_vconn_ctrl(int port, enum usbpd_cc_pin cc_pin, int enabled) * - CHARGE_PORT_NONE will never be selected. */ -/* List of BJ adapters */ -enum bj_adapter { - BJ_NONE, - BJ_65W_19V, -}; - -/* Barrel-jack power adapter ratings. */ -static const struct charge_port_info bj_adapters[] = { - [BJ_NONE] = { .current = 0, .voltage = 0 }, - [BJ_65W_19V] = { .current = 3420, .voltage = 19000 }, -}; -#define BJ_ADP_RATING_DEFAULT BJ_65W_19V /* BJ power ratings default */ -#define ADP_DEBOUNCE_MS 1000 /* Debounce time for BJ plug/unplug */ - -/* Debounced connection state of the barrel jack */ -static int8_t bj_adp_connected = -1; -static void adp_connect_deferred(void) -{ - const struct charge_port_info *pi; - int connected = gpio_get_level(GPIO_BJ_ADP_PRESENT); - - /* Debounce */ - if (connected == bj_adp_connected) - return; - - if (connected) { - pi = &bj_adapters[BJ_ADP_RATING_DEFAULT]; - } else { - /* No barrel-jack, zero out this power supply */ - pi = &bj_adapters[BJ_NONE]; - } - /* This will result in a call to board_set_active_charge_port */ - charge_manager_update_charge(CHARGE_SUPPLIER_DEDICATED, - DEDICATED_CHARGE_PORT, pi); - bj_adp_connected = connected; -} -DECLARE_DEFERRED(adp_connect_deferred); - -/* IRQ for BJ plug/unplug. It shouldn't be called if BJ is the power source. */ -void adp_connect_interrupt(enum gpio_signal signal) -{ - hook_call_deferred(&adp_connect_deferred_data, ADP_DEBOUNCE_MS * MSEC); -} - int board_set_active_charge_port(int port) { const int active_port = charge_manager_get_active_charge_port(); @@ -280,8 +234,6 @@ int board_set_active_charge_port(int port) return EC_ERROR_INVAL; if (!chipset_in_state(CHIPSET_STATE_ANY_OFF)) { - int bj_requested; - if (charge_manager_get_active_charge_port() != CHARGE_PORT_NONE) /* Change is only permitted while the system is off */ return EC_ERROR_INVAL; @@ -292,9 +244,8 @@ int board_set_active_charge_port(int port) * reinitializing after sysjump). Reject requests that aren't * in sync with our outputs. */ - bj_requested = port == CHARGE_PORT_BARRELJACK; - if (bj_adp_connected != bj_requested) - return EC_ERROR_INVAL; + + /* TODO: add this part after two type-c function is finished. */ } CPRINTUSB("New charger p%d", port); @@ -323,25 +274,15 @@ static void board_charge_manager_init(void) charge_manager_update_charge(j, i, NULL); } - port = gpio_get_level(GPIO_BJ_ADP_PRESENT) ? CHARGE_PORT_BARRELJACK : - CHARGE_PORT_TYPEC0; - CPRINTUSB("Power source is p%d (%s)", port, - port == CHARGE_PORT_TYPEC0 ? "USB-C" : "BJ"); + port = CHARGE_PORT_TYPEC0; + CPRINTUSB("Power source is p%d (USB-C)", port); /* Initialize the power source supplier */ switch (port) { case CHARGE_PORT_TYPEC0: typec_set_input_current_limit(port, 3000, 5000); break; - case CHARGE_PORT_BARRELJACK: - charge_manager_update_charge( - CHARGE_SUPPLIER_DEDICATED, DEDICATED_CHARGE_PORT, - &bj_adapters[BJ_ADP_RATING_DEFAULT]); - break; } - - /* Report charge state from the barrel jack. */ - adp_connect_deferred(); } DECLARE_HOOK(HOOK_INIT, board_charge_manager_init, HOOK_PRIO_INIT_CHARGE_MANAGER + 1); diff --git a/board/boxy/board.h b/board/boxy/board.h index ebca354ef3..5d7c7e99dd 100644 --- a/board/boxy/board.h +++ b/board/boxy/board.h @@ -131,7 +131,6 @@ enum charge_port { CHARGE_PORT_TYPEC0, - CHARGE_PORT_BARRELJACK, }; enum usbc_port { USBC_PORT_C0 = 0, USBC_PORT_COUNT }; diff --git a/board/boxy/gpio.inc b/board/boxy/gpio.inc index c18408d1cc..c21ff3e870 100644 --- a/board/boxy/gpio.inc +++ b/board/boxy/gpio.inc @@ -43,7 +43,6 @@ GPIO_INT(EC_WP_OD, PIN(A, 6), GPIO_INT_BOTH, switch_interrupt) GPIO_INT(EC_RECOVERY_BTN_OD, PIN(K, 7), GPIO_INT_BOTH, button_interrupt) /* Recovery button input from H1 */ GPIO_INT(H1_EC_RECOVERY_BTN_ODL, PIN(K, 4), GPIO_INT_BOTH, button_interrupt) -GPIO_INT(BJ_ADP_PRESENT, PIN(A, 7), GPIO_INT_BOTH, adp_connect_interrupt) GPIO_INT(USB_C0_FAULT_L, PIN(K, 0), GPIO_INT_FALLING, ppc_interrupt) GPIO_INT(USB_C1_FAULT_L, PIN(K, 3), GPIO_INT_FALLING, ppc_interrupt) -- cgit v1.2.1