From b1ac9d3c6eb2469e2ce9ad059d774ffd99cc2bae Mon Sep 17 00:00:00 2001 From: Andrey Petrov Date: Mon, 3 Oct 2016 16:30:26 -0700 Subject: [PATCH] amenia: remove mainboard Amenia is EOL. Remove mainboard. BUG=chrome-os-partner:57490 BRANCH=none TEST=none Change-Id: Idd453299df866c8ea6e4a4903d94bc26ff9150c6 Signed-off-by: Andrey Petrov Reviewed-on: https://chromium-review.googlesource.com/392231 Commit-Ready: Vijay P Hiremath Tested-by: Vijay P Hiremath Reviewed-by: Aaron Durbin --- board/amenia/battery.c | 87 ----- board/amenia/board.c | 691 ----------------------------------- board/amenia/board.h | 252 ------------- board/amenia/build.mk | 15 - board/amenia/ec.tasklist | 34 -- board/amenia/gpio.inc | 157 -------- board/amenia/led.c | 159 -------- board/amenia/usb_pd_policy.c | 375 ------------------- util/flash_ec | 1 - 9 files changed, 1771 deletions(-) delete mode 100644 board/amenia/battery.c delete mode 100644 board/amenia/board.c delete mode 100644 board/amenia/board.h delete mode 100644 board/amenia/build.mk delete mode 100644 board/amenia/ec.tasklist delete mode 100644 board/amenia/gpio.inc delete mode 100644 board/amenia/led.c delete mode 100644 board/amenia/usb_pd_policy.c diff --git a/board/amenia/battery.c b/board/amenia/battery.c deleted file mode 100644 index 2f308473f5..0000000000 --- a/board/amenia/battery.c +++ /dev/null @@ -1,87 +0,0 @@ -/* Copyright 2016 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 pack vendor provided charging profile - */ - -#include "battery.h" -#include "battery_smart.h" -#include "charge_state.h" -#include "console.h" -#include "ec_commands.h" -#include "gpio.h" -#include "i2c.h" -#include "util.h" - -/* Shutdown mode parameter to write to manufacturer access register */ -#define PARAM_CUT_OFF_LOW 0x10 -#define PARAM_CUT_OFF_HIGH 0x00 - -/* Battery info for BQ40Z55 */ -static const struct battery_info info = { - .voltage_max = 8700, /* mV */ - .voltage_normal = 7600, - .voltage_min = 6100, - .precharge_current = 200, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 45, - .discharging_min_c = 0, - .discharging_max_c = 60, -}; - -const struct battery_info *battery_get_info(void) -{ - return &info; -} - -int board_cut_off_battery(void) -{ - int rv; - uint8_t buf[3]; - - /* Ship mode command must be sent twice to take effect */ - buf[0] = SB_MANUFACTURER_ACCESS & 0xff; - buf[1] = PARAM_CUT_OFF_LOW; - buf[2] = PARAM_CUT_OFF_HIGH; - - i2c_lock(I2C_PORT_BATTERY, 1); - rv = i2c_xfer(I2C_PORT_BATTERY, BATTERY_ADDR, buf, 3, NULL, 0, - I2C_XFER_SINGLE); - rv |= i2c_xfer(I2C_PORT_BATTERY, BATTERY_ADDR, buf, 3, NULL, 0, - I2C_XFER_SINGLE); - i2c_lock(I2C_PORT_BATTERY, 0); - - return rv; -} - -#ifdef CONFIG_BATTERY_PRESENT_CUSTOM -/* - * Physical detection of battery. - */ -enum battery_present battery_is_present(void) -{ - enum battery_present batt_pres; - int batt_status; - - /* The GPIO is low when the battery is physically present */ - batt_pres = gpio_get_level(GPIO_BAT_PRESENT_L) ? BP_NO : BP_YES; - - /* - * Make sure battery status is implemented, I2C transactions are - * success & the battery status is Initialized to find out if it - * is a working battery and it is not in the cut-off mode. - * - * FETs are turned off after Power Shutdown time. - * The device will wake up when a voltage is applied to PACK. - * Battery status will be inactive until it is initialized. - */ - if (batt_pres == BP_YES && !battery_status(&batt_status)) - if (!(batt_status & STATUS_INITIALIZED)) - batt_pres = BP_NO; - - return batt_pres; -} -#endif diff --git a/board/amenia/board.c b/board/amenia/board.c deleted file mode 100644 index d8bffdd79b..0000000000 --- a/board/amenia/board.c +++ /dev/null @@ -1,691 +0,0 @@ -/* Copyright 2016 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. - */ - -/* Amenia board-specific configuration */ - -#include "adc_chip.h" -#include "als.h" -#include "button.h" -#include "charge_manager.h" -#include "charge_ramp.h" -#include "charge_state.h" -#include "charger.h" -#include "chipset.h" -#include "console.h" -#include "driver/als_isl29035.h" -#include "driver/accel_kionix.h" -#include "driver/accel_kx022.h" -#include "driver/accelgyro_bmi160.h" -#include "driver/baro_bmp280.h" -#include "driver/charger/bd9995x.h" -#include "driver/tcpm/anx74xx.h" -#include "driver/tcpm/tcpci.h" -#include "driver/tcpm/ps8751.h" -#include "driver/temp_sensor/g78x.h" -#include "extpower.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "i2c.h" -#include "keyboard_scan.h" -#include "lid_switch.h" -#include "math_util.h" -#include "motion_sense.h" -#include "motion_lid.h" -#include "power.h" -#include "power_button.h" -#include "spi.h" -#include "switch.h" -#include "system.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.h" -#include "usb_pd_tcpm.h" -#include "util.h" - -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args) - -uint16_t tcpc_get_alert_status(void) -{ - uint16_t status = 0; - - if (gpio_get_level(GPIO_USB_C0_PD_INT)) - if (gpio_get_level(GPIO_USB_C0_RST_L)) - status |= PD_STATUS_TCPC_ALERT_0; - - if (!gpio_get_level(GPIO_USB_C1_PD_INT_L)) - if (gpio_get_level(GPIO_USB_C1_RST_L)) - status |= PD_STATUS_TCPC_ALERT_1; - - return status; -} - -static void tcpc_alert_event(enum gpio_signal signal) -{ - if ((signal == GPIO_USB_C0_PD_INT) && - (!gpio_get_level(GPIO_USB_C0_RST_L))) - return; - - if ((signal == GPIO_USB_C1_PD_INT_L) && - (!gpio_get_level(GPIO_USB_C1_RST_L))) - return; - -#ifdef HAS_TASK_PDCMD - /* Exchange status with PD MCU to determine interrupt cause */ - host_command_pd_send_status(0); -#endif -} - -void board_set_tcpc_power_mode(int port, int normal_mode) -{ -} - -/* - * enable_input_devices() is called by the tablet_mode ISR, but changes the - * state of GPIOs, so its definition must reside after including gpio_list. - */ -static void enable_input_devices(void); -DECLARE_DEFERRED(enable_input_devices); - -void tablet_mode_interrupt(enum gpio_signal signal) -{ - hook_call_deferred(&enable_input_devices_data, 0); -} - -#include "gpio_list.h" - -/* power signal list. Must match order of enum power_signal. */ -const struct power_signal_info power_signal_list[] = { - {GPIO_RSMRST_L_PGOOD, 1, "PMIC_RSMRST_N"}, - {GPIO_ALL_SYS_PGOOD, 1, "ALL_SYS_PWRGD"}, - {GPIO_PCH_SLP_S0_L, 1, "PMU_SLP_S0_N"}, - {GPIO_PCH_SLP_S3_L, 1, "PMU_SLP_S3_N"}, - {GPIO_PCH_SLP_S4_L, 1, "PMU_SLP_S4_N"}, - {GPIO_PCH_SUSPWRDNACK, 1, "SUSPWRDNACK"}, - {GPIO_PCH_SUS_STAT_L, 1, "PMU_SUS_STAT_N"}, -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - -/* ADC channels */ -const struct adc_t adc_channels[] = { - /* Vbus sensing. Converted to mV, full ADC is equivalent to 28.16V. */ - [ADC_VBUS] = {"VBUS", NPCX_ADC_CH1, 28160, ADC_READ_MAX+1, 0}, - /* Adapter current output or battery discharging current */ - [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH4, - (5 << BD9995X_IOUT_GAIN_SELECT) * 10000, - ADC_READ_MAX+1, 0}, - /* System current consumption */ - [ADC_PSYS] = {"PSYS", NPCX_ADC_CH3, ADC_MAX_VOLT * 10, - ADC_READ_MAX+1, 3}, - /* Thermistor 0 */ - [ADC_THERM_SYS0] = {"THERM_SYS0", NPCX_ADC_CH0, 1, 1, 0}, - /* Thermistor 1 */ - [ADC_THERM_SYS1] = {"THERM_SYS1", NPCX_ADC_CH2, 1, 1, 0}, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - -const struct i2c_port_t i2c_ports[] = { - {"unused", NPCX_I2C_PORT0_0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, - {"tcpc", NPCX_I2C_PORT0_1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, - {"lid sensor", NPCX_I2C_PORT1, 400, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"base sensor", NPCX_I2C_PORT2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, - {"bat charger", NPCX_I2C_PORT3, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { - {I2C_PORT_TCPC0, TCPC0_I2C_ADDR, &anx74xx_tcpm_drv, - TCPC_ALERT_ACTIVE_HIGH}, - {I2C_PORT_TCPC1, TCPC1_I2C_ADDR, &tcpci_tcpm_drv, - TCPC_ALERT_ACTIVE_LOW}, -}; - -const enum gpio_signal hibernate_wake_pins[] = { - GPIO_AC_PRESENT, - GPIO_LID_OPEN, - GPIO_POWER_BUTTON_L, -}; - -const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); - -#if 1 /* TODO: TCPC */ -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_COUNT] = { - { - .port_addr = 0, - .driver = &anx74xx_tcpm_usb_mux_driver, - .hpd_update = &anx74xx_tcpc_update_hpd_status, - }, - { - .port_addr = 1, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8751_tcpc_update_hpd_status, - } -}; -#endif - -/** - * Reset PD MCU - * - * TCPC0 minimum reset assertion time: 10ms - * TCPC1 minimum reset assertion time: 1ms (must be less than 10ms) - */ -void board_reset_pd_mcu(void) -{ - /* Assert reset to TCPC1 */ - gpio_set_level(GPIO_USB_C1_RST_L, 0); - - /* Assert reset to TCPC0 */ - gpio_set_level(GPIO_USB_C0_RST_L, 0); - msleep(1); - gpio_set_level(GPIO_USB_C0_PWR_EN, 0); - - /* Deassert reset to TCPC1 */ - gpio_set_level(GPIO_USB_C1_RST_L, 1); - - /* TCPC0 requires 10ms reset/power down assertion */ - msleep(10); - - /* Deassert reset to TCPC0 */ - gpio_set_level(GPIO_USB_C0_PWR_EN, 1); - msleep(10); - gpio_set_level(GPIO_USB_C0_RST_L, 1); -} - -void board_tcpc_init(void) -{ - /* Only reset TCPC if not sysjump */ - if (!system_jumped_to_this_image()) - board_reset_pd_mcu(); - - /* Enable TCPC0 interrupt */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT); - - /* Enable TCPC1 interrupt */ - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_L); -} -DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C+1); - -/* - * Temperature sensors data; must be in same order as enum temp_sensor_id. - * Sensor index and name must match those present in coreboot: - * src/mainboard/google/${board}/acpi/dptf.asl - */ -const struct temp_sensor_t temp_sensors[] = { - {"G782_Internal", TEMP_SENSOR_TYPE_BOARD, g78x_get_val, - G78X_IDX_INTERNAL, 4}, - {"G782_Sensor_1", TEMP_SENSOR_TYPE_BOARD, g78x_get_val, - G78X_IDX_EXTERNAL1, 4}, - {"G782_Sensor_2", TEMP_SENSOR_TYPE_BOARD, g78x_get_val, - G78X_IDX_EXTERNAL2, 4}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, - 0, 4}, -}; -BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -/* ALS instances. Must be in same order as enum als_id. */ -struct als_t als[] = { - {"ISL", isl29035_init, isl29035_read_lux, 5}, -}; -BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT); - -const struct button_config buttons[CONFIG_BUTTON_COUNT] = { - {"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN_L, - 30 * MSEC, 0}, - {"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_VOLUME_UP_L, - 30 * MSEC, 0}, -}; - -/* Called by APL power state machine when transitioning from G3 to S5 */ -static void chipset_pre_init(void) -{ - /* Enable V5A / PMIC */ - gpio_set_level(GPIO_V5A_EN, 1); -} -DECLARE_HOOK(HOOK_CHIPSET_PRE_INIT, chipset_pre_init, HOOK_PRIO_DEFAULT); - -void chipset_do_shutdown(void) -{ - /* Disable V5A / PMIC */ - gpio_set_level(GPIO_V5A_EN, 0); -} - -/* Initialize board. */ -static void board_init(void) -{ - /* Enable charger interrupt */ - gpio_enable_interrupt(GPIO_CHARGER_INT_L); - - /* Enable tablet mode interrupt for input device enable */ - gpio_enable_interrupt(GPIO_TABLET_MODE_L); -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); - -int pd_snk_is_vbus_provided(int port) -{ - enum bd9995x_charge_port bd9995x_port; - - switch (port) { - case 0: - case 1: - bd9995x_port = bd9995x_pd_port_to_chg_port(port); - break; - default: - panic("Invalid charge port\n"); - break; - } - - return bd9995x_is_vbus_provided(bd9995x_port); -} - -/** - * Set active charge port -- only one port can be active at a time. - * - * @param charge_port Charge port to enable. - * - * Returns EC_SUCCESS if charge port is accepted and made active, - * EC_ERROR_* otherwise. - */ -int board_set_active_charge_port(int charge_port) -{ - enum bd9995x_charge_port bd9995x_port; - static int initialized; - - /* charge port is a realy physical port */ - int is_real_port = (charge_port >= 0 && - charge_port < CONFIG_USB_PD_PORT_COUNT); - /* check if we are source vbus on that port */ - int source = usb_charger_port_is_sourcing_vbus(charge_port); - - if (is_real_port && source) { - CPRINTS("Skip enable p%d", charge_port); - return EC_ERROR_INVAL; - } - - /* - * Reject charge port disable if our battery is critical and we - * have yet to initialize a charge port - continue to charge using - * charger ROM / POR settings. - */ - if (!initialized && - charge_port == CHARGE_PORT_NONE && - charge_get_percent() < 2) - return -1; - - CPRINTS("New chg p%d", charge_port); - - switch (charge_port) { - case 0: - case 1: - bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port); - break; - case CHARGE_PORT_NONE: - bd9995x_port = BD9995X_CHARGE_PORT_NONE; - break; - default: - panic("Invalid charge port\n"); - break; - } - - initialized = 1; - - return bd9995x_select_input_port(bd9995x_port); -} - -/** - * Set the charge limit based upon desired maximum. - * - * @param port Port number. - * @param supplier Charge supplier type. - * @param charge_ma Desired charge limit (mA). - */ -void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma) -{ - /* Enable charging trigger by BC1.2 detection */ - int bc12_enable = (supplier == CHARGE_SUPPLIER_BC12_CDP || - supplier == CHARGE_SUPPLIER_BC12_DCP || - supplier == CHARGE_SUPPLIER_BC12_SDP || - supplier == CHARGE_SUPPLIER_OTHER); - - if (bd9995x_bc12_enable_charging(port, bc12_enable)) - return; - - charge_set_input_current_limit(MAX(charge_ma, - CONFIG_CHARGER_INPUT_CURRENT)); -} - -/** - * Return whether ramping is allowed for given supplier - */ -int board_is_ramp_allowed(int supplier) -{ - /* Don't allow ramping in RO when write protected */ - if (system_get_image_copy() != SYSTEM_IMAGE_RW - && system_is_locked()) - return 0; - else - return (supplier == CHARGE_SUPPLIER_BC12_DCP || - supplier == CHARGE_SUPPLIER_BC12_SDP || - supplier == CHARGE_SUPPLIER_BC12_CDP || - supplier == CHARGE_SUPPLIER_OTHER); -} - -/** - * Return the maximum allowed input current - */ -int board_get_ramp_current_limit(int supplier, int sup_curr) -{ - return bd9995x_get_bc12_ilim(supplier); -} - -/** - * Return if board is consuming full amount of input current - */ -int board_is_consuming_full_charge(void) -{ - int chg_perc = charge_get_percent(); - - return chg_perc > 2 && chg_perc < 95; -} - -/** - * Return if VBUS is sagging too low - */ -int board_is_vbus_too_low(enum chg_ramp_vbus_state ramp_state) -{ - return charger_get_vbus_level() < BD9995X_BC12_MIN_VOLTAGE; -} - -/* Enable or disable input devices, based upon chipset state and tablet mode */ -static void enable_input_devices(void) -{ - int kb_enable = 1; - int tp_enable = 1; - - /* Disable both TP and KB in tablet mode */ - if (!gpio_get_level(GPIO_TABLET_MODE_L)) - kb_enable = tp_enable = 0; - /* Disable TP if chipset is off */ - else if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) - tp_enable = 0; - - keyboard_scan_enable(kb_enable, KB_SCAN_DISABLE_LID_ANGLE); - gpio_set_level(GPIO_ENABLE_TOUCHPAD, tp_enable); -} - -/* Called on AP S5 -> S3 transition */ -static void board_chipset_startup(void) -{ - hook_call_deferred(&enable_input_devices_data, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); - -/* Called on AP S3 -> S5 transition */ -static void board_chipset_shutdown(void) -{ - hook_call_deferred(&enable_input_devices_data, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); - -void board_hibernate_late(void) -{ - int i; - const uint32_t hibernate_pins[][2] = { - /* Turn off LEDs in hibernate */ - {GPIO_BAT_LED_BLUE, GPIO_INPUT | GPIO_PULL_UP}, - {GPIO_BAT_LED_AMBER, GPIO_INPUT | GPIO_PULL_UP}, - /* - * In hibernate, this pin connected to GND. Set it to output - * low to eliminate the current caused by internal pull-up. - */ - {GPIO_PLATFORM_EC_PROCHOT, GPIO_OUTPUT | GPIO_LOW}, - /* - * Leave USB-C charging enabled in hibernate, in order to - * allow wake-on-plug. 5V enable must be pulled low. - */ - {GPIO_USB_C0_5V_EN, GPIO_INPUT | GPIO_PULL_DOWN}, - {GPIO_USB_C1_5V_EN, GPIO_INPUT | GPIO_PULL_DOWN}, - }; - - /* Change GPIOs' state in hibernate for better power consumption */ - for (i = 0; i < ARRAY_SIZE(hibernate_pins); ++i) - gpio_set_flags(hibernate_pins[i][0], hibernate_pins[i][1]); - - gpio_config_module(MODULE_KEYBOARD_SCAN, 0); - - /* - * Calling gpio_config_module sets disabled alternate function pins to - * GPIO_INPUT. But to prevent keypresses causing leakage currents - * while hibernating we want to enable GPIO_PULL_UP as well. - */ - gpio_set_flags_by_mask(0x2, 0x03, GPIO_INPUT | GPIO_PULL_UP); - gpio_set_flags_by_mask(0x1, 0xFF, GPIO_INPUT | GPIO_PULL_UP); - gpio_set_flags_by_mask(0x0, 0xE0, GPIO_INPUT | GPIO_PULL_UP); -} - -/* Motion sensors */ -/* Mutexes */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -/* Matrix to rotate accelrator into standard reference frame */ -const matrix_3x3_t base_standard_ref = { - { 0, FLOAT_TO_FP(-1), 0}, - { FLOAT_TO_FP(1), 0, 0}, - { 0, 0, FLOAT_TO_FP(1)} -}; - -/* KX022 private data */ -struct kionix_accel_data g_kx022_data; - -struct motion_sensor_t motion_sensors[] = { - [BASE_ACCEL] = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_KX022, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &kionix_accel_drv, - .mutex = &g_base_mutex, - .drv_data = &g_kx022_data, - .port = I2C_PORT_ACCEL, - .addr = KX022_ADDR1, - .rot_standard_ref = &base_standard_ref, - .default_range = 2, /* g, enough for laptop. */ - .config = { - /* AP: diabled until AP asks for data */ - [SENSOR_CONFIG_AP] = { - .odr = 0, - .ec_rate = 0, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - /* unused */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 0, - .ec_rate = 0, - }, - [SENSOR_CONFIG_EC_S5] = { - .odr = 0, - .ec_rate = 0, - }, - }, - }, - - [LID_ACCEL] = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &bmi160_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_ACCELGYRO, - .addr = BMI160_ADDR0, - .rot_standard_ref = NULL, /* Identity matrix. */ - .default_range = 2, /* g, enough for laptop. */ - .config = { - /* AP: by default use EC settings */ - [SENSOR_CONFIG_AP] = { - .odr = 0, - .ec_rate = 0, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 0, - .ec_rate = 0 - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S5] = { - .odr = 0, - .ec_rate = 0 - }, - }, - }, - - [LID_GYRO] = { - .name = "Lid Gyro", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_LID, - .drv = &bmi160_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_ACCELGYRO, - .addr = BMI160_ADDR0, - .default_range = 1000, /* dps */ - .rot_standard_ref = NULL, /* Identity Matrix. */ - .config = { - /* AP: by default shutdown all sensors */ - [SENSOR_CONFIG_AP] = { - .odr = 0, - .ec_rate = 0, - }, - /* EC does not need in S0 */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S5] = { - .odr = 0, - .ec_rate = 0, - }, - }, - }, - - [LID_MAG] = { - .name = "Lid Mag", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BMI160, - .type = MOTIONSENSE_TYPE_MAG, - .location = MOTIONSENSE_LOC_LID, - .drv = &bmi160_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bmi160_data, - .port = I2C_PORT_ACCELGYRO, - .addr = BMI160_ADDR0, - .default_range = 1 << 11, /* 16LSB / uT, fixed */ - .rot_standard_ref = NULL, /* Identity Matrix. */ - .config = { - /* AP: by default shutdown all sensors */ - [SENSOR_CONFIG_AP] = { - .odr = 0, - .ec_rate = 0, - }, - /* EC does not need in S0 */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S5] = { - .odr = 0, - .ec_rate = 0, - }, - }, - }, - - [BASE_BARO] = { - .name = "Base Baro", - .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BMP280, - .type = MOTIONSENSE_TYPE_BARO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &bmp280_drv, - .drv_data = &bmp280_drv_data, - .port = I2C_PORT_BARO, - .addr = BMP280_I2C_ADDRESS1, - .rot_standard_ref = NULL, - .config = { - /* AP: by default shutdown all sensors */ - [SENSOR_CONFIG_AP] = { - .odr = 0, - .ec_rate = 0, - }, - /* EC does not need in S0 */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 0, - .ec_rate = 0, - }, - /* Sensor off in S3/S5 */ - [SENSOR_CONFIG_EC_S5] = { - .odr = 0, - .ec_rate = 0, - }, - }, - }, - -}; -const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -void board_hibernate(void) -{ - CPRINTS("Enter Pseudo G3"); - - /* Enable both the VBUS & VCC ports before entering PG3 */ - bd9995x_select_input_port(BD9995X_CHARGE_PORT_BOTH); - - /* - * Clean up the UART buffer and prevent any unwanted garbage characters - * before power off and also ensure above debug message is printed. - */ - cflush(); - - gpio_set_level(GPIO_G3_SLEEP_EN, 1); - - /* Power to EC should shut down now */ - while (1) - ; -} diff --git a/board/amenia/board.h b/board/amenia/board.h deleted file mode 100644 index e4ae82bae8..0000000000 --- a/board/amenia/board.h +++ /dev/null @@ -1,252 +0,0 @@ -/* Copyright 2016 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. - */ - -/* Amenia board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -/* - * Allow dangerous commands. - * TODO: Remove this config before production. - */ -#define CONFIG_SYSTEM_UNLOCKED - -/* Optional features */ -#define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_ACCEL_KX022 -#define CONFIG_ADC -#define CONFIG_ALS -#define CONFIG_ALS_ISL29035 -#define CONFIG_BACKLIGHT_LID -#define CONFIG_BARO_BMP280 -#define CONFIG_BATTERY_CUT_OFF -#define CONFIG_BATTERY_PRESENT_CUSTOM -#define CONFIG_BATTERY_SMART -#define CONFIG_BOARD_VERSION -#define CONFIG_BUTTON_COUNT 2 -#define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGE_RAMP - -#define CONFIG_CHARGER -#define CONFIG_CHARGER_V2 - -#define CONFIG_CHARGER_DISCHARGE_ON_AC -#define CONFIG_CHARGER_BD99955 -#define CONFIG_CHARGER_ILIM_PIN_DISABLED -#define CONFIG_CHARGER_INPUT_CURRENT 512 -#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 1 -#define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 15000 -#define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#define CONFIG_CHARGER_NARROW_VDC -#define CONFIG_USB_CHARGER - -#define CONFIG_CMD_CHARGER_ADC_AMON_BMON -#define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 -#define BD9995X_IOUT_GAIN_SELECT \ - BD9995X_CMD_PMON_IOUT_CTRL_SET_IOUT_GAIN_SET_20V - -#define CONFIG_CMD_CHARGER_PSYS -#define BD9995X_PSYS_GAIN_SELECT \ - BD9995X_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_02UAW - -#define CONFIG_CHIPSET_APOLLOLAKE -#define CONFIG_CMD_ACCELS -#define CONFIG_CMD_ACCEL_INFO -#define CONFIG_CMD_ALS -#define CONFIG_EXTPOWER_GPIO -#define CONFIG_FPU -#define CONFIG_I2C -#define CONFIG_I2C_MASTER -#define CONFIG_LPC -#define CONFIG_UART_HOST 0 -#define CONFIG_KEYBOARD_COL2_INVERTED -#define CONFIG_KEYBOARD_PROTOCOL_8042 -#define CONFIG_LED_COMMON -#define CONFIG_LID_ANGLE -#define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL -#define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL -#define CONFIG_LID_SWITCH -#define CONFIG_LOW_POWER_IDLE -#define CONFIG_LOW_POWER_S0 -#define CONFIG_LTO -#define CONFIG_MAG_BMI160_BMM150 -#define BMM150_I2C_ADDRESS BMM150_ADDR0 -#define CONFIG_MAG_CALIBRATE -#define CONFIG_POWER_BUTTON -#define CONFIG_POWER_BUTTON_X86 -#define CONFIG_POWER_COMMON -#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L -#define CONFIG_USB_POWER_DELIVERY -#define CONFIG_USB_PD_ALT_MODE -#define CONFIG_USB_PD_ALT_MODE_DFP -#define CONFIG_USB_PD_CUSTOM_VDM -#define CONFIG_USB_PD_DISCHARGE -#define CONFIG_USB_PD_DISCHARGE_TCPC -#define CONFIG_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_LOG_SIZE 512 -#define CONFIG_USB_PD_PORT_COUNT 2 -#define CONFIG_USB_PD_TCPM_ANX74XX -#define TCPC0_I2C_ADDR 0x50 -#define CONFIG_USB_PD_TCPM_PS8751 -#define CONFIG_USB_PD_TCPM_TCPCI -#define TCPC1_I2C_ADDR 0x16 -#define CONFIG_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_PD_VBUS_DETECT_CHARGER -#define CONFIG_USB_PORT_POWER_SMART -#define GPIO_USB1_CTL1 GPIO_USB_CTL1 -#define GPIO_USB1_CTL2 GPIO_UNIMPLEMENTED -#define GPIO_USB1_CTL3 GPIO_UNIMPLEMENTED -#define GPIO_USB2_CTL1 GPIO_USB_CTL1 -#define GPIO_USB2_CTL2 GPIO_UNIMPLEMENTED -#define GPIO_USB2_CTL3 GPIO_UNIMPLEMENTED -#define CONFIG_USB_PORT_POWER_SMART_DEFAULT_MODE USB_CHARGE_MODE_CDP -#define CONFIG_USBC_SS_MUX -#define CONFIG_USBC_SS_MUX_DFP_ONLY -#define CONFIG_USBC_VCONN -#define CONFIG_USBC_VCONN_SWAP -#define CONFIG_VBOOT_HASH - -/* - * Enable 1 slot of secure temporary storage to support - * suspend/resume with read/write memory training. - */ -#define CONFIG_VSTORE -#define CONFIG_VSTORE_SLOT_COUNT 1 - -#define CONFIG_FLASH_SIZE 0x80000 /* 512 KB Flash used for EC */ -#define CONFIG_SPI_FLASH_W25X40 - -#define CONFIG_TEMP_SENSOR -#define CONFIG_TEMP_SENSOR_G782 -#define CONFIG_DPTF - -/* Optional feature - used by nuvoton */ -#define NPCX_I2C0_BUS2 0 /* 0:GPIOB4/B5 1:GPIOB2/B3 as I2C0 */ -#define NPCX_UART_MODULE2 1 /* 0:GPIO10/11 1:GPIO64/65 as UART */ -#define NPCX_JTAG_MODULE2 0 /* 0:GPIO21/17/16/20 1:GPIOD5/E2/D4/E5 as JTAG*/ -#define NPCX_TACH_SEL2 0 /* 0:GPIO40/A4 1:GPIO93/D3 as TACH */ - -#define CONFIG_WATCHDOG_HELP - -#define CONFIG_WIRELESS -#define CONFIG_WIRELESS_SUSPEND \ - (EC_WIRELESS_SWITCH_WLAN | EC_WIRELESS_SWITCH_WLAN_POWER) - -/* Wireless signals */ -#define WIRELESS_GPIO_WLAN GPIO_WLAN_OFF_L -#define WIRELESS_GPIO_WLAN_POWER GPIO_WLAN_EN - -/* LED signals */ -#define GPIO_BAT_LED_RED GPIO_CHARGE_LED_1 -#define GPIO_BAT_LED_GREEN GPIO_CHARGE_LED_2 - -/* I2C ports */ -#define I2C_PORT_TCPC0 NPCX_I2C_PORT0_1 -#define I2C_PORT_TCPC1 NPCX_I2C_PORT0_1 -#define I2C_PORT_ACCELGYRO NPCX_I2C_PORT1 -#define I2C_PORT_ALS NPCX_I2C_PORT2 -#define I2C_PORT_ACCEL NPCX_I2C_PORT2 -#define I2C_PORT_BARO NPCX_I2C_PORT2 -#define I2C_PORT_BATTERY NPCX_I2C_PORT3 -#define I2C_PORT_CHARGER NPCX_I2C_PORT3 -#define I2C_PORT_THERMAL NPCX_I2C_PORT3 - -/* Modules we want to exclude */ -#undef CONFIG_PECI - -#ifndef __ASSEMBLER__ - -#include "gpio_signal.h" -#include "registers.h" - -/* ADC signal */ -enum adc_channel { - ADC_VBUS, - ADC_AMON_BMON, - ADC_PSYS, - ADC_THERM_SYS0, - ADC_THERM_SYS1, - /* Number of ADC channels */ - ADC_CH_COUNT -}; - -/* power signal definitions */ -enum power_signal { - X86_RSMRST_N = 0, - X86_ALL_SYS_PG, - X86_SLP_S0_N, - X86_SLP_S3_N, - X86_SLP_S4_N, - X86_SUSPWRDNACK, - X86_SUS_STAT_N, - /* Number of X86 signals */ - POWER_SIGNAL_COUNT -}; - -enum temp_sensor_id { - /* G782 local and remote sensors */ - TEMP_SENSOR_I2C_G782_LOCAL, - TEMP_SENSOR_I2C_G782_REMOTE1, - TEMP_SENSOR_I2C_G782_REMOTE2, - - /* Battery temperature sensor */ - TEMP_SENSOR_BATTERY, - - TEMP_SENSOR_COUNT -}; - -/* Light sensors */ -enum als_id { - ALS_ISL29035 = 0, - - ALS_COUNT -}; - -/* - * Motion sensors - * When reading through IO memory is set up for sensors (LPC is used), - * the first 2 entries must be accelerometers, then gyroscope. - * For BMI160, accel, gyro and compass sensors must be next to each other. - */ -enum sensor_id { - BASE_ACCEL = 0, - LID_ACCEL, - LID_GYRO, - LID_MAG, - BASE_BARO, -}; - -/* start as a sink in case we have no other power supply/battery */ -#define PD_DEFAULT_STATE PD_STATE_SNK_DISCONNECTED - -/* TODO: determine the following board specific type-C power constants */ -/* - * delay to turn on the power supply max is ~16ms. - * delay to turn off the power supply max is about ~180ms. - */ -#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ -#define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ - -/* delay to turn on/off vconn */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ - -/* Define typical operating power and max power */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 45000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - -/* Reset PD MCU */ -void board_reset_pd_mcu(void); - -void board_set_tcpc_power_mode(int port, int normal_mode); - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/amenia/build.mk b/board/amenia/build.mk deleted file mode 100644 index 5f92791697..0000000000 --- a/board/amenia/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2016 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 Nuvoton M-Series EC (npcx5m5g, npcx5m6g) -CHIP:=npcx -CHIP_VARIANT:=npcx5m6g - -board-y=board.o led.o -board-$(CONFIG_BATTERY_SMART)+=battery.o -board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/board/amenia/ec.tasklist b/board/amenia/ec.tasklist deleted file mode 100644 index b7ed91b073..0000000000 --- a/board/amenia/ec.tasklist +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2016 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. - */ - -/* - * List of enabled tasks in the priority order - * - * The first one has the lowest priority. - * - * For each task, use the macro TASK_ALWAYS(n, r, d, s) for base tasks and - * TASK_NOTEST(n, r, d, s) for tasks that can be excluded in test binaries, - * where : - * 'n' is the name of the task - * 'r' is the main routine of the task - * 'd' is an opaque parameter passed to the routine at startup - * 's' is the stack size in bytes; must be a multiple of 8 - */ -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(ALS, als_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG, usb_charger_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_NOTEST(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ - TASK_NOTEST(PDCMD, pd_command_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \ - TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C1, pd_task, NULL, LARGER_TASK_STACK_SIZE) diff --git a/board/amenia/gpio.inc b/board/amenia/gpio.inc deleted file mode 100644 index 7f0ac580b6..0000000000 --- a/board/amenia/gpio.inc +++ /dev/null @@ -1,157 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2016 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. - */ - -GPIO_INT(AC_PRESENT, PIN(7, 3), GPIO_INT_BOTH, extpower_interrupt) /* B39 - PS2_CLK3/TA2for EC_ACIN */ -GPIO_INT(LID_OPEN, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, lid_interrupt) /* A47 - SPIP_MISO for LID_OPEN_D */ -GPIO_INT(POWER_BUTTON_L, PIN(9, 7), GPIO_INT_BOTH, power_button_interrupt) /* A48 - GPIO97 for PWR_BTN_N */ -GPIO_INT(TABLET_MODE_L, PIN(E, 7), GPIO_INT_BOTH | GPIO_PULL_UP, tablet_mode_interrupt) /* B37 - 32KCLKIN for TABLET_MODE_EC */ -GPIO_INT(VOLUME_UP_L, PIN(0, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* B68 - GPIO00 for VOLUME_UP_N */ -GPIO_INT(VOLUME_DOWN_L, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) /* B36 - PS2_DAT0 for VOLUME_DOWN_N */ -GPIO_INT(WP_L, PIN(7, 1), GPIO_INT_BOTH, switch_interrupt) /* B38 - PS2_DAT3/TB2 for SCREW_SPI_WP_N */ - -GPIO_INT(PCH_SLP_S4_L, PIN(5, 0), GPIO_INT_BOTH, power_signal_interrupt) /* A25 - GPIO50 for PMU_SLP_S4_N */ -GPIO_INT(PCH_SLP_S3_L, PIN(4, 0), GPIO_INT_BOTH, power_signal_interrupt) /* B21 - TA1 for PMU_SLP_S3_N */ -GPIO_INT(PCH_SLP_S0_L, PIN(3, 4), GPIO_INT_BOTH, power_signal_interrupt) /* B18 - GPIO34 for PMU_SLP_S0_N */ -GPIO_INT(PCH_SUS_STAT_L, PIN(C, 5), GPIO_INT_BOTH, power_signal_interrupt) /* A61 - KBRST# for PMU_SUS_STAT_N */ -GPIO_INT(PCH_SUSPWRDNACK, PIN(B, 1), GPIO_INT_BOTH, power_signal_interrupt) /* A54 - KSO17 for SOC_SUSPWRDNACK_R */ -GPIO_INT(ALL_SYS_PGOOD, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) /* A31 - PS2_CLK1 for ALL_SYS_PWRGD */ -GPIO_INT(RSMRST_L_PGOOD, PIN(9, 3), GPIO_INT_BOTH, power_signal_interrupt) /* A46 - TA1/F_DIO2 for PMIC_RSMRST_N */ - -GPIO_INT(USB_C0_PD_INT, PIN(8, 5), GPIO_INT_RISING, tcpc_alert_event) /* A43 - RXD for USB_C0_PHY_INT */ -GPIO_INT(USB_C1_PD_INT_L, PIN(9, 4), GPIO_INT_FALLING, tcpc_alert_event) /* B49 - GPIO94 for USB_C1_PHY_INT_N */ -GPIO_INT(CHARGER_INT_L, PIN(0, 2), GPIO_INT_FALLING | GPIO_PULL_UP, bd9995x_vbus_interrupt) /* A01 - GPIO02 for CHRGR_INT_N */ - -GPIO(NC_USB_C0_VBUS_WAKE_L, PIN(A, 7), GPIO_INPUT | GPIO_PULL_UP) /* B56 - PS2_DAT3/TB2/F_DIO3 for USB_C0_VBUS_DET_N */ -GPIO(NC_USB_C1_VBUS_WAKE_L, PIN(6, 1), GPIO_INPUT | GPIO_PULL_UP) /* B32 - GPIO61 for USB_C1_VBUS_DET_N */ - -/* Board ID */ -GPIO(BOARD_VERSION1, PIN(0, 4), GPIO_INPUT) /* A02 - KSO13 for EC_BRD_ID1 */ -GPIO(BOARD_VERSION2, PIN(8, 2), GPIO_INPUT) /* B43 - KSO14 for EC_BRD_ID2 */ -GPIO(BOARD_VERSION3, PIN(8, 3), GPIO_INPUT) /* B44 - KSO15 for EC_BRD_ID3 */ - -/* I2C pins - these will be reconfigured for alternate function below */ -GPIO(I2C0_0_SCL, PIN(B, 5), GPIO_INPUT) /* A56 - I2C0_SCL0 for EC_ROP_I2C_CLK */ -GPIO(I2C0_0_SDA, PIN(B, 4), GPIO_INPUT) /* B59 - I2C0_SDA0 for EC_ROP_I2C_SDA */ -GPIO(I2C0_1_SCL, PIN(B, 3), GPIO_INPUT) /* A55 - I2C0_SCL1 for EC_MUX_CLK */ -GPIO(I2C0_1_SDA, PIN(B, 2), GPIO_INPUT) /* B58 - I2C0_SDA1 for EC_MUX_SDA */ -GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* B47 - I2C1_SCL0 for EC_PD_I2C_CLK */ -GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* A44 - I2C1_SDA0 for EC_PD_I2C_SDA */ -GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* B48 - I2C2_SCL0 for EC_SENSOR_I2C_CLK */ -GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* A45 - I2C2_SDA0 for EC_SENSOR_I2C_SDA */ -GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* A63 - I2C3_SCL0 for EC_SMB_CLK */ -GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* B66 - I2C3_SDA0 for EC_SMB_SDA */ - -/* - * TODO(crosbug.com/p/40848): These LEDs should be under control of the npcx - * LED control unit. Remove these GPIO definitions once the LED control unit - * is functional. - */ -/* LED */ -GPIO(BAT_LED_BLUE, PIN(B, 7), GPIO_OUT_LOW) /* A57 - PWM5 for CHARGE_LED1 */ -GPIO(BAT_LED_AMBER, PIN(C, 0), GPIO_OUT_LOW) /* B61 - PWM6 for CHARGE_LED2 */ - -/* Power Control*/ -GPIO(V5A_EN, PIN(C, 4), GPIO_OUT_LOW) /* B64 - PWM2 for V5A_EN */ -GPIO(G3_SLEEP_EN, PIN(E, 3), GPIO_OUT_LOW) /* B51 - GPIOE3 for G3_SLEEP_ENA */ -GPIO(ENABLE_BACKLIGHT, PIN(E, 2), GPIO_OUT_LOW) /* A41 - JTAG_TDI1 for EC_BL_DISABLE_N */ -GPIO(ENABLE_TOUCHPAD, PIN(A, 6), GPIO_OUT_LOW) /* B55 - PS2_CLK3/TA2/F_CS1# for TRACKPAD_PWR_EN */ -GPIO(WLAN_OFF_L, PIN(E, 0), GPIO_OUT_LOW) /* A24 - GPOE0 for WLAN_OFF_N */ -GPIO(WLAN_EN, PIN(E, 4), GPIO_OUT_LOW) /* A52 - GPIOE4 for EN_PWR_WIFI */ - -/* Sensors Interrupt */ -GPIO(ALS_INT, PIN(3, 3), GPIO_INPUT) /* B17 - GPIO33 for ALS_IRQ_N */ -GPIO(BASE_ACCEL_INT, PIN(A, 3), GPIO_INPUT) /* A50 - SPIP_MOSI for BASE_ACCEL_INT */ -GPIO(GYRO_INT, PIN(8, 6), GPIO_INPUT | GPIO_PULL_UP) /* B46 - TXD/F_CS1# for GYRO_INT_N */ - -/* SOC */ -GPIO(PCH_SCI_L, PIN(7, 6), GPIO_ODR_HIGH) /* A38 - SCI# for EC_SCI_3P3_N */ -GPIO(PCH_SMI_L, PIN(C, 6), GPIO_ODR_HIGH) /* B65 - SMI# for EC_SMI_3P3_N */ -GPIO(PCH_PWRBTN_L, PIN(A, 5), GPIO_ODR_HIGH) /* A51 - A20M for EC_SOC_PWRBTN_N */ -GPIO(CPU_PROCHOT, PIN(D, 7), GPIO_OUT_LOW) /* A18 - GPIOD7 for EC_SOC_PROCHOT */ -/* When asserted, ME does not lock security descriptor */ -GPIO(PCH_SEC_DISABLE_L, PIN(6, 3), GPIO_OUT_HIGH) /* B33 - PS2_DAT1 for FLASH_DSC_OVERRIDE_N */ -GPIO(PCH_WAKE_L, PIN(3, 5), GPIO_OUT_HIGH) /* A17 - GPIO35/TEST# for EC_SOC_WAKE_N */ -GPIO(PCH_RCIN_L, PIN(E, 1), GPIO_OUT_HIGH) /* B30 - GPIOE1 for EC_SOC_RST_OUT_N */ -GPIO(KBD_IRQ_L_DO_NOT_USE, PIN(D, 5), GPIO_INPUT | GPIO_PULL_UP) /* A08 - JTAG_TCK1 for EC_KBD_IRQ_N_R */ -GPIO(PCH_SYS_PWROK, PIN(7, 2), GPIO_OUT_LOW) /* A36 - PWRGD for SOC_PWROK_R */ - -GPIO(PCH_RSMRST_L, PIN(8, 4), GPIO_OUT_LOW) /* B45 - GPIO84 for EC_RSMRST_OUT_N */ -GPIO(PCH_RTCRST, PIN(C, 1), GPIO_OUT_LOW) /* A58 - GPIOC1 for EC_RTCRST */ - -/* USB-A Port */ -GPIO(USB1_ENABLE, PIN(6, 7), GPIO_OUT_LOW) /* A33 - PS2_CLK0 for USBPD_MB_PWR_EN */ -GPIO(USB2_ENABLE, PIN(D, 4), GPIO_OUT_LOW) /* B08 - JTAG_TDO1 for USBPD_DB_PWR_EN */ -GPIO(USB1_ILIM_SEL, PIN(A, 1), GPIO_ODR_HIGH) /* A49 - SPIP_SCLK for USBPD_MBILIMSEL_DBSTATUS_N */ -GPIO(USB2_ILIM_SEL, PIN(C, 2), GPIO_ODR_HIGH) /* A59 - PWM1 for USBPD_MBSTATUS_N_DBILIMSEL */ -GPIO(USB_CTL1, PIN(B, 6), GPIO_ODR_HIGH) /* B60 - PWM4/Eng_Strap# for EC_GPOB6 */ - -/* USB-C Port 0 */ -GPIO(USB_C0_5V_EN, PIN(0, 1), GPIO_OUT_LOW) /* B01 - GPIO01 for EN_USB_C0_5V_OUT */ -GPIO(USB_C0_RST_L, PIN(7, 4), GPIO_OUT_LOW) /* A37 - GPIO74 for USB_C0_RESET_ANX_N */ -GPIO(USB_C0_PWR_EN, PIN(D, 3), GPIO_OUT_LOW) /* A64 - TB1 for USB_C0_ANX_PWR_EN */ -GPIO(USB_C0_CABLE_DET, PIN(B, 0), GPIO_INPUT) /* B57 - GPIOB0 for USB_C0_CABLE_DET */ - -/* USB-C Port 1 */ -GPIO(USB_C1_5V_EN, PIN(E, 5), GPIO_OUT_LOW) /* B62 - JTAG_TMS1 for EN_USB_C1_5V_OUT */ -GPIO(USB_C1_RST_L, PIN(C, 7), GPIO_OUT_LOW) /* A62 - GPIOC7 for USC_C1_RESET_PAR_N */ - -/* Other EC Pins */ -GPIO(ENTERING_RW, PIN(6, 0), GPIO_OUT_LOW) /* A30 - PWM7 for EC_ENTERING_RW */ -GPIO(BAT_PRESENT_L, PIN(C, 3), GPIO_INPUT | GPIO_PULL_UP) /* A60 - PWM0 for BC_BATPRES_N */ -GPIO(PLATFORM_EC_PROCHOT, PIN(3, 6), GPIO_INPUT) /* B19 - GPIO36 for SOURCE_EC_PROCHOT_R */ -GPIO(THERM_OVERTEMP_L, PIN(8, 0), GPIO_INPUT | GPIO_PULL_UP) /* A39 - PWM3 for THERM_OVERTEMP_N */ -GPIO(USB2_OTG_ID, PIN(7, 5), GPIO_ODR_LOW) /* B40 - 32KHZ_OUT for USB2_OTG_ID */ -GPIO(USB2_OTG_VBUSSENSE, PIN(D, 2), GPIO_ODR_LOW) /* B67 - GPIOD2 for USB_VBUSSNS */ - -/* NC pins - Set as input and pull them up for better power consumption */ -GPIO(NC_003, PIN(0, 3), GPIO_INPUT | GPIO_PULL_UP) /* B02 - KSO16 for TP_PMIC_EN */ -GPIO(NC_032, PIN(3, 2), GPIO_INPUT | GPIO_PULL_UP) /* A16 - TRIS# for TP_EC_GPO32 */ -GPIO(NC_037, PIN(3, 7), GPIO_INPUT | GPIO_PULL_UP) /* B20 - PS2_CLK2 for DDI2_HPD */ -GPIO(NC_066, PIN(6, 6), GPIO_INPUT | GPIO_PULL_UP) /* B35 - ARM#_x86 for DDI1_HPD */ -GPIO(NC_081, PIN(8, 1), GPIO_INPUT | GPIO_PULL_UP) /* A40 - Unused pin */ -GPIO(NC_0D6, PIN(D, 6), GPIO_INPUT | GPIO_PULL_UP) /* B09 - Unused pin */ - -/* Keyboard inverted COL2 */ -GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) /* B11 - KSO02 for KB_ROW_2 */ - -UNIMPLEMENTED(UNIMPLEMENTED) - -/* Alternate functions GPIO definitions */ -/* ADC pins */ -ALTERNATE(PIN_MASK(4, 0x3E), 1, MODULE_ADC, 0) /* ADC0/ADC1/ADC2/ADC3/ADC4 for ADC GPIO45/44/43/42/41 */ - -/* I2C pins */ -ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, 0) /* I2C0SDA1/I2C0SCL1 for I2C GPIOB2/B3 */ -ALTERNATE(PIN_MASK(B, 0x30), 1, MODULE_I2C, 0) /* I2C0SDA0/I2C0SCL0 for I2C GPIOB4/B5 */ -ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* I2C1SDA for I2C GPIO87 */ -ALTERNATE(PIN_MASK(9, 0x07), 1, MODULE_I2C, 0) /* I2C1SCL/I2C2SDA/I2C2SCL for I2C GPIO90/91/92 */ -ALTERNATE(PIN_MASK(D, 0x03), 1, MODULE_I2C, 0) /* I2C3SDA/I2C3SCL for I2C GPIOD0/D1 */ - -/* Keyboard Columns (except inverted COL2/GP17) */ -ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, 0) -ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, 0) -ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, 0) - -/* Keyboard Rows */ -ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, 0) -ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, 0) - -/* LED1 - GPIOB7. LED2 - GPIOC0 */ -ALTERNATE(PIN_MASK(B, 0x80), 3, MODULE_POWER_LED, 0) /* PWM5 for CHARGE_LED1 */ -ALTERNATE(PIN_MASK(C, 0x01), 3, MODULE_POWER_LED, 0) /* PWM6 for CHARGE_LED2 */ - -/* SPI pins */ -ALTERNATE(PIN_MASK(A, 0x0A), 1, MODULE_SPI, 0) /* SPIP_MOSI/SPIP_SCLK for SPI GPIOA3/A1 */ -ALTERNATE(PIN_MASK(9, 0x20), 1, MODULE_SPI, 0) /* SPIP_MISO for SPI GPIO95 */ - -/* UART pins */ -ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, 0) /* CR_SIN/SOUT for UART GPIO64/65 */ diff --git a/board/amenia/led.c b/board/amenia/led.c deleted file mode 100644 index 2380366d85..0000000000 --- a/board/amenia/led.c +++ /dev/null @@ -1,159 +0,0 @@ -/* Copyright 2016 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 Amenia. - */ - -#include "battery.h" -#include "charge_state.h" -#include "chipset.h" -#include "ec_commands.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "led_common.h" -#include "util.h" - -#define BAT_LED_ON 0 -#define BAT_LED_OFF 1 - -#define CRITICAL_LOW_BATTERY_PERCENTAGE 3 -#define LOW_BATTERY_PERCENTAGE 10 - -#define LED_TOTAL_4SECS_TICKS 4 -#define LED_TOTAL_2SECS_TICKS 2 -#define LED_ON_1SEC_TICKS 1 -#define LED_ON_2SECS_TICKS 2 - -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_BATTERY_LED}; - -const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); - -enum led_color { - LED_OFF = 0, - LED_BLUE, - LED_AMBER, - LED_COLOR_COUNT /* Number of colors, not a color itself */ -}; - -static int bat_led_set_color(enum led_color color) -{ - switch (color) { - case LED_OFF: - gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_OFF); - gpio_set_level(GPIO_BAT_LED_AMBER, BAT_LED_OFF); - break; - case LED_BLUE: - gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_ON); - gpio_set_level(GPIO_BAT_LED_AMBER, BAT_LED_OFF); - break; - case LED_AMBER: - gpio_set_level(GPIO_BAT_LED_BLUE, BAT_LED_OFF); - gpio_set_level(GPIO_BAT_LED_AMBER, BAT_LED_ON); - break; - default: - return EC_ERROR_UNKNOWN; - } - return EC_SUCCESS; -} - -void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) -{ - brightness_range[EC_LED_COLOR_BLUE] = 1; - brightness_range[EC_LED_COLOR_AMBER] = 1; -} - -static int led_set_color_battery(enum led_color color) -{ - return bat_led_set_color(color); -} - -static int led_set_color(enum ec_led_id led_id, enum led_color color) -{ - int rv; - - led_auto_control(led_id, 0); - switch (led_id) { - case EC_LED_ID_BATTERY_LED: - rv = led_set_color_battery(color); - break; - default: - return EC_ERROR_UNKNOWN; - } - return rv; -} - -int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) -{ - if (brightness[EC_LED_COLOR_BLUE] != 0) - led_set_color(led_id, LED_BLUE); - else if (brightness[EC_LED_COLOR_AMBER] != 0) - led_set_color(led_id, LED_AMBER); - else - led_set_color(led_id, LED_OFF); - - return EC_SUCCESS; -} - -static void led_set_battery(void) -{ - static int battery_ticks; - uint32_t chflags = charge_get_flags(); - - battery_ticks++; - - /* BAT LED behavior: - * Same as the chromeos spec - * Green/Amber for CHARGE_FLAG_FORCE_IDLE - */ - switch (charge_get_state()) { - case PWR_STATE_CHARGE: - led_set_color_battery(LED_AMBER); - break; - case PWR_STATE_DISCHARGE: - /* Less than 3%, blink one second every two second */ - if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && - charge_get_percent() < CRITICAL_LOW_BATTERY_PERCENTAGE) - led_set_color_battery( - (battery_ticks % LED_TOTAL_2SECS_TICKS < - LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); - /* Less than 10%, blink one second every four seconds */ - else if (!chipset_in_state(CHIPSET_STATE_ANY_OFF) && - charge_get_percent() < LOW_BATTERY_PERCENTAGE) - led_set_color_battery( - (battery_ticks % LED_TOTAL_4SECS_TICKS < - LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); - else - led_set_color_battery(LED_OFF); - break; - case PWR_STATE_ERROR: - led_set_color_battery( - (battery_ticks % LED_TOTAL_2SECS_TICKS < - LED_ON_1SEC_TICKS) ? LED_AMBER : LED_OFF); - break; - case PWR_STATE_CHARGE_NEAR_FULL: - led_set_color_battery(LED_BLUE); - break; - case PWR_STATE_IDLE: /* External power connected in IDLE */ - if (chflags & CHARGE_FLAG_FORCE_IDLE) - led_set_color_battery( - (battery_ticks % LED_TOTAL_4SECS_TICKS < - LED_ON_2SECS_TICKS) ? LED_AMBER : LED_BLUE); - else - led_set_color_battery(LED_BLUE); - break; - default: - /* Other states don't alter LED behavior */ - break; - } -} - -/** * Called by hook task every 1 sec */ -static void led_second(void) -{ - if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) - led_set_battery(); -} -DECLARE_HOOK(HOOK_SECOND, led_second, HOOK_PRIO_DEFAULT); diff --git a/board/amenia/usb_pd_policy.c b/board/amenia/usb_pd_policy.c deleted file mode 100644 index dcc30e6195..0000000000 --- a/board/amenia/usb_pd_policy.c +++ /dev/null @@ -1,375 +0,0 @@ -/* Copyright 2016 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 "atomic.h" -#include "charge_manager.h" -#include "common.h" -#include "console.h" -#include "driver/charger/bd9995x.h" -#include "driver/tcpm/anx74xx.h" -#include "driver/tcpm/ps8751.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "i2c.h" -#include "registers.h" -#include "system.h" -#include "task.h" -#include "timer.h" -#include "util.h" -#include "usb_mux.h" -#include "usb_pd.h" - -#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args) -#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) - -#define PDO_FIXED_FLAGS (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP |\ - PDO_FIXED_COMM_CAP) - -/* TODO: fill in correct source and sink capabilities */ -const uint32_t pd_src_pdo[] = { - PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS), -}; -const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo); - -const uint32_t pd_snk_pdo[] = { - PDO_FIXED(5000, 500, PDO_FIXED_FLAGS), - PDO_BATT(4750, 21000, 15000), - PDO_VAR(4750, 21000, 3000), -}; -const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo); - -int pd_is_valid_input_voltage(int mv) -{ - return 1; -} - -void pd_transition_voltage(int idx) -{ - /* No-operation: we are always 5V */ -} - -int pd_set_power_supply_ready(int port) -{ - /* Ensure we're not charging from this port */ - if (charge_manager_get_active_charge_port() == port) - bd9995x_select_input_port(BD9995X_CHARGE_PORT_NONE); - - /* Provide VBUS */ - gpio_set_level(port ? GPIO_USB_C1_5V_EN : - GPIO_USB_C0_5V_EN, 1); - - pd_set_vbus_discharge(port, 0); - - /* notify host of power info change */ - pd_send_host_event(PD_EVENT_POWER_CHANGE); - - return EC_SUCCESS; /* we are ready */ -} - -void pd_power_supply_reset(int port) -{ - enum gpio_signal gpio; - int prev_en; - - gpio = port ? GPIO_USB_C1_5V_EN : GPIO_USB_C0_5V_EN; - prev_en = gpio_get_level(gpio); - - /* Disable VBUS */ - gpio_set_level(gpio, 0); - - /* Enable discharge if we were previously sourcing 5V */ - if (prev_en) - pd_set_vbus_discharge(port, 1); - - /* notify host of power info change */ - pd_send_host_event(PD_EVENT_POWER_CHANGE); -} - -void pd_set_input_current_limit(int port, uint32_t max_ma, - uint32_t supply_voltage) -{ -#ifdef CONFIG_CHARGE_MANAGER - struct charge_port_info charge; - - charge.current = max_ma; - charge.voltage = supply_voltage; - charge_manager_update_charge(CHARGE_SUPPLIER_PD, port, &charge); -#endif -} - -void typec_set_input_current_limit(int port, uint32_t max_ma, - uint32_t supply_voltage) -{ -#ifdef CONFIG_CHARGE_MANAGER - struct charge_port_info charge; - - charge.current = max_ma; - charge.voltage = supply_voltage; - charge_manager_update_charge(CHARGE_SUPPLIER_TYPEC, port, &charge); -#endif -} - -int pd_board_checks(void) -{ - return EC_SUCCESS; -} - -int pd_check_power_swap(int port) -{ - /* - * Allow power swap as long as we are acting as a dual role device, - * otherwise assume our role is fixed (not in S0 or console command - * to fix our role). - */ - return pd_get_dual_role() == PD_DRP_TOGGLE_ON ? 1 : 0; -} - -int pd_check_data_swap(int port, int data_role) -{ - /* Allow data swap if we are a UFP, otherwise don't allow */ - return (data_role == PD_ROLE_UFP) ? 1 : 0; -} - -int pd_check_vconn_swap(int port) -{ - /* in G3, do not allow vconn swap since pp5000_A rail is off */ - return gpio_get_level(GPIO_V5A_EN); -} - -void pd_execute_data_swap(int port, int data_role) -{ - /* Do nothing */ -} - -void pd_check_pr_role(int port, int pr_role, int flags) -{ - /* - * If partner is dual-role power and dualrole toggling is on, consider - * if a power swap is necessary. - */ - if ((flags & PD_FLAGS_PARTNER_DR_POWER) && - pd_get_dual_role() == PD_DRP_TOGGLE_ON) { - /* - * If we are a sink and partner is not externally powered, then - * swap to become a source. If we are source and partner is - * externally powered, swap to become a sink. - */ - int partner_extpower = flags & PD_FLAGS_PARTNER_EXTPOWER; - - if ((!partner_extpower && pr_role == PD_ROLE_SINK) || - (partner_extpower && pr_role == PD_ROLE_SOURCE)) - pd_request_power_swap(port); - } -} - -void pd_check_dr_role(int port, int dr_role, int flags) -{ - /* If UFP, try to switch to DFP */ - if ((flags & PD_FLAGS_PARTNER_DR_DATA) && dr_role == PD_ROLE_UFP) - pd_request_data_swap(port); -} -/* ----------------- Vendor Defined Messages ------------------ */ -const struct svdm_response svdm_rsp = { - .identity = NULL, - .svids = NULL, - .modes = NULL, -}; - -int pd_custom_vdm(int port, int cnt, uint32_t *payload, - uint32_t **rpayload) -{ - int cmd = PD_VDO_CMD(payload[0]); - uint16_t dev_id = 0; - int is_rw; - - /* make sure we have some payload */ - if (cnt == 0) - return 0; - - switch (cmd) { - case VDO_CMD_VERSION: - /* guarantee last byte of payload is null character */ - *(payload + cnt - 1) = 0; - CPRINTF("version: %s\n", (char *)(payload+1)); - break; - case VDO_CMD_READ_INFO: - case VDO_CMD_SEND_INFO: - /* copy hash */ - if (cnt == 7) { - dev_id = VDO_INFO_HW_DEV_ID(payload[6]); - is_rw = VDO_INFO_IS_RW(payload[6]); - - CPRINTF("DevId:%d.%d SW:%d RW:%d\n", - HW_DEV_ID_MAJ(dev_id), - HW_DEV_ID_MIN(dev_id), - VDO_INFO_SW_DBG_VER(payload[6]), - is_rw); - } else if (cnt == 6) { - /* really old devices don't have last byte */ - pd_dev_store_rw_hash(port, dev_id, payload + 1, - SYSTEM_IMAGE_UNKNOWN); - } - break; - case VDO_CMD_CURRENT: - CPRINTF("Current: %dmA\n", payload[1]); - break; - case VDO_CMD_FLIP: - usb_mux_flip(port); - break; -#ifdef CONFIG_USB_PD_LOGGING - case VDO_CMD_GET_LOG: - pd_log_recv_vdm(port, cnt, payload); - break; -#endif /* CONFIG_USB_PD_LOGGING */ - } - - return 0; -} - -#ifdef CONFIG_USB_PD_ALT_MODE_DFP -static int dp_flags[CONFIG_USB_PD_PORT_COUNT]; -static uint32_t dp_status[CONFIG_USB_PD_PORT_COUNT]; - -static void svdm_safe_dp_mode(int port) -{ - /* make DP interface safe until configure */ - dp_flags[port] = 0; - dp_status[port] = 0; - usb_mux_set(port, TYPEC_MUX_NONE, - USB_SWITCH_CONNECT, pd_get_polarity(port)); -} - -static int svdm_enter_dp_mode(int port, uint32_t mode_caps) -{ - /* Only enter mode if device is DFP_D capable */ - if (mode_caps & MODE_DP_SNK) { - svdm_safe_dp_mode(port); - return 0; - } - - return -1; -} - -static int svdm_dp_status(int port, uint32_t *payload) -{ - int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); - - payload[0] = VDO(USB_SID_DISPLAYPORT, 1, - CMD_DP_STATUS | VDO_OPOS(opos)); - payload[1] = VDO_DP_STATUS(0, /* HPD IRQ ... not applicable */ - 0, /* HPD level ... not applicable */ - 0, /* exit DP? ... no */ - 0, /* usb mode? ... no */ - 0, /* multi-function ... no */ - (!!(dp_flags[port] & DP_FLAGS_DP_ON)), - 0, /* power low? ... no */ - (!!(dp_flags[port] & DP_FLAGS_DP_ON))); - return 2; -}; - -static int svdm_dp_config(int port, uint32_t *payload) -{ - int opos = pd_alt_mode(port, USB_SID_DISPLAYPORT); - - usb_mux_set(port, TYPEC_MUX_DP, - USB_SWITCH_CONNECT, pd_get_polarity(port)); - - /* board_set_usb_mux(port, TYPEC_MUX_DP, pd_get_polarity(port)); */ - payload[0] = VDO(USB_SID_DISPLAYPORT, 1, - CMD_DP_CONFIG | VDO_OPOS(opos)); - payload[1] = VDO_DP_CFG(MODE_DP_PIN_E, /* pin mode */ - 1, /* DPv1.3 signaling */ - 2); /* UFP connected */ - - return 2; -}; - -static void svdm_dp_post_config(int port) -{ - const struct usb_mux *mux = &usb_muxes[port]; - dp_flags[port] |= DP_FLAGS_DP_ON; - if (!(dp_flags[port] & DP_FLAGS_HPD_HI_PENDING)) - return; - mux->hpd_update(port, 1, 0); -} - -static int svdm_dp_attention(int port, uint32_t *payload) -{ - int lvl = PD_VDO_DPSTS_HPD_LVL(payload[1]); - int irq = PD_VDO_DPSTS_HPD_IRQ(payload[1]); - const struct usb_mux *mux = &usb_muxes[port]; - - dp_status[port] = payload[1]; - - if (!(dp_flags[port] & DP_FLAGS_DP_ON)) { - if (lvl) - dp_flags[port] |= DP_FLAGS_HPD_HI_PENDING; - return 1; - } - mux->hpd_update(port, lvl, irq); - - /* ack */ - return 1; -} - -static void svdm_exit_dp_mode(int port) -{ - const struct usb_mux *mux = &usb_muxes[port]; - svdm_safe_dp_mode(port); - mux->hpd_update(port, 0, 0); -} - -static int svdm_enter_gfu_mode(int port, uint32_t mode_caps) -{ - /* Always enter GFU mode */ - return 0; -} - -static void svdm_exit_gfu_mode(int port) -{ -} - -static int svdm_gfu_status(int port, uint32_t *payload) -{ - /* - * This is called after enter mode is successful, send unstructured - * VDM to read info. - */ - pd_send_vdm(port, USB_VID_GOOGLE, VDO_CMD_READ_INFO, NULL, 0); - return 0; -} - -static int svdm_gfu_config(int port, uint32_t *payload) -{ - return 0; -} - -static int svdm_gfu_attention(int port, uint32_t *payload) -{ - return 0; -} - -const struct svdm_amode_fx supported_modes[] = { - { - .svid = USB_SID_DISPLAYPORT, - .enter = &svdm_enter_dp_mode, - .status = &svdm_dp_status, - .config = &svdm_dp_config, - .post_config = &svdm_dp_post_config, - .attention = &svdm_dp_attention, - .exit = &svdm_exit_dp_mode, - }, - { - .svid = USB_VID_GOOGLE, - .enter = &svdm_enter_gfu_mode, - .status = &svdm_gfu_status, - .config = &svdm_gfu_config, - .attention = &svdm_gfu_attention, - .exit = &svdm_exit_gfu_mode, - } -}; -const int supported_modes_cnt = ARRAY_SIZE(supported_modes); -#endif /* CONFIG_USB_PD_ALT_MODE_DFP */ diff --git a/util/flash_ec b/util/flash_ec index 87c4b4b9dd..d7a93c88c9 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -102,7 +102,6 @@ BOARDS_NPCX_5M6G_JTAG=( ) BOARDS_NPCX_SPI=( - amenia gru kevin pyro