cherry: initial EC image

Copied from Asurada, with minimal changes to copyright header and
makefile to make it compilable and let linter happy.

BUG=b:178158810
TEST=make BOARD=cherry -j32
BRANCH=main

Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: Ibf75df48336203fd84885856f971fea24f4ea288
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2730642
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>

7 files changed, 884 insertions, 0 deletions

diff --git a/board/cherry/battery.c b/board/cherry/battery.c
new file mode 100644
index 0000000000..f681008b98
--- /dev/null
+++ b/board/cherry/battery.c
@@ -0,0 +1,75 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "battery.h"
+#include "battery_fuel_gauge.h"
+#include "battery_smart.h"
+#include "charge_manager.h"
+#include "chipset.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "system.h"
+#include "usb_pd.h"
+
+const struct board_batt_params board_battery_info[] = {
+	[BATTERY_C235] = {
+		.fuel_gauge = {
+			.manuf_name = "AS3GWRc3KA",
+			.device_name = "C235-41",
+			.ship_mode = {
+				.reg_addr = 0x0,
+				.reg_data = { 0x10, 0x10 },
+			},
+			.fet = {
+				.reg_addr = 0x99,
+				.reg_mask = 0x0c,
+				.disconnect_val = 0x0c,
+			}
+		},
+		.batt_info = {
+			.voltage_max		= 8800,
+			.voltage_normal		= 7700,
+			.voltage_min		= 6000,
+			.precharge_current	= 256,
+			.start_charging_min_c	= 0,
+			.start_charging_max_c	= 45,
+			.charging_min_c		= 0,
+			.charging_max_c		= 60,
+			.discharging_min_c	= 0,
+			.discharging_max_c	= 60,
+		},
+	},
+};
+BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT);
+
+const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_C235;
+
+static void reduce_input_voltage_when_full(void)
+{
+	struct batt_params batt;
+	int max_pd_voltage_mv;
+	int active_chg_port;
+
+	if (!system_is_locked())
+		return;
+
+	active_chg_port = charge_manager_get_active_charge_port();
+	if (active_chg_port == CHARGE_PORT_NONE)
+		return;
+
+	battery_get_params(&batt);
+	/* Lower our input voltage to 9V when battery is full. */
+	if (!(batt.flags & BATT_FLAG_BAD_STATUS) &&
+	    (batt.status & STATUS_FULLY_CHARGED) &&
+	    chipset_in_state(CHIPSET_STATE_ANY_OFF))
+		max_pd_voltage_mv = 9000;
+	else
+		max_pd_voltage_mv = PD_MAX_VOLTAGE_MV;
+
+	if (pd_get_max_voltage() != max_pd_voltage_mv)
+		pd_set_external_voltage_limit(active_chg_port,
+					      max_pd_voltage_mv);
+}
+DECLARE_HOOK(HOOK_SECOND, reduce_input_voltage_when_full, HOOK_PRIO_DEFAULT);
diff --git a/board/cherry/board.c b/board/cherry/board.c
new file mode 100644
index 0000000000..92820df369
--- /dev/null
+++ b/board/cherry/board.c
@@ -0,0 +1,288 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+/* Asurada board configuration */
+
+#include "adc.h"
+#include "adc_chip.h"
+#include "button.h"
+#include "charge_manager.h"
+#include "charge_state_v2.h"
+#include "charger.h"
+#include "chipset.h"
+#include "common.h"
+#include "console.h"
+#include "driver/accel_lis2dw12.h"
+#include "driver/accelgyro_bmi_common.h"
+#include "driver/als_tcs3400.h"
+#include "driver/bc12/mt6360.h"
+#include "driver/bc12/pi3usb9201.h"
+#include "driver/charger/isl923x.h"
+#include "driver/ppc/syv682x.h"
+#include "driver/tcpm/it83xx_pd.h"
+#include "driver/temp_sensor/thermistor.h"
+#include "driver/usb_mux/it5205.h"
+#include "driver/usb_mux/ps8743.h"
+#include "extpower.h"
+#include "gpio.h"
+#include "hooks.h"
+#include "i2c.h"
+#include "keyboard_scan.h"
+#include "lid_switch.h"
+#include "motion_sense.h"
+#include "power.h"
+#include "power_button.h"
+#include "pwm.h"
+#include "pwm_chip.h"
+#include "regulator.h"
+#include "spi.h"
+#include "switch.h"
+#include "tablet_mode.h"
+#include "task.h"
+#include "temp_sensor.h"
+#include "timer.h"
+#include "uart.h"
+#include "usb_charge.h"
+#include "usb_mux.h"
+#include "usb_pd_tcpm.h"
+#include "usbc_ppc.h"
+
+#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
+#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
+
+/* Initialize board. */
+static void board_init(void)
+{
+	/* Enable motion sensor interrupt */
+	gpio_enable_interrupt(GPIO_BASE_IMU_INT_L);
+	gpio_enable_interrupt(GPIO_LID_ACCEL_INT_L);
+}
+DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
+
+/* Sensor */
+static struct mutex g_base_mutex;
+static struct mutex g_lid_mutex;
+
+static struct bmi_drv_data_t g_bmi160_data;
+static struct stprivate_data g_lis2dwl_data;
+
+#ifdef BOARD_ASURADA_REV0
+/* Matrix to rotate accelerometer into standard reference frame */
+/* for rev 0 */
+static const mat33_fp_t base_standard_ref_rev0 = {
+	{FLOAT_TO_FP(-1), 0, 0},
+	{0, FLOAT_TO_FP(1), 0},
+	{0, 0, FLOAT_TO_FP(-1)},
+};
+
+static void update_rotation_matrix(void)
+{
+	motion_sensors[BASE_ACCEL].rot_standard_ref =
+		&base_standard_ref_rev0;
+	motion_sensors[BASE_GYRO].rot_standard_ref =
+		&base_standard_ref_rev0;
+}
+DECLARE_HOOK(HOOK_INIT, update_rotation_matrix, HOOK_PRIO_INIT_ADC + 2);
+
+/* TCS3400 private data */
+static struct als_drv_data_t g_tcs3400_data = {
+	.als_cal.scale = 1,
+	.als_cal.uscale = 0,
+	.als_cal.offset = 0,
+	.als_cal.channel_scale = {
+		.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kc */
+		.cover_scale = ALS_CHANNEL_SCALE(1.0),     /* CT */
+	},
+};
+
+static struct tcs3400_rgb_drv_data_t g_tcs3400_rgb_data = {
+	/*
+	 * TODO: calculate the actual coefficients and scaling factors
+	 */
+	.calibration.rgb_cal[X] = {
+		.offset = 0,
+		.scale = {
+			.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kr */
+			.cover_scale = ALS_CHANNEL_SCALE(1.0)
+		},
+		.coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0),
+	},
+	.calibration.rgb_cal[Y] = {
+		.offset = 0,
+		.scale = {
+			.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kg */
+			.cover_scale = ALS_CHANNEL_SCALE(1.0)
+		},
+		.coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0.1),
+	},
+	.calibration.rgb_cal[Z] = {
+		.offset = 0,
+		.scale = {
+			.k_channel_scale = ALS_CHANNEL_SCALE(1.0), /* kb */
+			.cover_scale = ALS_CHANNEL_SCALE(1.0)
+		},
+		.coeff[TCS_RED_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_GREEN_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_BLUE_COEFF_IDX] = FLOAT_TO_FP(0),
+		.coeff[TCS_CLEAR_COEFF_IDX] = FLOAT_TO_FP(0),
+	},
+	.calibration.irt = INT_TO_FP(1),
+	.saturation.again = TCS_DEFAULT_AGAIN,
+	.saturation.atime = TCS_DEFAULT_ATIME,
+};
+#endif /* BOARD_ASURADA_REV0 */
+
+#ifdef BOARD_HAYATO
+/* Matrix to rotate accelerometer into standard reference frame */
+/* for Hayato */
+static const mat33_fp_t base_standard_ref = {
+	{0, FLOAT_TO_FP(1), 0},
+	{FLOAT_TO_FP(-1), 0, 0},
+	{0, 0, FLOAT_TO_FP(1)},
+};
+
+static void update_rotation_matrix(void)
+{
+	if (board_get_version() >= 2) {
+		motion_sensors[BASE_ACCEL].rot_standard_ref =
+			&base_standard_ref;
+		motion_sensors[BASE_GYRO].rot_standard_ref =
+			&base_standard_ref;
+	}
+}
+DECLARE_HOOK(HOOK_INIT, update_rotation_matrix, HOOK_PRIO_INIT_ADC + 2);
+#endif
+
+struct motion_sensor_t motion_sensors[] = {
+	/*
+	 * Note: bmi160: supports accelerometer and gyro sensor
+	 * Requirement: accelerometer sensor must init before gyro sensor
+	 * DO NOT change the order of the following table.
+	 */
+	[BASE_ACCEL] = {
+		.name = "Base Accel",
+		.active_mask = SENSOR_ACTIVE_S0_S3,
+		.chip = MOTIONSENSE_CHIP_BMI160,
+		.type = MOTIONSENSE_TYPE_ACCEL,
+		.location = MOTIONSENSE_LOC_BASE,
+		.drv = &bmi160_drv,
+		.mutex = &g_base_mutex,
+		.drv_data = &g_bmi160_data,
+		.port = I2C_PORT_ACCEL,
+		.i2c_spi_addr_flags = BMI160_ADDR0_FLAGS,
+		.rot_standard_ref = NULL, /* identity matrix */
+		.default_range = 4,  /* g, to meet CDD 7.3.1/C-1-4 reqs */
+		.min_frequency = BMI_ACCEL_MIN_FREQ,
+		.max_frequency = BMI_ACCEL_MAX_FREQ,
+		.config = {
+			/* Sensor on for angle detection */
+			[SENSOR_CONFIG_EC_S0] = {
+				.odr = 10000 | ROUND_UP_FLAG,
+				.ec_rate = 100 * MSEC,
+			},
+			/* Sensor on for angle detection */
+			[SENSOR_CONFIG_EC_S3] = {
+				.odr = 10000 | ROUND_UP_FLAG,
+				.ec_rate = 100 * MSEC,
+			},
+		},
+	},
+	[BASE_GYRO] = {
+		.name = "Base Gyro",
+		.active_mask = SENSOR_ACTIVE_S0_S3,
+		.chip = MOTIONSENSE_CHIP_BMI160,
+		.type = MOTIONSENSE_TYPE_GYRO,
+		.location = MOTIONSENSE_LOC_BASE,
+		.drv = &bmi160_drv,
+		.mutex = &g_base_mutex,
+		.drv_data = &g_bmi160_data,
+		.port = I2C_PORT_ACCEL,
+		.i2c_spi_addr_flags = BMI160_ADDR0_FLAGS,
+		.default_range = 1000, /* dps */
+		.rot_standard_ref = NULL, /* identity matrix */
+		.min_frequency = BMI_GYRO_MIN_FREQ,
+		.max_frequency = BMI_GYRO_MAX_FREQ,
+	},
+	[LID_ACCEL] = {
+		.name = "Lid Accel",
+		.active_mask = SENSOR_ACTIVE_S0_S3,
+		.chip = MOTIONSENSE_CHIP_LIS2DWL,
+		.type = MOTIONSENSE_TYPE_ACCEL,
+		.location = MOTIONSENSE_LOC_LID,
+		.drv = &lis2dw12_drv,
+		.mutex = &g_lid_mutex,
+		.drv_data = &g_lis2dwl_data,
+		.int_signal = GPIO_LID_ACCEL_INT_L,
+		.port = I2C_PORT_ACCEL,
+		.i2c_spi_addr_flags = LIS2DWL_ADDR1_FLAGS,
+		.flags = MOTIONSENSE_FLAG_INT_SIGNAL,
+		.rot_standard_ref = NULL, /* identity matrix */
+		.default_range = 2, /* g */
+		.min_frequency = LIS2DW12_ODR_MIN_VAL,
+		.max_frequency = LIS2DW12_ODR_MAX_VAL,
+		.config = {
+			/* EC use accel for angle detection */
+			[SENSOR_CONFIG_EC_S0] = {
+				.odr = 12500 | ROUND_UP_FLAG,
+			},
+			/* Sensor on for lid angle detection */
+			[SENSOR_CONFIG_EC_S3] = {
+				.odr = 10000 | ROUND_UP_FLAG,
+			},
+		},
+	},
+#ifdef BOARD_ASURADA_REV0
+	[CLEAR_ALS] = {
+		.name = "Clear Light",
+		.active_mask = SENSOR_ACTIVE_S0_S3,
+		.chip = MOTIONSENSE_CHIP_TCS3400,
+		.type = MOTIONSENSE_TYPE_LIGHT,
+		.location = MOTIONSENSE_LOC_LID,
+		.drv = &tcs3400_drv,
+		.drv_data = &g_tcs3400_data,
+		.port = I2C_PORT_ACCEL,
+		.i2c_spi_addr_flags = TCS3400_I2C_ADDR_FLAGS,
+		.rot_standard_ref = NULL,
+		.default_range = 0x10000, /* scale = 1x, uscale = 0 */
+		.min_frequency = TCS3400_LIGHT_MIN_FREQ,
+		.max_frequency = TCS3400_LIGHT_MAX_FREQ,
+		.config = {
+			/* Run ALS sensor in S0 */
+			[SENSOR_CONFIG_EC_S0] = {
+				.odr = 1000,
+			},
+		},
+	},
+	[RGB_ALS] = {
+		.name = "RGB Light",
+		.active_mask = SENSOR_ACTIVE_S0_S3,
+		.chip = MOTIONSENSE_CHIP_TCS3400,
+		.type = MOTIONSENSE_TYPE_LIGHT_RGB,
+		.location = MOTIONSENSE_LOC_LID,
+		.drv = &tcs3400_rgb_drv,
+		.drv_data = &g_tcs3400_rgb_data,
+		.rot_standard_ref = NULL,
+		.default_range = 0x10000, /* scale = 1x, uscale = 0 */
+		/* freq = 0 indicates we should not use sensor directly */
+		.min_frequency = 0,
+		.max_frequency = 0,
+	},
+#endif /* BOARD_ASURADA_REV0 */
+};
+const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors);
+
+int board_accel_force_mode_mask(void)
+{
+	int version = board_get_version();
+
+	if (version == -1 || version >= 2)
+		return 0;
+	return BIT(LID_ACCEL);
+}
diff --git a/board/cherry/board.h b/board/cherry/board.h
new file mode 100644
index 0000000000..712b099cec
--- /dev/null
+++ b/board/cherry/board.h
@@ -0,0 +1,109 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+/* Asurada board configuration */
+
+#ifndef __CROS_EC_BOARD_H
+#define __CROS_EC_BOARD_H
+
+#include "baseboard.h"
+
+/* Chipset config */
+#define CONFIG_BRINGUP
+
+/* Optional features */
+#define CONFIG_SYSTEM_UNLOCKED
+#define CONFIG_LTO
+
+/*
+ * TODO: Remove this option once the VBAT no longer keeps high when
+ * system's power isn't presented.
+ */
+#define CONFIG_IT83XX_RESET_PD_CONTRACT_IN_BRAM
+
+/* BC12 */
+/* TODO(b/159583342): remove after rev0 deprecated */
+#define CONFIG_MT6360_BC12_GPIO
+
+/* LED */
+#ifdef BOARD_HAYATO
+#define CONFIG_LED_POWER_LED
+#define CONFIG_LED_ONOFF_STATES
+#define CONFIG_LED_ONOFF_STATES_BAT_LOW 10
+#endif
+
+/* PD / USB-C / PPC */
+#define CONFIG_USB_PD_DEBUG_LEVEL 3
+
+/* Optional console commands */
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_SCRATCHPAD
+#define CONFIG_CMD_STACKOVERFLOW
+
+/* Sensor */
+#define CONFIG_GMR_TABLET_MODE
+#define CONFIG_TABLET_MODE
+#define CONFIG_TABLET_MODE_SWITCH
+#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L
+
+#define CONFIG_ACCELGYRO_BMI160 /* Base accel */
+#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL)
+
+#define CONFIG_ACCEL_LIS2DWL
+#define CONFIG_ACCEL_LIS2DW_AS_BASE
+#define CONFIG_ACCEL_LIS2DW12_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL)
+
+#define CONFIG_LID_ANGLE
+#define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL
+#define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL
+#define CONFIG_LID_ANGLE_UPDATE
+
+#ifdef BOARD_ASURADA_REV0
+#define CONFIG_ALS
+#define ALS_COUNT 1
+#define CONFIG_ALS_TCS3400
+#define CONFIG_ALS_TCS3400_INT_EVENT \
+	TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS)
+#define CONFIG_ALS_TCS3400_EMULATED_IRQ_EVENT
+
+#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(CLEAR_ALS))
+#else
+/* TODO(b/171931139): remove this after rev1 board deprecated */
+#define CONFIG_ACCEL_FORCE_MODE_MASK (board_accel_force_mode_mask())
+#endif
+
+/* SPI / Host Command */
+#undef CONFIG_HOSTCMD_DEBUG_MODE
+#define CONFIG_HOSTCMD_DEBUG_MODE HCDEBUG_OFF
+
+/* USB-A */
+#define USBA_PORT_COUNT 1
+
+#ifndef __ASSEMBLER__
+
+#include "gpio_signal.h"
+#include "registers.h"
+
+enum battery_type {
+	BATTERY_C235,
+	BATTERY_TYPE_COUNT,
+};
+
+enum sensor_id {
+	BASE_ACCEL = 0,
+	BASE_GYRO,
+	LID_ACCEL,
+#ifdef BOARD_ASURADA_REV0
+	CLEAR_ALS,
+	RGB_ALS,
+#endif
+	SENSOR_COUNT,
+};
+
+int board_accel_force_mode_mask(void);
+
+#endif /* !__ASSEMBLER__ */
+#endif /* __CROS_EC_BOARD_H */
diff --git a/board/cherry/build.mk b/board/cherry/build.mk
new file mode 100644
index 0000000000..d7b24f8e4f
--- /dev/null
+++ b/board/cherry/build.mk
@@ -0,0 +1,15 @@
+# -*- makefile -*-
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# Board specific files build
+
+# the IC is ITE IT8xxx2
+CHIP:=it83xx
+CHIP_FAMILY:=it8xxx2
+CHIP_VARIANT:=it81202bx_1024
+BASEBOARD:=cherry
+
+board-y+=led.o
+board-y+=battery.o board.o
diff --git a/board/cherry/ec.tasklist b/board/cherry/ec.tasklist
new file mode 100644
index 0000000000..75dbb1a828
--- /dev/null
+++ b/board/cherry/ec.tasklist
@@ -0,0 +1,22 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/**
+ * See CONFIG_TASK_LIST in config.h for details.
+ */
+#define CONFIG_TASK_LIST \
+	TASK_ALWAYS(HOOKS, hook_task, NULL, VENTI_TASK_STACK_SIZE) \
+	TASK_NOTEST(CHIPSET, chipset_task, NULL, VENTI_TASK_STACK_SIZE) \
+	TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \
+	TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, VENTI_TASK_STACK_SIZE) \
+	TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, VENTI_TASK_STACK_SIZE) \
+	TASK_ALWAYS(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \
+	TASK_NOTEST(PDCMD, pd_command_task, NULL, 1024) \
+	TASK_ALWAYS(HOSTCMD, host_command_task, NULL, 1024) \
+	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(PD_C0, pd_task, NULL, 1280) \
+	TASK_ALWAYS(PD_C1, pd_task, NULL, 1280) \
+
diff --git a/board/cherry/gpio.inc b/board/cherry/gpio.inc
new file mode 100644
index 0000000000..1bd0b8ea4a
--- /dev/null
+++ b/board/cherry/gpio.inc
@@ -0,0 +1,170 @@
+/* -*- mode:c -*-
+ *
+ * Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Declare symbolic names for all the GPIOs that we care about.
+ * Note: Those with interrupt handlers must be declared first. */
+
+/* Wake Source interrupts */
+GPIO_INT(POWER_BUTTON_L,     PIN(E, 4), GPIO_INT_BOTH | GPIO_PULL_UP |
+	 GPIO_HIB_WAKE_HIGH, power_button_interrupt) /* H1_EC_PWR_BTN_ODL */
+GPIO_INT(LID_OPEN,           PIN(E, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
+         lid_interrupt)
+GPIO_INT(TABLET_MODE_L,      PIN(J, 7), GPIO_INT_BOTH,
+         gmr_tablet_switch_isr)
+
+/* Chipset interrupts */
+GPIO_INT(AP_EC_WARM_RST_REQ, PIN(D, 3), GPIO_INT_RISING | GPIO_SEL_1P8V,
+         chipset_reset_request_interrupt)
+
+/* Power sequencing interrupts */
+GPIO_INT(AP_EC_WATCHDOG_L, PIN(C, 7), GPIO_INT_BOTH | GPIO_SEL_1P8V,
+         chipset_watchdog_interrupt)
+GPIO_INT(AP_IN_SLEEP_L, PIN(F, 2),
+         GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt)
+GPIO_INT(PMIC_EC_PWRGD, PIN(F, 3),
+         GPIO_INT_BOTH | GPIO_PULL_DOWN | GPIO_SEL_1P8V, power_signal_interrupt)
+
+/* Sensor Interrupts */
+GPIO_INT(BASE_IMU_INT_L,     PIN(J, 2), GPIO_INT_FALLING | GPIO_SEL_1P8V,
+         bmi160_interrupt)
+GPIO_INT(LID_ACCEL_INT_L,    PIN(J, 3), GPIO_INT_FALLING | GPIO_SEL_1P8V,
+         lis2dw12_interrupt)
+#ifdef BOARD_ASURADA_REV0
+GPIO_INT(ALS_RGB_INT_ODL,    PIN(F, 0), GPIO_INT_FALLING,
+         tcs3400_interrupt)
+#else
+GPIO(ALS_RGB_INT_ODL,        PIN(F, 0), GPIO_INPUT)
+#endif
+
+/* USB-C interrupts */
+GPIO_INT(USB_C0_PPC_INT_ODL, PIN(D, 1), GPIO_INT_BOTH, ppc_interrupt)
+GPIO_INT(USB_C0_BC12_INT_ODL,PIN(J, 6), GPIO_INT_FALLING, bc12_interrupt)
+GPIO_INT(USB_C1_BC12_INT_L,  PIN(J, 4), GPIO_INT_FALLING, bc12_interrupt)
+
+/* Volume button interrupts */
+/* Note that netnames are reversed in asurada rev 0/1 */
+GPIO_INT(VOLUME_DOWN_L,      PIN(D, 5), GPIO_INT_BOTH | GPIO_PULL_UP,
+         button_interrupt) /* EC_VOLDN_BTN_ODL */
+GPIO_INT(VOLUME_UP_L,        PIN(D, 6), GPIO_INT_BOTH | GPIO_PULL_UP,
+         button_interrupt) /* EC_VOLUP_BTN_ODL */
+
+/* Other interrupts */
+#ifdef BOARD_ASURADA_REV0
+GPIO_INT(AC_PRESENT,         PIN(M, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
+         extpower_interrupt) /* AC_OK / AC_PRESENT in rev0 */
+#else /* HAYATO */
+GPIO_INT(AC_PRESENT,         PIN(E, 5), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH,
+         extpower_interrupt) /* AC_OK / AC_PRESENT in rev1+ */
+#endif
+GPIO_INT(UART1_RX,           PIN(B, 0), GPIO_INT_FALLING,
+         uart_deepsleep_interrupt) /* UART_DEBUG_TX_EC_RX */
+GPIO_INT(WP,                 PIN(I, 4), GPIO_INT_BOTH | GPIO_SEL_1P8V,
+         switch_interrupt) /* EC_FLASH_WP_OD */
+GPIO_INT(SPI0_CS,            PIN(M, 5), GPIO_INT_FALLING,
+         spi_event)        /* SPI slave Chip Select -- AP_SPI_EC_CS_L */
+GPIO_INT(X_EC_GPIO2,         PIN(B, 2), GPIO_ODR_HIGH, x_ec_interrupt)
+
+/* Power Sequencing Signals */
+GPIO(EC_PMIC_EN_ODL,         PIN(D, 0), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
+GPIO(EC_PMIC_WATCHDOG_L,     PIN(H, 0), GPIO_ODR_LOW | GPIO_SEL_1P8V)
+GPIO(EN_PP5000_A,            PIN(C, 6), GPIO_OUT_HIGH)
+GPIO(PG_MT6315_PROC_ODL,     PIN(E, 1), GPIO_INPUT)
+GPIO(PG_MT6360_ODL,          PIN(F, 1), GPIO_INPUT)
+GPIO(PG_PP5000_A_ODL,        PIN(A, 6), GPIO_INPUT)
+GPIO(EN_SLP_Z,               PIN(E, 3), GPIO_OUT_LOW)
+GPIO(SYS_RST_ODL,            PIN(B, 6), GPIO_ODR_LOW)
+GPIO(EC_BL_EN_OD,            PIN(B, 5), GPIO_ODR_LOW | GPIO_SEL_1P8V)
+
+/* MKBP event synchronization */
+GPIO(EC_INT_L,               PIN(E, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_AP_INT_ODL */
+
+/* USB and USBC Signals */
+GPIO(DP_AUX_PATH_SEL,        PIN(G, 0), GPIO_OUT_HIGH)
+GPIO(EC_DPBRDG_HPD_ODL,      PIN(J, 0), GPIO_ODR_HIGH | GPIO_SEL_1P8V)
+GPIO(EN_PP5000_USB_A0_VBUS,  PIN(B, 7), GPIO_OUT_LOW)
+GPIO(USB_C0_FRS_EN,          PIN(H, 3), GPIO_OUT_LOW)
+
+/* Misc Signals */
+GPIO(EC_BATT_PRES_ODL,       PIN(C, 0), GPIO_INPUT)
+GPIO(BC12_DET_EN,            PIN(J, 5), GPIO_OUT_LOW) /* EN_USB_C0_BC12_DET */
+GPIO(EN_EC_ID_ODL,           PIN(H, 5), GPIO_ODR_LOW)
+GPIO(ENTERING_RW,            PIN(C, 5), GPIO_OUT_LOW) /* EC_ENTERING_RW */
+GPIO(EC_USB_C0_MUX_RESET_L,  PIN(D, 7), GPIO_OUT_HIGH)
+
+/* I2C pins - Alternate function below configures I2C module on these pins */
+GPIO(I2C_A_SCL,              PIN(B, 3), GPIO_INPUT) /* I2C_CHG_BATT_SCL */
+GPIO(I2C_A_SDA,              PIN(B, 4), GPIO_INPUT) /* I2C_CHG_BATT_SDA */
+GPIO(I2C_B_SCL,              PIN(C, 1), GPIO_INPUT | GPIO_SEL_1P8V) /* I2C_SENSOR_SCL */
+GPIO(I2C_B_SDA,              PIN(C, 2), GPIO_INPUT | GPIO_SEL_1P8V) /* I2C_SENSOR_SDA */
+GPIO(I2C_C_SCL,              PIN(F, 6), GPIO_INPUT) /* I2C_USB_C0_SCL */
+GPIO(I2C_C_SDA,              PIN(F, 7), GPIO_INPUT) /* I2C_USB_C0_SCL */
+GPIO(I2C_E_SCL,              PIN(E, 0), GPIO_INPUT) /* I2C_USB_C1_SCL */
+GPIO(I2C_E_SDA,              PIN(E, 7), GPIO_INPUT) /* I2C_USB_C1_SDA */
+
+/* SPI pins - Alternate function below configures SPI module on these pins */
+
+/* NC / TP */
+
+/* Keyboard pins */
+
+/* Subboards HDMI/TYPEC */
+GPIO(EC_X_GPIO1,             PIN(H, 4), GPIO_OUT_LOW)
+GPIO(EC_X_GPIO3,             PIN(J, 1), GPIO_INPUT)
+
+/* Alternate functions GPIO definitions */
+ALTERNATE(PIN_MASK(B, 0x18), 1, MODULE_I2C, 0) /* I2C A */
+ALTERNATE(PIN_MASK(C, 0x06), 1, MODULE_I2C, GPIO_SEL_1P8V) /* I2C B */
+ALTERNATE(PIN_MASK(F, 0xC0), 1, MODULE_I2C, 0) /* I2C C */
+ALTERNATE(PIN_MASK(E, 0x81), 1, MODULE_I2C, 0) /* I2C E */
+
+/* UART */
+ALTERNATE(PIN_MASK(B, 0x03), 1, MODULE_UART, 0) /* EC to Servo */
+
+/* PWM */
+ALTERNATE(PIN_MASK(A, 0x07), 1, MODULE_PWM, 0) /* PWM 0~2 */
+
+/* ADC */
+ALTERNATE(PIN_MASK(I, 0x4F), 0, MODULE_ADC, 0) /* ADC 0,1,2,3,6 */
+
+/* SPI */
+ALTERNATE(PIN_MASK(M, 0x33), 0, MODULE_SPI, 0) /* SPI */
+
+/* Unimplemented Pins  */
+GPIO(SET_VMC_VOLT_AT_1V8,    PIN(D, 4), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
+GPIO(EN_PP3000_VMC_PMU,      PIN(D, 2), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
+GPIO(PACKET_MODE_EN,         PIN(A, 3), GPIO_INPUT | GPIO_PULL_DOWN)
+/* b/160218054: behavior not defined */
+/* *_ODL pin has external pullup so don't pull it down. */
+GPIO(USB_A0_FAULT_ODL,       PIN(A, 7), GPIO_INPUT)
+GPIO(CHARGER_PROCHOT_ODL,    PIN(C, 3), GPIO_INPUT)
+GPIO(PG_MT6315_GPU_ODL,      PIN(H, 6), GPIO_INPUT)
+GPIO(EN_PP3000_SD_U,         PIN(G, 1), GPIO_INPUT | GPIO_PULL_DOWN | GPIO_SEL_1P8V)
+/* reserved for future use */
+GPIO(CCD_MODE_ODL,           PIN(C, 4), GPIO_INPUT)
+/*
+ * ADC pins don't have internal pull-down capability,
+ * so we set them as output low.
+ */
+GPIO(NC_GPI5,                PIN(I, 5), GPIO_OUT_LOW)
+GPIO(NC_GPI7,                PIN(I, 7), GPIO_OUT_LOW)
+/* NC pins, enable internal pull-up/down to avoid floating state. */
+#ifdef BOARD_ASURADA_REV0
+GPIO(NC_GPE5,                PIN(E, 5), GPIO_INPUT | GPIO_PULL_UP)
+#else /* HAYATO */
+GPIO(NC_GPM2,                PIN(M, 2), GPIO_INPUT | GPIO_PULL_DOWN)
+#endif
+GPIO(NC_GPM3,                PIN(M, 3), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(NC_GPM6,                PIN(M, 6), GPIO_INPUT | GPIO_PULL_DOWN)
+GPIO(SPI_CLK_GPG6,           PIN(G, 6), GPIO_INPUT | GPIO_PULL_UP)
+/*
+ * These 4 pins don't have internal pull-down capability,
+ * so we set them as output low.
+ */
+GPIO(NC_GPG3,                PIN(G, 3), GPIO_OUT_LOW)
+GPIO(SPI_MOSI_GPG4,          PIN(G, 4), GPIO_OUT_LOW)
+GPIO(SPI_MISO_GPG5,          PIN(G, 5), GPIO_OUT_LOW)
+GPIO(SPI_CS_GPG7,            PIN(G, 7), GPIO_OUT_LOW)
diff --git a/board/cherry/led.c b/board/cherry/led.c
new file mode 100644
index 0000000000..0a58cddd64
--- /dev/null
+++ b/board/cherry/led.c
@@ -0,0 +1,205 @@
+/* Copyright 2021 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Power and battery LED control for Asurada
+ */
+#include "charge_manager.h"
+#include "charge_state.h"
+#include "common.h"
+#include "console.h"
+#include "driver/bc12/mt6360.h"
+#include "hooks.h"
+#include "led_common.h"
+#include "pwm.h"
+#include "stdbool.h"
+#include "util.h"
+
+#define CPRINTS(format, args...) cprints(CC_PWM, format, ## args)
+
+#define LED_OFF EC_LED_COLOR_COUNT
+
+const enum ec_led_id supported_led_ids[] = {
+	/* Main LED */
+	EC_LED_ID_LEFT_LED,
+	EC_LED_ID_RIGHT_LED,
+
+	/* Not used, give them some random name for testing */
+	EC_LED_ID_POWER_LED,
+	EC_LED_ID_BATTERY_LED
+};
+const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids);
+
+static void led_set_color_left(enum ec_led_colors color, int duty)
+{
+	mt6360_led_set_brightness(MT6360_LED_RGB2, duty);
+	mt6360_led_set_brightness(MT6360_LED_RGB3, duty);
+
+	switch (color) {
+	case EC_LED_COLOR_AMBER:
+		mt6360_led_enable(MT6360_LED_RGB2, 0);
+		mt6360_led_enable(MT6360_LED_RGB3, 1);
+		break;
+	case EC_LED_COLOR_WHITE:
+		mt6360_led_enable(MT6360_LED_RGB2, 1);
+		mt6360_led_enable(MT6360_LED_RGB3, 0);
+		break;
+	default: /* LED_OFF and other unsupported colors */
+		mt6360_led_enable(MT6360_LED_RGB2, 0);
+		mt6360_led_enable(MT6360_LED_RGB3, 0);
+		break;
+	}
+}
+
+static void led_set_color_right(enum ec_led_colors color, int duty)
+{
+	pwm_set_duty(PWM_CH_LED2, duty);
+	pwm_set_duty(PWM_CH_LED3, duty);
+
+	switch (color) {
+	case EC_LED_COLOR_AMBER:
+		pwm_enable(PWM_CH_LED2, 0);
+		pwm_enable(PWM_CH_LED3, 1);
+		break;
+	case EC_LED_COLOR_WHITE:
+		pwm_enable(PWM_CH_LED2, 1);
+		pwm_enable(PWM_CH_LED3, 0);
+		break;
+	default: /* LED_OFF and other unsupported colors */
+		pwm_enable(PWM_CH_LED2, 0);
+		pwm_enable(PWM_CH_LED3, 0);
+		break;
+	}
+}
+
+static void led_set_color_power(enum ec_led_colors color, int duty)
+{
+	pwm_set_duty(PWM_CH_LED1, duty);
+	pwm_enable(PWM_CH_LED1, color == EC_LED_COLOR_WHITE);
+}
+
+static void led_set_color_battery(enum ec_led_colors color, int duty)
+{
+	mt6360_led_set_brightness(MT6360_LED_RGB1, duty);
+	mt6360_led_enable(MT6360_LED_RGB1, color == EC_LED_COLOR_WHITE);
+}
+
+static enum ec_error_list set_color(enum ec_led_id led_id,
+				    enum ec_led_colors color,
+				    int duty)
+{
+	switch (led_id) {
+	case EC_LED_ID_LEFT_LED:
+		led_set_color_left(color, duty);
+		return EC_SUCCESS;
+	case EC_LED_ID_RIGHT_LED:
+		led_set_color_right(color, duty);
+		return EC_SUCCESS;
+	case EC_LED_ID_POWER_LED:
+		led_set_color_power(color, duty);
+		return EC_SUCCESS;
+	case EC_LED_ID_BATTERY_LED:
+		led_set_color_battery(color, duty);
+		return EC_SUCCESS;
+	default:
+		return EC_ERROR_INVAL;
+	}
+}
+
+void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range)
+{
+	switch (led_id) {
+	case EC_LED_ID_LEFT_LED:
+		brightness_range[EC_LED_COLOR_AMBER] =
+			MT6360_LED_BRIGHTNESS_MAX;
+		brightness_range[EC_LED_COLOR_WHITE] =
+			MT6360_LED_BRIGHTNESS_MAX;
+		break;
+	case EC_LED_ID_RIGHT_LED:
+		brightness_range[EC_LED_COLOR_AMBER] = 100;
+		brightness_range[EC_LED_COLOR_WHITE] = 100;
+		break;
+	case EC_LED_ID_POWER_LED:
+		brightness_range[EC_LED_COLOR_WHITE] = 100;
+		break;
+	case EC_LED_ID_BATTERY_LED:
+		brightness_range[EC_LED_COLOR_WHITE] =
+			MT6360_LED_BRIGHTNESS_MAX;
+		break;
+	default:
+		break;
+	}
+}
+
+int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
+{
+	if (brightness[EC_LED_COLOR_AMBER])
+		return set_color(led_id, EC_LED_COLOR_AMBER,
+				 brightness[EC_LED_COLOR_AMBER]);
+	if (brightness[EC_LED_COLOR_WHITE])
+		return set_color(led_id, EC_LED_COLOR_WHITE,
+				 brightness[EC_LED_COLOR_WHITE]);
+
+	return set_color(led_id, LED_OFF, 0);
+}
+
+static void update_led(enum ec_led_id led_id, bool is_active_charge_port,
+		       int duty, int tick)
+{
+	enum charge_state power_state = charge_get_state();
+
+	if (power_state == PWR_STATE_IDLE) {
+		/* Factory mode: blinking white (2sec on + 2sec off) */
+		set_color(led_id, (tick % 8 < 4) ? EC_LED_COLOR_WHITE : LED_OFF,
+			  duty);
+	} else if (power_state == PWR_STATE_ERROR) {
+		/* Battery error: blinking amber (1sec on + 1sec off) */
+		set_color(led_id, (tick % 4 < 2) ? EC_LED_COLOR_AMBER : LED_OFF,
+			  duty);
+	} else if (is_active_charge_port) {
+		/*
+		 * Active charge port: amber when charging, white if fully
+		 * charged.
+		 */
+		if (power_state == PWR_STATE_CHARGE)
+			set_color(led_id, EC_LED_COLOR_AMBER, duty);
+		else
+			set_color(led_id, EC_LED_COLOR_WHITE, duty);
+	} else {
+		/*
+		 * Non-active port:
+		 * Solid white in S0, blinking amber (3sec on + 1sec off) in S3,
+		 * and LED off in S5
+		 */
+		if (chipset_in_state(CHIPSET_STATE_ON))
+			set_color(led_id, EC_LED_COLOR_WHITE, duty);
+		else if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND))
+			set_color(
+				led_id,
+				(tick % 8 < 6) ? EC_LED_COLOR_AMBER : LED_OFF,
+				duty);
+		else
+			set_color(led_id, LED_OFF, 0);
+
+	}
+}
+
+static void led_tick(void)
+{
+	static int tick;
+	int port = charge_manager_get_active_charge_port();
+
+	++tick;
+	/* Pick duty 1 and 50 respectively to have same brightness */
+	if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED))
+		update_led(EC_LED_ID_LEFT_LED, port == 0, 1, tick);
+	if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED))
+		update_led(EC_LED_ID_RIGHT_LED, port == 1, 50, tick);
+	/* Turn off unused LEDs */
+	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
+		set_color(EC_LED_ID_POWER_LED, LED_OFF, 0);
+	if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED))
+		set_color(EC_LED_ID_BATTERY_LED, LED_OFF, 0);
+}
+DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT);
+DECLARE_HOOK(HOOK_INIT, led_tick, HOOK_PRIO_DEFAULT);