diff options
Diffstat (limited to 'board/katsu')
-rw-r--r-- | board/katsu/board.c | 424 | ||||
-rw-r--r-- | board/katsu/board.h | 126 | ||||
-rw-r--r-- | board/katsu/build.mk | 15 | ||||
-rw-r--r-- | board/katsu/ec.tasklist | 20 | ||||
-rw-r--r-- | board/katsu/gpio.inc | 107 | ||||
-rw-r--r-- | board/katsu/led.c | 202 | ||||
-rw-r--r-- | board/katsu/vif_override.xml | 3 |
7 files changed, 0 insertions, 897 deletions
diff --git a/board/katsu/board.c b/board/katsu/board.c deleted file mode 100644 index e487538180..0000000000 --- a/board/katsu/board.c +++ /dev/null @@ -1,424 +0,0 @@ -/* Copyright 2020 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 "adc.h" -#include "button.h" -#include "charge_manager.h" -#include "charge_ramp.h" -#include "charge_state.h" -#include "charger.h" -#include "charger_mt6370.h" -#include "chipset.h" -#include "common.h" -#include "console.h" -#include "driver/accelgyro_icm_common.h" -#include "driver/accelgyro_icm426xx.h" -#include "driver/charger/rt946x.h" -#include "driver/sync.h" -#include "driver/tcpm/mt6370.h" -#include "driver/usb_mux/it5205.h" -#include "extpower.h" -#include "gesture.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "i2c.h" -#include "lid_switch.h" -#include "power.h" -#include "power_button.h" -#include "pwm.h" -#include "pwm_chip.h" -#include "registers.h" -#include "spi.h" -#include "system.h" -#include "task.h" -#include "tcpm/tcpm.h" -#include "timer.h" -#include "usb_charge.h" -#include "usb_mux.h" -#include "usb_pd_policy.h" -#include "usb_pd_tcpm.h" -#include "util.h" - -#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) - -static void tcpc_alert_event(enum gpio_signal signal) -{ - schedule_deferred_pd_interrupt(0 /* port */); -} - -static void gauge_interrupt(enum gpio_signal signal) -{ - task_wake(TASK_ID_CHARGER); -} - -#include "gpio_list.h" - -/******************************************************************************/ -/* ADC channels. Must be in the exactly same order as in enum adc_channel. */ -const struct adc_t adc_channels[] = { - [ADC_BOARD_ID] = {"BOARD_ID", 3300, 4096, 0, STM32_AIN(10)}, - [ADC_EC_SKU_ID] = {"EC_SKU_ID", 3300, 4096, 0, STM32_AIN(8)}, - [ADC_BATT_ID] = {"BATT_ID", 3300, 4096, 0, STM32_AIN(7)}, - [ADC_POGO_ADC_INT_L] = {"POGO_ADC_INT_L", 3300, 4096, 0, STM32_AIN(6)}, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - -/******************************************************************************/ -/* I2C ports */ -const struct i2c_port_t i2c_ports[] = { - {"typec", 0, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"other", 1, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - - -/* power signal list. Must match order of enum power_signal. */ -const struct power_signal_info power_signal_list[] = { - {GPIO_AP_IN_SLEEP_L, POWER_SIGNAL_ACTIVE_LOW, "AP_IN_S3_L"}, - {GPIO_PMIC_EC_RESETB, POWER_SIGNAL_ACTIVE_HIGH, "PMIC_PWR_GOOD"}, -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - -/******************************************************************************/ -/* SPI devices */ -const struct spi_device_t spi_devices[] = { -}; -const unsigned int spi_devices_used = ARRAY_SIZE(spi_devices); - -/******************************************************************************/ -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { - { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = I2C_PORT_TCPC0, - .addr_flags = MT6370_TCPC_I2C_ADDR_FLAGS, - }, - .drv = &mt6370_tcpm_drv, - }, -}; - -struct mt6370_thermal_bound thermal_bound = { - .target = 80, - .err = 4, -}; - -static void board_hpd_update(const struct usb_mux *me, - mux_state_t mux_state) -{ - /* - * svdm_dp_attention() did most of the work, we only need to notify - * host here. - */ - host_set_single_event(EC_HOST_EVENT_USB_MUX); -} - -__override const struct rt946x_init_setting *board_rt946x_init_setting(void) -{ - static const struct rt946x_init_setting battery_init_setting = { - .eoc_current = 140, - .mivr = 4000, - .ircmp_vclamp = 32, - .ircmp_res = 25, - .boost_voltage = 5050, - .boost_current = 1500, - }; - - return &battery_init_setting; -} - -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { - { - .usb_port = 0, - .i2c_port = I2C_PORT_USB_MUX, - .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, - .driver = &it5205_usb_mux_driver, - .hpd_update = &board_hpd_update, - }, -}; - -uint16_t tcpc_get_alert_status(void) -{ - uint16_t status = 0; - - if (!gpio_get_level(GPIO_USB_C0_PD_INT_ODL)) - status |= PD_STATUS_TCPC_ALERT_0; - - return status; -} - -static int force_discharge; - -int board_set_active_charge_port(int charge_port) -{ - CPRINTS("New chg p%d", charge_port); - - /* ignore all request when discharge mode is on */ - if (force_discharge && charge_port != CHARGE_PORT_NONE) - return EC_SUCCESS; - - switch (charge_port) { - case CHARGE_PORT_USB_C: - /* Don't charge from a source port */ - if (board_vbus_source_enabled(charge_port)) - return -1; - gpio_set_level(GPIO_EN_POGO_CHARGE_L, 1); - gpio_set_level(GPIO_EN_USBC_CHARGE_L, 0); - break; -#if CONFIG_DEDICATED_CHARGE_PORT_COUNT > 0 - case CHARGE_PORT_POGO: - gpio_set_level(GPIO_EN_USBC_CHARGE_L, 1); - gpio_set_level(GPIO_EN_POGO_CHARGE_L, 0); - break; -#endif - case CHARGE_PORT_NONE: - /* - * To ensure the fuel gauge (max17055) is always powered - * even when battery is disconnected, keep VBAT rail on but - * set the charging current to minimum. - */ - gpio_set_level(GPIO_EN_POGO_CHARGE_L, 1); - gpio_set_level(GPIO_EN_USBC_CHARGE_L, 1); - charger_set_current(CHARGER_SOLO, 0); - break; - default: - panic("Invalid charge port\n"); - break; - } - - return EC_SUCCESS; -} - -int board_discharge_on_ac(int enable) -{ - int ret, port; - - if (enable) { - port = CHARGE_PORT_NONE; - } else { - /* restore the charge port state */ - port = charge_manager_get_override(); - if (port == OVERRIDE_OFF) - port = charge_manager_get_active_charge_port(); - } - - ret = charger_discharge_on_ac(enable); - if (ret) - return ret; - - if (force_discharge && !enable) - rt946x_toggle_bc12_detection(); - - force_discharge = enable; - return board_set_active_charge_port(port); -} - -int extpower_is_present(void) -{ - /* - * The charger will indicate VBUS presence if we're sourcing 5V, - * so exclude such ports. - */ - int usb_c_extpower_present; - - if (board_vbus_source_enabled(CHARGE_PORT_USB_C)) - usb_c_extpower_present = 0; - else - usb_c_extpower_present = tcpm_check_vbus_level( - CHARGE_PORT_USB_C, - VBUS_PRESENT); - - return usb_c_extpower_present; -} - -int pd_snk_is_vbus_provided(int port) -{ - if (port) - panic("Invalid charge port\n"); - - return rt946x_is_vbus_ready(); -} - -static void board_init(void) -{ - /* If the reset cause is external, pulse PMIC force reset. */ - if (system_get_reset_flags() == EC_RESET_FLAG_RESET_PIN) { - gpio_set_level(GPIO_PMIC_FORCE_RESET_ODL, 0); - msleep(100); - gpio_set_level(GPIO_PMIC_FORCE_RESET_ODL, 1); - } - - /* Enable TCPC alert interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - - /* Enable charger interrupts */ - gpio_enable_interrupt(GPIO_CHARGER_INT_ODL); - -#ifdef SECTION_IS_RW - /* Enable interrupts from ICM40608 sensor. */ - gpio_enable_interrupt(GPIO_ACCEL_INT_ODL); - - /* Enable interrupt for the camera vsync. */ - gpio_enable_interrupt(GPIO_SYNC_INT); -#endif /* SECTION_IS_RW */ - - /* Enable interrupt from PMIC. */ - gpio_enable_interrupt(GPIO_PMIC_EC_RESETB); - - /* Enable gauge interrupt from max17055 */ - gpio_enable_interrupt(GPIO_GAUGE_INT_ODL); - - /* - * Fix backlight led maximum current: - * tolerance 120mA * 0.75 = 90mA. - * (b/133655155) - */ - mt6370_backlight_set_dim(MT6370_BLDIM_DEFAULT * 3 / 4); -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); - -static void board_rev_init(void) -{ - /* Board revision specific configs. */ - - /* - * It's a P1 pin BOOTBLOCK_MUX_OE, also a P2 pin BC12_DET_EN. - * Keep this pin defaults to P1 setting since that eMMC enabled with - * High-Z stat. - */ - /* TODO */ - /* Put initial code here for different EC board reversion */ -} -DECLARE_HOOK(HOOK_INIT, board_rev_init, HOOK_PRIO_INIT_ADC + 1); - -void sensor_board_proc_double_tap(void) -{ - CPRINTS("Detect double tap"); -} - -/* Motion sensors */ -/* Mutexes */ -#ifndef VARIANT_KUKUI_NO_SENSORS -static struct mutex g_lid_mutex; - -static struct icm_drv_data_t g_icm426xx_data; - -/* Matrix to rotate accelerometer into standard reference frame */ -static const mat33_fp_t lid_standard_ref = { - {0, FLOAT_TO_FP(1), 0}, - {FLOAT_TO_FP(-1), 0, 0}, - {0, 0, FLOAT_TO_FP(1)} -}; - -struct motion_sensor_t motion_sensors[] = { - /* - * Note: ICM40608: supports accelerometer and gyro sensor - * Requirement: accelerometer sensor must init before gyro sensor - * DO NOT change the order of the following table. - */ - [LID_ACCEL] = { - .name = "Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &icm426xx_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .rot_standard_ref = &lid_standard_ref, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ - .min_frequency = ICM426XX_ACCEL_MIN_FREQ, - .max_frequency = ICM426XX_ACCEL_MAX_FREQ, - .config = { - /* Enable accel in S0 */ - [SENSOR_CONFIG_EC_S0] = { - .odr = TAP_ODR, - .ec_rate = 100 * MSEC, - }, - /* For double tap detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = TAP_ODR, - .ec_rate = 100 * MSEC, - }, - }, - }, - [LID_GYRO] = { - .name = "Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_LID, - .drv = &icm426xx_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &lid_standard_ref, - .min_frequency = ICM426XX_GYRO_MIN_FREQ, - .max_frequency = ICM426XX_GYRO_MAX_FREQ, - }, - [VSYNC] = { - .name = "Camera vsync", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_GPIO, - .type = MOTIONSENSE_TYPE_SYNC, - .location = MOTIONSENSE_LOC_CAMERA, - .drv = &sync_drv, - .default_range = 0, - .min_frequency = 0, - .max_frequency = 1, - }, -}; -const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); -#endif /* VARIANT_KUKUI_NO_SENSORS */ - -/* - * Return if VBUS is sagging too low - */ -int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) -{ - int voltage; - /* - * Though we have a more tolerant range (3.9V~13.4V), setting 4400 to - * prevent from a bad charger crashed. - * - * TODO(b:131284131): mt6370 VBUS reading is not accurate currently. - * Vendor will provide a workaround solution to fix the gap between ADC - * reading and actual voltage. After the workaround applied, we could - * try to raise this value to 4600. (when it says it read 4400, it is - * actually close to 4600) - */ - if (charger_get_vbus_voltage(port, &voltage)) - voltage = 0; - - return voltage < 4400; -} - -__override int board_charge_port_is_sink(int port) -{ - /* TODO(b:128386458): Check POGO_ADC_INT_L */ - return 1; -} - -__override int board_charge_port_is_connected(int port) -{ - return gpio_get_level(GPIO_POGO_VBUS_PRESENT); -} - -__override -void board_fill_source_power_info(int port, - struct ec_response_usb_pd_power_info *r) -{ - r->meas.voltage_now = 3300; - r->meas.voltage_max = 3300; - r->meas.current_max = 1500; - r->meas.current_lim = 1500; - r->max_power = r->meas.voltage_now * r->meas.current_max; -} - diff --git a/board/katsu/board.h b/board/katsu/board.h deleted file mode 100644 index aa6e386d8f..0000000000 --- a/board/katsu/board.h +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright 2020 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. - */ - -/* Configuration for Katsu */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -#define BQ27541_ADDR 0x55 -#define VARIANT_KUKUI_BATTERY_BQ27541 -#define VARIANT_KUKUI_POGO_KEYBOARD - -#define VARIANT_KUKUI_CHARGER_MT6370 -#define VARIANT_KUKUI_EC_STM32F098 -#define VARIANT_KUKUI_TABLET_PWRBTN - -#ifndef SECTION_IS_RW -#define VARIANT_KUKUI_NO_SENSORS -#endif /* SECTION_IS_RW */ - -#include "baseboard.h" - -#define CONFIG_USB_MUX_IT5205 -#define CONFIG_VOLUME_BUTTONS -#define CONFIG_USB_MUX_RUNTIME_CONFIG - -/* Battery */ -#define BATTERY_DESIRED_CHARGING_CURRENT 3500 /* mA */ - -#define CONFIG_CHARGER_MT6370_BACKLIGHT - - -/* Motion Sensors */ -#ifdef SECTION_IS_RW -#define CONFIG_ACCELGYRO_ICM426XX -#define CONFIG_ACCEL_INTERRUPTS -#define CONFIG_ACCELGYRO_ICM426XX_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL) - -/* Camera VSYNC */ -#define CONFIG_SYNC -#define CONFIG_SYNC_COMMAND -#define CONFIG_SYNC_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(VSYNC) -#endif /* SECTION_IS_RW */ - -/* I2C ports */ -#define I2C_PORT_CHARGER 0 -#define I2C_PORT_TCPC0 0 -#define I2C_PORT_USB_MUX 0 -#define I2C_PORT_BATTERY 1 -#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY -#define I2C_PORT_ACCEL 1 -#define I2C_PORT_BC12 1 - -/* Route sbs host requests to virtual battery driver */ -#define VIRTUAL_BATTERY_ADDR_FLAGS 0x0B - -/* MKBP */ -#define CONFIG_MKBP_INPUT_DEVICES -#define CONFIG_MKBP_EVENT -#define CONFIG_MKBP_EVENT_WAKEUP_MASK \ - (BIT(EC_MKBP_EVENT_SENSOR_FIFO) | BIT(EC_MKBP_EVENT_HOST_EVENT)) - -#define PD_OPERATING_POWER_MW 15000 - -#ifndef __ASSEMBLER__ - -enum adc_channel { - /* Real ADC channels begin here */ - ADC_BOARD_ID = 0, - ADC_EC_SKU_ID, - ADC_BATT_ID, - ADC_POGO_ADC_INT_L, - ADC_CH_COUNT -}; - -/* power signal definitions */ -enum power_signal { - AP_IN_S3_L, - PMIC_PWR_GOOD, - - /* Number of signals */ - POWER_SIGNAL_COUNT, -}; - -/* Motion sensors */ -enum sensor_id { - LID_ACCEL = 0, - LID_GYRO, - VSYNC, - SENSOR_COUNT, -}; - -enum charge_port { - CHARGE_PORT_USB_C, -}; - -#include "gpio_signal.h" -#include "registers.h" - -#ifdef SECTION_IS_RO -/* Interrupt handler for emmc task */ -void emmc_cmd_interrupt(enum gpio_signal signal); -#endif - -void board_reset_pd_mcu(void); -int board_get_version(void); -void pogo_adc_interrupt(enum gpio_signal signal); -int board_discharge_on_ac(int enable); - -/* Enable double tap detection */ -#define CONFIG_GESTURE_DETECTION -#define CONFIG_GESTURE_SENSOR_DOUBLE_TAP -#define CONFIG_GESTURE_TAP_SENSOR 0 -#define CONFIG_GESTURE_SENSOR_DOUBLE_TAP_FOR_HOST -#define CONFIG_GESTURE_SAMPLING_INTERVAL_MS 5 -#define CONFIG_GESTURE_TAP_THRES_MG 100 -#define CONFIG_GESTURE_TAP_MAX_INTERSTICE_T 500 -#define CONFIG_GESTURE_DETECTION_MASK BIT(CONFIG_GESTURE_TAP_SENSOR) - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/katsu/build.mk b/board/katsu/build.mk deleted file mode 100644 index 7a3953b8bb..0000000000 --- a/board/katsu/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2020 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 -# -# -# STmicro STM32F098VC -CHIP:=stm32 -CHIP_FAMILY:=stm32f0 -CHIP_VARIANT:=stm32f09x -BASEBOARD:=kukui - -board-y=board.o led.o diff --git a/board/katsu/ec.tasklist b/board/katsu/ec.tasklist deleted file mode 100644 index fc26f445b2..0000000000 --- a/board/katsu/ec.tasklist +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2020 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_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG, usb_charger_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS_RW(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, 1024) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C0, pd_task, NULL, 1280) \ - TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, 1024) \ - TASK_ALWAYS_RO(EMMC, emmc_task, NULL, LARGER_TASK_STACK_SIZE) - diff --git a/board/katsu/gpio.inc b/board/katsu/gpio.inc deleted file mode 100644 index f938153045..0000000000 --- a/board/katsu/gpio.inc +++ /dev/null @@ -1,107 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2020 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. - */ - -/* Interrupts */ -GPIO_INT(USB_C0_PD_INT_ODL, PIN(B, 1), GPIO_INT_FALLING | GPIO_PULL_UP, - tcpc_alert_event) -GPIO_INT(VOLUME_UP_L, PIN(B, 10), GPIO_INT_BOTH | GPIO_PULL_UP, - button_interrupt) /* EC_VOLUP_BTN_ODL */ -GPIO_INT(VOLUME_DOWN_L, PIN(B, 11), GPIO_INT_BOTH | GPIO_PULL_UP, - button_interrupt) /* EC_VOLDN_BTN_ODL */ -GPIO_INT(POWER_BUTTON_L, PIN(A, 0), GPIO_INT_BOTH | GPIO_PULL_UP, - power_button_interrupt) /* EC_PWR_BTN_ODL */ - -GPIO_INT(AP_IN_SLEEP_L, PIN(C, 12), GPIO_INT_BOTH | GPIO_PULL_DOWN, - power_signal_interrupt) -GPIO_INT(PMIC_EC_RESETB, PIN(B, 7), GPIO_INT_BOTH | GPIO_PULL_DOWN, - power_signal_interrupt) -GPIO_INT(WARM_RESET_REQ, PIN(A, 3), GPIO_INT_RISING | GPIO_PULL_DOWN, - chipset_reset_request_interrupt) -GPIO_INT(AP_EC_WATCHDOG_L, PIN(C, 2), GPIO_INT_FALLING, - chipset_watchdog_interrupt) - -GPIO_INT_RW(ACCEL_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_SEL_1P8V | GPIO_PULL_UP, - icm426xx_interrupt) -GPIO_INT(CHARGER_INT_ODL, PIN(C, 13), GPIO_INT_FALLING | GPIO_PULL_UP, - rt946x_interrupt) -GPIO_INT_RO(EMMC_CMD, PIN(B, 15), GPIO_INT_FALLING, - emmc_cmd_interrupt) -GPIO_INT(SPI1_NSS, PIN(A, 15), GPIO_INT_BOTH | GPIO_PULL_UP, - spi_event) -GPIO_INT_RW(SYNC_INT, PIN(A, 8), GPIO_INT_RISING | GPIO_PULL_DOWN, - sync_interrupt) -GPIO_INT(HALL_INT_L, PIN(C, 5), GPIO_INT_BOTH, - lid_interrupt) -GPIO_INT(GAUGE_INT_ODL, PIN(C, 9), GPIO_INT_FALLING | GPIO_PULL_UP, - gauge_interrupt) -GPIO_INT(POGO_ADC_INT_L, PIN(A, 6), GPIO_INT_BOTH, - pogo_adc_interrupt) - -/* unused */ -GPIO(POGO_VBUS_PRESENT, PIN(A, 14), GPIO_INPUT) -/* unused after board rev 5 */ -GPIO(USB_C0_DP_POLARITY, PIN(C, 14), GPIO_INPUT) -GPIO(USB_C0_DP_OE_L, PIN(A, 5), GPIO_INPUT) - - -/* Reset pins */ -GPIO(AP_SYS_RST_L, PIN(C, 11), GPIO_OUT_LOW) -GPIO(PMIC_WATCHDOG_L, PIN(C, 3), GPIO_OUT_LOW) -GPIO(PMIC_EN_ODL, PIN(C, 10), GPIO_ODR_HIGH) -GPIO(PMIC_FORCE_RESET_ODL, PIN(A, 2), GPIO_ODR_HIGH) -GPIO(MT6370_RST_L, PIN(F, 0), GPIO_OUT_LOW) - -/* - * I2C pins should be configured as inputs until I2C module is - * initialized. This will avoid driving the lines unintentionally. - */ -GPIO(I2C1_SCL, PIN(B, 8), GPIO_INPUT) -GPIO(I2C1_SDA, PIN(B, 9), GPIO_INPUT) -GPIO(I2C2_SCL, PIN(A, 11), GPIO_INPUT) -GPIO(I2C2_SDA, PIN(A, 12), GPIO_INPUT) - -/* Analog pins */ -GPIO(BATT_ID, PIN(A, 7), GPIO_ANALOG) -GPIO(BOARD_ID, PIN(C, 0), GPIO_ANALOG) -GPIO(EC_SKU_ID, PIN(B, 0), GPIO_ANALOG) - -/* Other input pins */ -GPIO(WP_L, PIN(C, 8), GPIO_INPUT) /* EC_FLASH_WP_ODL */ -GPIO(BOOT0, PIN(F, 11), GPIO_INPUT) -GPIO(CCD_MODE_ODL, PIN(A, 1), GPIO_INPUT) - -/* Other output pins */ -GPIO(ENTERING_RW, PIN(C, 6), GPIO_ODR_HIGH) /* EC_ENTERING_RW_ODL */ -GPIO(EC_INT_L, PIN(B, 12), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ -GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */ -GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) -GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) -GPIO(EN_PP3300_POGO, PIN(A, 13), GPIO_OUT_LOW) -GPIO(EN_POGO_CHARGE_L, PIN(B, 6), GPIO_OUT_HIGH) -GPIO(EN_USBC_CHARGE_L, PIN(C, 7), GPIO_OUT_LOW) -GPIO(EN_PP5000_USBC, PIN(D, 2), GPIO_OUT_LOW) -GPIO(BC12_DET_EN, PIN(C, 4), GPIO_OUT_LOW) - -/* USART1: PA9/PA10 */ -ALTERNATE(PIN_MASK(A, 0x0600), 1, MODULE_UART, 0) -/* I2C MASTER: PB8/9 */ -ALTERNATE(PIN_MASK(B, 0x0300), 1, MODULE_I2C, GPIO_ODR_HIGH ) -/* I2C MASTER: PA11/12 */ -ALTERNATE(PIN_MASK(A, 0x1800), 5, MODULE_I2C, GPIO_ODR_HIGH ) -/* SPI SLAVE: PB3/4/5 */ -ALTERNATE(PIN_MASK(B, 0x0038), 0, MODULE_SPI, 0) -#ifdef SECTION_IS_RO -/* SPI SLAVE: PB13/14/15 */ -ALTERNATE(PIN_MASK(B, 0xE000), 0, MODULE_SPI_FLASH, 0) -#endif -/* SPI SLAVE CS: PA15 */ -ALTERNATE(PIN_MASK(A, 0x8000), 0, MODULE_SPI, 0) diff --git a/board/katsu/led.c b/board/katsu/led.c deleted file mode 100644 index c72f5e4cdb..0000000000 --- a/board/katsu/led.c +++ /dev/null @@ -1,202 +0,0 @@ -/* Copyright 2020 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. - * - * Battery LED control for Katsu board. - */ - -#include "battery.h" -#include "charge_state.h" -#include "driver/charger/rt946x.h" -#include "hooks.h" -#include "led_common.h" -#include "power.h" - -const enum ec_led_id supported_led_ids[] = { EC_LED_ID_BATTERY_LED }; - -const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); - -#define LED_OFF MT6370_LED_ID_OFF -#define LED_AMBER MT6370_LED_ID1 -#define LED_WHITE MT6370_LED_ID2 - -#define LED_MASK_OFF 0 -#define LED_MASK_AMBER MT6370_MASK_RGB_ISNK1DIM_EN -#define LED_MASK_WHITE MT6370_MASK_RGB_ISNK2DIM_EN - -static void katsu_led_set_battery(void) -{ - enum charge_state chstate; - enum power_state powerstate; - static uint8_t prv_white, prv_amber; - static uint8_t time_cnt; - uint8_t br[EC_LED_COLOR_COUNT] = { 0 }; - - chstate = charge_get_state(); - powerstate = power_get_state(); - - switch (chstate) { - case PWR_STATE_CHARGE: - case PWR_STATE_CHARGE_NEAR_FULL: - if (charge_get_percent() < 94) { - br[EC_LED_COLOR_AMBER] = 1; - br[EC_LED_COLOR_WHITE] = 0; - break; - } - br[EC_LED_COLOR_WHITE] = 1; - br[EC_LED_COLOR_AMBER] = 0; - break; - case PWR_STATE_DISCHARGE: - if (powerstate == POWER_S0) { - /* display SoC 10% = real battery SoC 13%*/ - if (charge_get_percent() < 14) { - if (time_cnt < 1) { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 1; - } else { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - if (time_cnt > 3) - time_cnt = 0; - } - break; - } - br[EC_LED_COLOR_WHITE] = 1; - br[EC_LED_COLOR_AMBER] = 0; - break; - } else if (powerstate == POWER_S3) { - if (time_cnt < 2) { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 1; - br[EC_LED_COLOR_AMBER] = 0; - } else { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - if (time_cnt > 3) - time_cnt = 0; - } - break; - } else if (powerstate == POWER_S5 || powerstate == POWER_G3) { - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - } - break; - case PWR_STATE_ERROR: - if (powerstate == POWER_S0) { - if (time_cnt < 1) { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 1; - } else { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - if (time_cnt > 1) - time_cnt = 0; - } - break; - } else if (powerstate == POWER_S3) { - if (time_cnt < 2) { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 1; - br[EC_LED_COLOR_AMBER] = 0; - } else { - time_cnt++; - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - if (time_cnt > 3) - time_cnt = 0; - } - break; - } else if (powerstate == POWER_S5 || powerstate == POWER_G3) { - br[EC_LED_COLOR_WHITE] = 0; - br[EC_LED_COLOR_AMBER] = 0; - } - break; - default: - /* Other states don't alter LED behavior */ - return; - } - - if (prv_white == br[EC_LED_COLOR_WHITE] && - prv_amber == br[EC_LED_COLOR_AMBER]) - return; - - prv_white = br[EC_LED_COLOR_WHITE]; - prv_amber = br[EC_LED_COLOR_AMBER]; - led_set_brightness(EC_LED_ID_BATTERY_LED, br); -} - -void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) -{ - if (led_id != EC_LED_ID_BATTERY_LED) - return; - - brightness_range[EC_LED_COLOR_WHITE] = MT6370_LED_BRIGHTNESS_MAX; - brightness_range[EC_LED_COLOR_AMBER] = MT6370_LED_BRIGHTNESS_MAX; -} - -int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) -{ - uint8_t white, amber; - - if (led_id != EC_LED_ID_BATTERY_LED) - return EC_ERROR_INVAL; - - white = brightness[EC_LED_COLOR_WHITE]; - amber = brightness[EC_LED_COLOR_AMBER]; - - mt6370_led_set_brightness(LED_WHITE, white); - mt6370_led_set_brightness(LED_AMBER, amber); - - /* Enables LED sink power if necessary. */ - mt6370_led_set_color((white ? LED_MASK_WHITE : 0) | - (amber ? LED_MASK_AMBER : 0)); - return EC_SUCCESS; -} - -static void katsu_led_init(void) -{ - const enum mt6370_led_dim_mode dim = MT6370_LED_DIM_MODE_PWM; - const enum mt6370_led_pwm_freq freq = MT6370_LED_PWM_FREQ1000; - - mt6370_led_set_color(0); - mt6370_led_set_dim_mode(LED_WHITE, dim); - mt6370_led_set_dim_mode(LED_AMBER, dim); - mt6370_led_set_pwm_frequency(LED_WHITE, freq); - mt6370_led_set_pwm_frequency(LED_AMBER, freq); - mt6370_led_set_pwm_dim_duty(LED_WHITE, 255); - mt6370_led_set_pwm_dim_duty(LED_AMBER, 255); -} -DECLARE_HOOK(HOOK_INIT, katsu_led_init, HOOK_PRIO_DEFAULT); - -/* Called by hook task every 1 sec */ -static void led_second(void) -{ - if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) - katsu_led_set_battery(); -} -DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT); - -__override void led_control(enum ec_led_id led_id, enum ec_led_state state) -{ - uint8_t br[EC_LED_COLOR_COUNT] = { 0 }; - - if ((led_id != EC_LED_ID_RECOVERY_HW_REINIT_LED) && - (led_id != EC_LED_ID_SYSRQ_DEBUG_LED)) - return; - - if (state == LED_STATE_RESET) { - led_auto_control(EC_LED_ID_BATTERY_LED, 1); - return; - } - - if (state) - br[EC_LED_COLOR_WHITE] = 1; - - led_auto_control(EC_LED_ID_BATTERY_LED, 0); - led_set_brightness(EC_LED_ID_BATTERY_LED, br); -} diff --git a/board/katsu/vif_override.xml b/board/katsu/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/katsu/vif_override.xml +++ /dev/null @@ -1,3 +0,0 @@ -<!-- Add VIF field overrides here. See genvif.c and the Vendor Info File - Definition from the USB-IF. ---> |