Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main

This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.

Reason for revert: broken build due to ec-utils.

Original change's description:
> Merge remote-tracking branch cros/main into factory-brya-14517.B-main
>
> Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
> baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
>
> Relevant changes:
>
> git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
> board/anahera board/banshee board/brya board/crota board/felwinter
> board/gimble board/kano board/mithrax board/osiris board/primus
> board/redrix board/taeko board/taniks board/vell board/volmar
> driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
> driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
> driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
> driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
> include/intel_x86.h power/alderlake* power/intel_x86.c
> util/getversion.sh
>
> e6da633c38 driver: Sort header files
> 234a87ae2d tcpci: Add FRS enable to driver structure
> a56be59ccd tcpm_header: add test for tcpm_dump_registers
> 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
> e420c8ff9a marasov: Modify TypeC and TypeA configuration.
> 43b53e0045 Add default implementation of board_set_charge_limit
> b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
> f1b563c350 baseboard: Sort header files
> 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
> ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
> 8f89f69a5b crota: disable lid angle sensor for clamshell
>
> BRANCH=None
> BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
> BUG=b:163093572 b:254328661
> TEST=`emerge-brya chromeos-ec`
>
> Force-Relevant-Builds: all
> Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
> Signed-off-by: YH Lin <yueherngl@google.com>

Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>

7 files changed, 0 insertions, 586 deletions

diff --git a/zephyr/program/nissa/pujjo/src/charger.c b/zephyr/program/nissa/pujjo/src/charger.c
deleted file mode 100644
index 8763f24793..0000000000
--- a/zephyr/program/nissa/pujjo/src/charger.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "battery.h"
-#include "charger.h"
-#include "charger/isl923x_public.h"
-#include "console.h"
-#include "driver/charger/isl923x.h"
-#include "driver/tcpm/raa489000.h"
-#include "extpower.h"
-#include "hooks.h"
-#include "nissa_common.h"
-#include "usb_pd.h"
-
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
-
-int extpower_is_present(void)
-{
-	int port;
-	int rv;
-	bool acok;
-
-	for (port = 0; port < board_get_usb_pd_port_count(); port++) {
-		rv = raa489000_is_acok(port, &acok);
-		if ((rv == EC_SUCCESS) && acok)
-			return 1;
-	}
-
-	return 0;
-}
-
-/*
- * Pujjo does not have a GPIO indicating whether extpower is present,
- * so detect using the charger(s).
- */
-__override void board_check_extpower(void)
-{
-	static int last_extpower_present;
-	int extpower_present = extpower_is_present();
-
-	if (last_extpower_present ^ extpower_present)
-		extpower_handle_update(extpower_present);
-
-	last_extpower_present = extpower_present;
-}
-
-__override void board_hibernate(void)
-{
-	/* Shut down the chargers */
-	raa489000_hibernate(0, true);
-	LOG_INF("Charger(s) hibernated");
-	cflush();
-}
-
-static void charger_prochot_init(void)
-{
-	isl923x_set_ac_prochot(CHARGER_SOLO, 3500);
-	isl923x_set_dc_prochot(CHARGER_SOLO, 6528);
-}
-DECLARE_HOOK(HOOK_INIT, charger_prochot_init, HOOK_PRIO_POST_FIRST);
diff --git a/zephyr/program/nissa/pujjo/src/fan.c b/zephyr/program/nissa/pujjo/src/fan.c
deleted file mode 100644
index 8b8634a653..0000000000
--- a/zephyr/program/nissa/pujjo/src/fan.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "cros_cbi.h"
-#include "fan.h"
-#include "gpio/gpio.h"
-#include "hooks.h"
-#include "nissa_common.h"
-
-#include <zephyr/devicetree.h>
-#include <zephyr/drivers/gpio.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
-
-/*
- * Pujjo fan support
- */
-static void fan_init(void)
-{
-	int ret;
-	uint32_t val;
-	/*
-	 * Retrieve the fan config.
-	 */
-	ret = cros_cbi_get_fw_config(FW_FAN, &val);
-	if (ret != 0) {
-		LOG_ERR("Error retrieving CBI FW_CONFIG field %d", FW_FAN);
-		return;
-	}
-	if (val != FW_FAN_PRESENT) {
-		/* Disable the fan */
-		fan_set_count(0);
-	} else {
-		/* Configure the fan enable GPIO */
-		gpio_pin_configure_dt(GPIO_DT_FROM_NODELABEL(gpio_fan_enable),
-				      GPIO_OUTPUT);
-	}
-}
-DECLARE_HOOK(HOOK_INIT, fan_init, HOOK_PRIO_POST_FIRST);
diff --git a/zephyr/program/nissa/pujjo/src/form_factor.c b/zephyr/program/nissa/pujjo/src/form_factor.c
deleted file mode 100644
index f160c88d78..0000000000
--- a/zephyr/program/nissa/pujjo/src/form_factor.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "accelgyro.h"
-#include "button.h"
-#include "cros_board_info.h"
-#include "cros_cbi.h"
-#include "driver/accel_bma4xx.h"
-#include "driver/accel_lis2dw12_public.h"
-#include "driver/accelgyro_bmi323.h"
-#include "driver/accelgyro_lsm6dsm.h"
-#include "gpio/gpio_int.h"
-#include "hooks.h"
-#include "motion_sense.h"
-#include "motionsense_sensors.h"
-#include "nissa_common.h"
-#include "tablet_mode.h"
-
-#include <zephyr/devicetree.h>
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
-
-static bool use_alt_sensor;
-static bool use_alt_lid_accel;
-
-void motion_interrupt(enum gpio_signal signal)
-{
-	if (use_alt_sensor)
-		lsm6dsm_interrupt(signal);
-	else
-		bmi3xx_interrupt(signal);
-}
-
-void lid_accel_interrupt(enum gpio_signal signal)
-{
-	if (use_alt_lid_accel)
-		lis2dw12_interrupt(signal);
-	else
-		bma4xx_interrupt(signal);
-}
-
-static void sensor_init(void)
-{
-	int ret;
-	uint32_t val;
-	/* check which sensors are installed */
-	use_alt_sensor = cros_cbi_ssfc_check_match(
-		CBI_SSFC_VALUE_ID(DT_NODELABEL(base_sensor_1)));
-	use_alt_lid_accel = cros_cbi_ssfc_check_match(
-		CBI_SSFC_VALUE_ID(DT_NODELABEL(lid_sensor_1)));
-
-	motion_sensors_check_ssfc();
-
-	/* Check if it's tablet or not */
-	ret = cros_cbi_get_fw_config(FW_TABLET, &val);
-	if (ret != 0) {
-		LOG_ERR("Error retrieving CBI FW_CONFIG field %d", FW_TABLET);
-		return;
-	}
-	if (val == FW_TABLET_NOT_PRESENT) {
-		LOG_INF("Clamshell: disable motionsense function.");
-		motion_sensor_count = 0;
-		gmr_tablet_switch_disable();
-		gpio_disable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_imu));
-		gpio_pin_configure_dt(GPIO_DT_FROM_NODELABEL(gpio_imu_int_l),
-				      GPIO_DISCONNECTED);
-
-		LOG_INF("Clamshell: disable volume button function.");
-		button_disable_gpio(BUTTON_VOLUME_UP);
-		button_disable_gpio(BUTTON_VOLUME_DOWN);
-	} else {
-		LOG_INF("Tablet: Enable motionsense function.");
-	}
-}
-DECLARE_HOOK(HOOK_INIT, sensor_init, HOOK_PRIO_POST_I2C);
diff --git a/zephyr/program/nissa/pujjo/src/hdmi.c b/zephyr/program/nissa/pujjo/src/hdmi.c
deleted file mode 100644
index 9461e7c53e..0000000000
--- a/zephyr/program/nissa/pujjo/src/hdmi.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "nissa_hdmi.h"
-
-__override void nissa_configure_hdmi_power_gpios(void)
-{
-	/* Pujjo needs to drive VCC enable but not core rails */
-	nissa_configure_hdmi_vcc();
-}
diff --git a/zephyr/program/nissa/pujjo/src/keyboard.c b/zephyr/program/nissa/pujjo/src/keyboard.c
deleted file mode 100644
index 1587030080..0000000000
--- a/zephyr/program/nissa/pujjo/src/keyboard.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "ec_commands.h"
-
-static const struct ec_response_keybd_config pujjo_kb = {
-	.num_top_row_keys = 10,
-	.action_keys = {
-		TK_BACK,		/* T1 */
-		TK_REFRESH,		/* T2 */
-		TK_FULLSCREEN,		/* T3 */
-		TK_OVERVIEW,		/* T4 */
-		TK_BRIGHTNESS_DOWN,	/* T5 */
-		TK_BRIGHTNESS_UP,	/* T6 */
-		TK_MICMUTE,		/* T7 */
-		TK_VOL_MUTE,		/* T8 */
-		TK_VOL_DOWN,		/* T9 */
-		TK_VOL_UP,		/* T10 */
-	},
-	.capabilities = KEYBD_CAP_SCRNLOCK_KEY,
-};
-
-__override const struct ec_response_keybd_config *
-board_vivaldi_keybd_config(void)
-{
-	return &pujjo_kb;
-}
diff --git a/zephyr/program/nissa/pujjo/src/led.c b/zephyr/program/nissa/pujjo/src/led.c
deleted file mode 100644
index 4d859f2764..0000000000
--- a/zephyr/program/nissa/pujjo/src/led.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* Pujjo specific PWM LED settings: there are 2 LEDs on each side of the board,
- * each one can be controlled separately. The LED colors are white or amber,
- * and the default behavior is tied to the charging process: both sides are
- * amber while charging the battery and white when the battery is charged.
- */
-
-#include "common.h"
-#include "gpio.h"
-#include "led_common.h"
-#include "led_onoff_states.h"
-
-#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ##args)
-#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ##args)
-
-#define LED_OFF_LVL 1
-#define LED_ON_LVL 0
-
-__override const int led_charge_lvl_1 = 5;
-
-__override const int led_charge_lvl_2 = 97;
-
-__override struct led_descriptor
-	led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = {
-		[STATE_CHARGING_LVL_1] = { { EC_LED_COLOR_RED,
-					     LED_INDEFINITE } },
-		[STATE_CHARGING_LVL_2] = { { EC_LED_COLOR_AMBER,
-					     LED_INDEFINITE } },
-		[STATE_CHARGING_FULL_CHARGE] = { { EC_LED_COLOR_GREEN,
-						   LED_INDEFINITE } },
-		[STATE_DISCHARGE_S0] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_DISCHARGE_S3] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_DISCHARGE_S5] = { { LED_OFF, LED_INDEFINITE } },
-		[STATE_BATTERY_ERROR] = { { EC_LED_COLOR_RED, 1 * LED_ONE_SEC },
-					  { LED_OFF, 1 * LED_ONE_SEC } },
-		[STATE_FACTORY_TEST] = { { EC_LED_COLOR_RED, 2 * LED_ONE_SEC },
-					 { EC_LED_COLOR_GREEN,
-					   2 * LED_ONE_SEC } },
-	};
-
-__override const struct led_descriptor
-	led_pwr_state_table[PWR_LED_NUM_STATES][LED_NUM_PHASES] = {
-		[PWR_LED_STATE_ON] = { { EC_LED_COLOR_WHITE, LED_INDEFINITE } },
-		[PWR_LED_STATE_SUSPEND_AC] = { { EC_LED_COLOR_WHITE,
-						 3 * LED_ONE_SEC },
-					       { LED_OFF, 0.5 * LED_ONE_SEC } },
-		[PWR_LED_STATE_SUSPEND_NO_AC] = { { EC_LED_COLOR_WHITE,
-						    3 * LED_ONE_SEC },
-						  { LED_OFF,
-						    0.5 * LED_ONE_SEC } },
-		[PWR_LED_STATE_OFF] = { { LED_OFF, LED_INDEFINITE } },
-	};
-
-const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED,
-					     EC_LED_ID_POWER_LED };
-
-const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
-
-__override void led_set_color_power(enum ec_led_colors color)
-{
-	if (color == EC_LED_COLOR_WHITE)
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_power_led),
-				LED_ON_LVL);
-	else
-		/* LED_OFF and unsupported colors */
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_power_led),
-				LED_OFF_LVL);
-}
-
-__override void led_set_color_battery(enum ec_led_colors color)
-{
-	switch (color) {
-	case EC_LED_COLOR_AMBER:
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_1_odl),
-				LED_ON_LVL);
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_2_odl),
-				LED_ON_LVL);
-		break;
-	case EC_LED_COLOR_RED:
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_1_odl),
-				LED_ON_LVL);
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_2_odl),
-				LED_OFF_LVL);
-		break;
-	case EC_LED_COLOR_GREEN:
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_1_odl),
-				LED_OFF_LVL);
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_2_odl),
-				LED_ON_LVL);
-		break;
-	default: /* LED_OFF and other unsupported colors */
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_1_odl),
-				LED_OFF_LVL);
-		gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_led_2_odl),
-				LED_OFF_LVL);
-		break;
-	}
-}
-
-void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
-{
-	if (led_id == EC_LED_ID_BATTERY_LED) {
-		brightness_range[EC_LED_COLOR_RED] = 1;
-		brightness_range[EC_LED_COLOR_AMBER] = 1;
-		brightness_range[EC_LED_COLOR_GREEN] = 1;
-	} else if (led_id == EC_LED_ID_POWER_LED) {
-		brightness_range[EC_LED_COLOR_WHITE] = 1;
-	}
-}
-
-int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
-{
-	if (led_id == EC_LED_ID_BATTERY_LED) {
-		if (brightness[EC_LED_COLOR_RED] != 0)
-			led_set_color_battery(EC_LED_COLOR_RED);
-		else if (brightness[EC_LED_COLOR_AMBER] != 0)
-			led_set_color_battery(EC_LED_COLOR_AMBER);
-		else if (brightness[EC_LED_COLOR_GREEN] != 0)
-			led_set_color_battery(EC_LED_COLOR_GREEN);
-		else
-			led_set_color_battery(LED_OFF);
-	} else if (led_id == EC_LED_ID_POWER_LED) {
-		if (brightness[EC_LED_COLOR_WHITE] != 0)
-			led_set_color_power(EC_LED_COLOR_WHITE);
-		else
-			led_set_color_power(LED_OFF);
-	}
-
-	return EC_SUCCESS;
-}
diff --git a/zephyr/program/nissa/pujjo/src/usbc.c b/zephyr/program/nissa/pujjo/src/usbc.c
deleted file mode 100644
index ac93edfd7a..0000000000
--- a/zephyr/program/nissa/pujjo/src/usbc.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/* Copyright 2022 The ChromiumOS Authors
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "charge_state_v2.h"
-#include "chipset.h"
-#include "driver/charger/isl923x_public.h"
-#include "driver/retimer/anx7483_public.h"
-#include "driver/tcpm/raa489000.h"
-#include "driver/tcpm/tcpci.h"
-#include "hooks.h"
-#include "nissa_common.h"
-#include "system.h"
-#include "usb_mux.h"
-
-#include <zephyr/logging/log.h>
-
-LOG_MODULE_DECLARE(nissa, CONFIG_NISSA_LOG_LEVEL);
-
-int board_is_sourcing_vbus(int port)
-{
-	int regval;
-
-	tcpc_read(port, TCPC_REG_POWER_STATUS, &regval);
-	return !!(regval & TCPC_REG_POWER_STATUS_SOURCING_VBUS);
-}
-
-int board_set_active_charge_port(int port)
-{
-	int is_real_port = (port >= 0 && port < CONFIG_USB_PD_PORT_MAX_COUNT);
-	int i;
-	int old_port;
-
-	if (!is_real_port && port != CHARGE_PORT_NONE)
-		return EC_ERROR_INVAL;
-
-	old_port = charge_manager_get_active_charge_port();
-
-	LOG_INF("New chg p%d", port);
-
-	/* Disable all ports. */
-	if (port == CHARGE_PORT_NONE) {
-		for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) {
-			tcpc_write(i, TCPC_REG_COMMAND,
-				   TCPC_REG_COMMAND_SNK_CTRL_LOW);
-			raa489000_enable_asgate(i, false);
-		}
-
-		return EC_SUCCESS;
-	}
-
-	/* Check if port is sourcing VBUS. */
-	if (board_is_sourcing_vbus(port)) {
-		LOG_WRN("Skip enable p%d", port);
-		return EC_ERROR_INVAL;
-	}
-
-	/*
-	 * Turn off the other ports' sink path FETs, before enabling the
-	 * requested charge port.
-	 */
-	for (i = 0; i < CONFIG_USB_PD_PORT_MAX_COUNT; i++) {
-		if (i == port)
-			continue;
-
-		if (tcpc_write(i, TCPC_REG_COMMAND,
-			       TCPC_REG_COMMAND_SNK_CTRL_LOW))
-			LOG_WRN("p%d: sink path disable failed.", i);
-		raa489000_enable_asgate(i, false);
-	}
-
-	/*
-	 * Stop the charger IC from switching while changing ports.  Otherwise,
-	 * we can overcurrent the adapter we're switching to. (crbug.com/926056)
-	 */
-	if (old_port != CHARGE_PORT_NONE)
-		charger_discharge_on_ac(1);
-
-	/* Enable requested charge port. */
-	if (raa489000_enable_asgate(port, true) ||
-	    tcpc_write(port, TCPC_REG_COMMAND,
-		       TCPC_REG_COMMAND_SNK_CTRL_HIGH)) {
-		LOG_WRN("p%d: sink path enable failed.", port);
-		charger_discharge_on_ac(0);
-		return EC_ERROR_UNKNOWN;
-	}
-
-	/* Allow the charger IC to begin/continue switching. */
-	charger_discharge_on_ac(0);
-
-	return EC_SUCCESS;
-}
-
-uint16_t tcpc_get_alert_status(void)
-{
-	uint16_t status = 0;
-	int regval;
-
-	/*
-	 * The interrupt line is shared between the TCPC and BC1.2 detector IC.
-	 * Therefore, go out and actually read the alert registers to report the
-	 * alert status.
-	 */
-	if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_int_odl))) {
-		if (!tcpc_read16(0, TCPC_REG_ALERT, &regval)) {
-			/* The TCPCI Rev 1.0 spec says to ignore bits 14:12. */
-			if (!(tcpc_config[0].flags & TCPC_FLAGS_TCPCI_REV2_0))
-				regval &= ~((1 << 14) | (1 << 13) | (1 << 12));
-
-			if (regval)
-				status |= PD_STATUS_TCPC_ALERT_0;
-		}
-	}
-	return status;
-}
-
-void pd_power_supply_reset(int port)
-{
-	/* Disable VBUS */
-	tcpc_write(port, TCPC_REG_COMMAND, TCPC_REG_COMMAND_SRC_CTRL_LOW);
-
-	/* Notify host of power info change. */
-	pd_send_host_event(PD_EVENT_POWER_CHANGE);
-}
-
-__override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp)
-{
-	if (port < 0 || port >= CONFIG_USB_PD_PORT_MAX_COUNT)
-		return;
-
-	raa489000_set_output_current(port, rp);
-}
-
-int pd_set_power_supply_ready(int port)
-{
-	int rv;
-
-	if (port >= CONFIG_USB_PD_PORT_MAX_COUNT)
-		return EC_ERROR_INVAL;
-
-	/* Disable charging. */
-	rv = tcpc_write(port, TCPC_REG_COMMAND, TCPC_REG_COMMAND_SNK_CTRL_LOW);
-	if (rv)
-		return rv;
-
-	/* Our policy is not to source VBUS when the AP is off. */
-	if (chipset_in_state(CHIPSET_STATE_ANY_OFF))
-		return EC_ERROR_NOT_POWERED;
-
-	/* Provide Vbus. */
-	rv = tcpc_write(port, TCPC_REG_COMMAND, TCPC_REG_COMMAND_SRC_CTRL_HIGH);
-	if (rv)
-		return rv;
-
-	rv = raa489000_enable_asgate(port, true);
-	if (rv)
-		return rv;
-
-	/* Notify host of power info change. */
-	pd_send_host_event(PD_EVENT_POWER_CHANGE);
-
-	return EC_SUCCESS;
-}
-
-void board_reset_pd_mcu(void)
-{
-	/*
-	 * TODO(b:147316511): could send a reset command to the TCPC here
-	 * if needed.
-	 */
-}
-
-/*
- * Because the TCPCs and BC1.2 chips share interrupt lines, it's possible
- * for an interrupt to be lost if one asserts the IRQ, the other does the same
- * then the first releases it: there will only be one falling edge to trigger
- * the interrupt, and the line will be held low. We handle this by running a
- * deferred check after a falling edge to see whether the IRQ is still being
- * asserted. If it is, we assume an interrupt may have been lost and we need
- * to poll each chip for events again.
- */
-#define USBC_INT_POLL_DELAY_US 5000
-
-static void poll_c0_int(void);
-DECLARE_DEFERRED(poll_c0_int);
-
-static void usbc_interrupt_trigger(int port)
-{
-	schedule_deferred_pd_interrupt(port);
-	usb_charger_task_set_event(port, USB_CHG_EVENT_BC12);
-}
-
-static inline void poll_usb_gpio(int port, const struct gpio_dt_spec *gpio,
-				 const struct deferred_data *ud)
-{
-	if (!gpio_pin_get_dt(gpio)) {
-		usbc_interrupt_trigger(port);
-		hook_call_deferred(ud, USBC_INT_POLL_DELAY_US);
-	}
-}
-
-static void poll_c0_int(void)
-{
-	poll_usb_gpio(0, GPIO_DT_FROM_NODELABEL(gpio_usb_c0_int_odl),
-		      &poll_c0_int_data);
-}
-
-void usb_interrupt(enum gpio_signal signal)
-{
-	int port;
-	const struct deferred_data *ud;
-
-	if (signal == GPIO_SIGNAL(DT_NODELABEL(gpio_usb_c0_int_odl))) {
-		port = 0;
-		ud = &poll_c0_int_data;
-	}
-	/*
-	 * We've just been called from a falling edge, so there's definitely
-	 * no lost IRQ right now. Cancel any pending check.
-	 */
-	hook_call_deferred(ud, -1);
-	/* Trigger polling of TCPC and BC1.2 in respective tasks */
-	usbc_interrupt_trigger(port);
-	/* Check for lost interrupts in a bit */
-	hook_call_deferred(ud, USBC_INT_POLL_DELAY_US);
-}