diff options
Diffstat (limited to 'board/nami')
| -rw-r--r-- | board/nami/battery.c | 424 | ||||
| -rw-r--r-- | board/nami/board.c | 1133 | ||||
| -rw-r--r-- | board/nami/board.h | 329 | ||||
| -rw-r--r-- | board/nami/build.mk | 15 | ||||
| -rw-r--r-- | board/nami/ec.tasklist | 25 | ||||
| -rw-r--r-- | board/nami/gpio.inc | 120 | ||||
| -rw-r--r-- | board/nami/led.c | 613 | ||||
| -rw-r--r-- | board/nami/usb_pd_policy.c | 114 | ||||
| -rw-r--r-- | board/nami/vif_override.xml | 3 |
9 files changed, 0 insertions, 2776 deletions
diff --git a/board/nami/battery.c b/board/nami/battery.c deleted file mode 100644 index 149272c8c1..0000000000 --- a/board/nami/battery.c +++ /dev/null @@ -1,424 +0,0 @@ -/* Copyright 2017 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. - * - * Placeholder values for temporary battery pack. - */ - -#include "battery.h" -#include "battery_smart.h" -#include "board.h" -#include "charge_state.h" -#include "console.h" -#include "ec_commands.h" -#include "extpower.h" -#include "gpio.h" -#include "hooks.h" -#include "util.h" - -#define CPRINTF(format, args...) cprintf(CC_CHARGER, format, ## args) -#define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args) - -/* Default, Nami, Vayne */ -static const struct battery_info info_0 = { - .voltage_max = 8800, - .voltage_normal = 7600, - .voltage_min = 6000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 70, -}; - -/* Sona */ -static const struct battery_info info_1 = { - .voltage_max = 13200, - .voltage_normal = 11550, - .voltage_min = 9000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 45, - .discharging_min_c = -10, - .discharging_max_c = 60, -}; - -/* Pantheon */ -static const struct battery_info info_2 = { - .voltage_max = 8700, - .voltage_normal = 7500, - .voltage_min = 6000, - .precharge_current = 200, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 60, -}; - -/* Panasonic AP15O5L (Akali) */ -static const struct battery_info info_3 = { - .voltage_max = 13200, - .voltage_normal = 11550, - .voltage_min = 9000, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = 0, - .discharging_max_c = 60, -}; - -/* Panasonic AP18F4M (Bard/Ekko) */ -static const struct battery_info info_4 = { - .voltage_max = 8700, - .voltage_normal = 7600, - .voltage_min = 5500, - .precharge_current = 256, - .start_charging_min_c = 0, - .start_charging_max_c = 50, - .charging_min_c = 0, - .charging_max_c = 60, - .discharging_min_c = -20, - .discharging_max_c = 75, -}; - -enum battery_type { - BATTERY_TYPE_AP15 = 0, - BATTERY_TYPE_AP18, - BATTERY_TYPE_COUNT, -}; - -enum gauge_type { - GAUGE_TYPE_UNKNOWN = 0, - GAUGE_TYPE_TI_BQ40Z50, - GAUGE_TYPE_RENESAS_RAJ240, - GAUGE_TYPE_AKALI, -}; - -static const struct battery_info *info = &info_0; -static int sb_ship_mode_reg = SB_MANUFACTURER_ACCESS; -static int sb_shutdown_data = 0x0010; -static enum gauge_type fuel_gauge; - -const struct battery_info *battery_get_info(void) -{ - return info; -} - -/* - * Read a value from the Manufacturer Access System (MAC). - */ -static int sb_get_mac(uint16_t cmd, uint8_t *data, int len) -{ - int rv; - - rv = sb_write(SB_MANUFACTURER_ACCESS, cmd); - if (rv) - return rv; - - return sb_read_string(SB_MANUFACTURER_DATA, data, len); -} - -static enum gauge_type get_gauge_ic(void) -{ - uint8_t data[11]; - - if (oem == PROJECT_AKALI) - return GAUGE_TYPE_AKALI; - - /* 0x0002 is for 'Firmware Version' (p91 in BQ40Z50-R2 TRM). - * We can't use sb_read_mfgacc because the command won't be included - * in the returned block. */ - if (sb_get_mac(0x0002, data, sizeof(data))) - return GAUGE_TYPE_UNKNOWN; - - /* BQ40Z50 returns something while Renesus gauge returns all zeros. */ - if (data[2] == 0 && data[3] == 0) - return GAUGE_TYPE_RENESAS_RAJ240; - else - return GAUGE_TYPE_TI_BQ40Z50; -} - -static enum battery_type get_akali_battery_type(void) -{ - return CBI_SKU_CUSTOM_FIELD(sku); -} - -void board_battery_init(void) -{ - /* Only static config because gauge may not be initialized yet */ - switch (oem) { - case PROJECT_AKALI: - if (get_akali_battery_type() == BATTERY_TYPE_AP15) - info = &info_3; - else if (get_akali_battery_type() == BATTERY_TYPE_AP18) - info = &info_4; - sb_ship_mode_reg = 0x3A; - sb_shutdown_data = 0xC574; - break; - case PROJECT_SONA: - info = &info_1; - break; - case PROJECT_PANTHEON: - info = &info_2; - break; - default: - break; - } -} -DECLARE_HOOK(HOOK_INIT, board_battery_init, HOOK_PRIO_DEFAULT); - -int board_cut_off_battery(void) -{ - int rv; - - /* Ship mode command must be sent twice to take effect */ - rv = sb_write(sb_ship_mode_reg, sb_shutdown_data); - - if (rv != EC_SUCCESS) - return rv; - - return sb_write(sb_ship_mode_reg, sb_shutdown_data); -} - -int charger_profile_override(struct charge_state_data *curr) -{ - const struct battery_info *batt_info; - int bat_temp_c; - - batt_info = battery_get_info(); - - if ((curr->batt.flags & BATT_FLAG_BAD_ANY) == BATT_FLAG_BAD_ANY) { - curr->requested_current = batt_info->precharge_current; - curr->requested_voltage = batt_info->voltage_max; - return 1000; - } - - /* battery temp in 0.1 deg C */ - bat_temp_c = curr->batt.temperature - 2731; - - /* Don't charge if outside of allowable temperature range */ - if (bat_temp_c >= batt_info->charging_max_c * 10 || - bat_temp_c < batt_info->charging_min_c * 10) { - curr->requested_current = 0; - curr->requested_voltage = 0; - curr->batt.flags &= ~BATT_FLAG_WANT_CHARGE; - curr->state = ST_IDLE; - } - return 0; -} - -/* Customs options controllable by host command. */ -#define PARAM_FASTCHARGE (CS_PARAM_CUSTOM_PROFILE_MIN + 0) - -enum ec_status charger_profile_override_get_param(uint32_t param, - uint32_t *value) -{ - return EC_RES_INVALID_PARAM; -} - -enum ec_status charger_profile_override_set_param(uint32_t param, - uint32_t value) -{ - return EC_RES_INVALID_PARAM; -} - -enum battery_present battery_hw_present(void) -{ - /* The GPIO is low when the battery is physically present */ - return gpio_get_level(GPIO_BATTERY_PRESENT_L) ? BP_NO : BP_YES; -} - -static int battery_init(void) -{ - static int batt_status; - - if (batt_status & STATUS_INITIALIZED) - return 1; - - return battery_status(&batt_status) ? 0 : - !!(batt_status & STATUS_INITIALIZED); -} - -enum battery_disconnect_grace_period { - BATTERY_DISCONNECT_GRACE_PERIOD_OFF, - BATTERY_DISCONNECT_GRACE_PERIOD_ON, - BATTERY_DISCONNECT_GRACE_PERIOD_OVER, -}; -static enum battery_disconnect_grace_period disconnect_grace_period; - -static void battery_disconnect_timer(void) -{ - disconnect_grace_period = BATTERY_DISCONNECT_GRACE_PERIOD_OVER; -} -DECLARE_DEFERRED(battery_disconnect_timer); - -/* - * Check for case where both XCHG and XDSG bits are set indicating that even - * though the FG can be read from the battery, the battery is not able to be - * charged or discharged. This situation will happen if a battery disconnect was - * initiated via H1 setting the DISCONN signal to the battery. This will put the - * battery pack into a sleep state and when power is reconnected, the FG can be - * read, but the battery is still not able to provide power to the system. The - * calling function returns batt_pres = BP_NO, which instructs the charging - * state machine to prevent powering up the AP on battery alone which could lead - * to a brownout event when the battery isn't able yet to provide power to the - * system. . - */ -static int battery_check_disconnect_ti_bq40z50(void) -{ - int rv; - uint8_t data[6]; - - /* Check if battery charging + discharging is disabled. */ - rv = sb_read_mfgacc(PARAM_OPERATION_STATUS, - SB_ALT_MANUFACTURER_ACCESS, data, sizeof(data)); - if (rv) - return BATTERY_DISCONNECT_ERROR; - - if ((data[3] & (BATTERY_DISCHARGING_DISABLED | - BATTERY_CHARGING_DISABLED)) == - (BATTERY_DISCHARGING_DISABLED | BATTERY_CHARGING_DISABLED)) { - if (oem != PROJECT_SONA) - return BATTERY_DISCONNECTED; - /* - * For Sona, we need a workaround to wake up a battery from - * cutoff. We return DISCONNECT_ERROR for the 5 seconds after - * the first call BP_NOT_SURE is reported to chgstv2. It will - * supply precharge current and wakes up the battery from - * cutoff. If the battery is good, we won't come back here. - * If not, after 5 seconds, we will return DISCONNECTED to - * stop charging and avoid damaging the battery. - */ - if (disconnect_grace_period == - BATTERY_DISCONNECT_GRACE_PERIOD_OVER) - return BATTERY_DISCONNECTED; - if (disconnect_grace_period == - BATTERY_DISCONNECT_GRACE_PERIOD_OFF) - hook_call_deferred(&battery_disconnect_timer_data, - 5 * SECOND); - ccprintf("Battery disconnect grace period\n"); - disconnect_grace_period = BATTERY_DISCONNECT_GRACE_PERIOD_ON; - return BATTERY_DISCONNECT_ERROR; - } - - return BATTERY_NOT_DISCONNECTED; -} - -static int battery_check_disconnect_renesas_raj240(void) -{ - int data; - int rv; - - rv = sb_read(0x41, &data); - if (rv) - return BATTERY_DISCONNECT_ERROR; - - if (data != 0x1E /* 1E: Power down */) - return BATTERY_NOT_DISCONNECTED; - - return BATTERY_DISCONNECTED; -} - -static int battery_check_disconnect_1(void) -{ - int batt_discharge_fet; - - if (sb_read(SB_MANUFACTURER_ACCESS, &batt_discharge_fet)) - return BATTERY_DISCONNECT_ERROR; - - if (get_akali_battery_type() == BATTERY_TYPE_AP15) { - /* Bit 15: Discharge FET status (1: On, 0: Off) */ - if (batt_discharge_fet & 0x4000) - return BATTERY_NOT_DISCONNECTED; - } else if (get_akali_battery_type() == BATTERY_TYPE_AP18) { - /* Bit 13: Discharge FET status (1: Off, 0: On) */ - if (!(batt_discharge_fet & 0x2000)) - return BATTERY_NOT_DISCONNECTED; - } - - return BATTERY_DISCONNECTED; -} - -static int battery_check_disconnect(void) -{ - if (!battery_init()) - return BATTERY_DISCONNECT_ERROR; - - if (fuel_gauge == GAUGE_TYPE_UNKNOWN) { - fuel_gauge = get_gauge_ic(); - CPRINTS("fuel_gauge=%d", fuel_gauge); - } - - switch (fuel_gauge) { - case GAUGE_TYPE_AKALI: - return battery_check_disconnect_1(); - case GAUGE_TYPE_TI_BQ40Z50: - return battery_check_disconnect_ti_bq40z50(); - case GAUGE_TYPE_RENESAS_RAJ240: - return battery_check_disconnect_renesas_raj240(); - default: - return BATTERY_DISCONNECT_ERROR; - } -} - -static enum battery_present batt_pres_prev; /* Default BP_NO (=0) */ - -static enum battery_present battery_check_present_status(void) -{ - enum battery_present batt_pres; - int batt_disconnect_status; - - /* Get the physical hardware status */ - batt_pres = battery_hw_present(); - - /* - * If the battery is not physically connected, then no need to perform - * any more checks. - */ - if (batt_pres != BP_YES) - return batt_pres; - - /* - * If the battery is present now and was present last time we checked, - * return early. - */ - if (batt_pres == batt_pres_prev) - return batt_pres; - - /* - * Check battery disconnect status. If we are unable to read battery - * disconnect status, then return BP_NOT_SURE. Battery could be in ship - * mode and might require pre-charge current to wake it up. BP_NO is not - * returned here because charger state machine will not provide - * pre-charge current assuming that battery is not present. - */ - batt_disconnect_status = battery_check_disconnect(); - if (batt_disconnect_status == BATTERY_DISCONNECT_ERROR) - return BP_NOT_SURE; - - /* - * Ensure that battery is: - * 1. Not in cutoff - * 2. Not disconnected - * 3. Initialized - */ - if (battery_is_cut_off() != BATTERY_CUTOFF_STATE_NORMAL || - batt_disconnect_status != BATTERY_NOT_DISCONNECTED) - return BP_NO; - - return BP_YES; -} - -enum battery_present battery_is_present(void) -{ - batt_pres_prev = battery_check_present_status(); - return batt_pres_prev; -} diff --git a/board/nami/board.c b/board/nami/board.c deleted file mode 100644 index c45d11bd25..0000000000 --- a/board/nami/board.c +++ /dev/null @@ -1,1133 +0,0 @@ -/* Copyright 2017 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. - */ - -/* Poppy board-specific configuration */ - -#include "adc.h" -#include "anx7447.h" -#include "battery.h" -#include "board_config.h" -#include "button.h" -#include "charge_manager.h" -#include "charge_state.h" -#include "charge_ramp.h" -#include "charger.h" -#include "chipset.h" -#include "console.h" -#include "cros_board_info.h" -#include "driver/pmic_tps650x30.h" -#include "driver/accelgyro_bmi_common.h" -#include "driver/accel_bma2x2.h" -#include "driver/accel_kionix.h" -#include "driver/baro_bmp280.h" -#include "driver/charger/isl923x.h" -#include "driver/led/lm3509.h" -#include "driver/tcpm/ps8xxx.h" -#include "driver/tcpm/tcpci.h" -#include "driver/tcpm/tcpm.h" -#include "driver/temp_sensor/f75303.h" -#include "extpower.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "i2c.h" -#include "isl923x.h" -#include "keyboard_8042_sharedlib.h" -#include "keyboard_backlight.h" -#include "keyboard_config.h" -#include "keyboard_raw.h" -#include "keyboard_scan.h" -#include "lid_switch.h" -#include "math_util.h" -#include "motion_lid.h" -#include "motion_sense.h" -#include "pi3usb9281.h" -#include "power.h" -#include "power_button.h" -#include "pwm.h" -#include "pwm_chip.h" -#include "spi.h" -#include "switch.h" -#include "system.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.h" -#include "usb_pd_tcpm.h" -#include "util.h" -#include "espi.h" -#include "fan.h" -#include "fan_chip.h" - -#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) - -#define USB_PD_PORT_PS8751 0 -#define USB_PD_PORT_ANX7447 1 - -uint16_t board_version; -uint8_t oem = PROJECT_NAMI; -uint32_t sku; -uint8_t model; - -/* - * We have total 30 pins for keyboard connecter {-1, -1} mean - * the N/A pin that don't consider it and reserve index 0 area - * that we don't have pin 0. - */ -const int keyboard_factory_scan_pins[][2] = { - {-1, -1}, {0, 5}, {1, 1}, {1, 0}, {0, 6}, - {0, 7}, {-1, -1}, {-1, -1}, {1, 4}, {1, 3}, - {-1, -1}, {1, 6}, {1, 7}, {3, 1}, {2, 0}, - {1, 5}, {2, 6}, {2, 7}, {2, 1}, {2, 4}, - {2, 5}, {1, 2}, {2, 3}, {2, 2}, {3, 0}, - {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}, - {-1, -1}, -}; - -const int keyboard_factory_scan_pins_used = - ARRAY_SIZE(keyboard_factory_scan_pins); - -static void tcpc_alert_event(enum gpio_signal signal) -{ - int port = -1; - - switch (signal) { - case GPIO_USB_C0_PD_INT_ODL: - port = 0; - break; - case GPIO_USB_C1_PD_INT_ODL: - port = 1; - break; - default: - return; - } - - schedule_deferred_pd_interrupt(port); -} - -/* Set PD discharge whenever VBUS detection is high (i.e. below threshold). */ -static void vbus_discharge_handler(void) -{ - pd_set_vbus_discharge(0, gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); - pd_set_vbus_discharge(1, gpio_get_level(GPIO_USB_C1_VBUS_WAKE_L)); -} -DECLARE_DEFERRED(vbus_discharge_handler); - -void vbus0_evt(enum gpio_signal signal) -{ - /* VBUS present GPIO is inverted */ - usb_charger_vbus_change(0, !gpio_get_level(signal)); - task_wake(TASK_ID_PD_C0); - hook_call_deferred(&vbus_discharge_handler_data, 0); -} - -void vbus1_evt(enum gpio_signal signal) -{ - /* VBUS present GPIO is inverted */ - usb_charger_vbus_change(1, !gpio_get_level(signal)); - task_wake(TASK_ID_PD_C1); - hook_call_deferred(&vbus_discharge_handler_data, 0); -} - -void usb0_evt(enum gpio_signal signal) -{ - task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); -} - -void usb1_evt(enum gpio_signal signal) -{ - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); -} - -#include "gpio_list.h" - -/* ADC channels */ -const struct adc_t adc_channels[] = { - /* Vbus sensing (10x voltage divider). PPVAR_BOOSTIN_SENSE */ - [ADC_VBUS] = {"VBUS", NPCX_ADC_CH2, ADC_MAX_VOLT*10, ADC_READ_MAX+1, 0}, - /* - * Adapter current output or battery charging/discharging current (uV) - * 18x amplification on charger side. - */ - [ADC_AMON_BMON] = {"AMON_BMON", NPCX_ADC_CH1, ADC_MAX_VOLT*1000/18, - ADC_READ_MAX+1, 0}, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - -/******************************************************************************/ -/* Physical fans. These are logically separate from pwm_channels. */ - -const struct fan_conf fan_conf_0 = { - .flags = FAN_USE_RPM_MODE, - .ch = MFT_CH_0, /* Use MFT id to control fan */ - .pgood_gpio = -1, - .enable_gpio = -1, -}; - -/* Default, Nami, Vayne */ -const struct fan_rpm fan_rpm_0 = { - .rpm_min = 3100, - .rpm_start = 3100, - .rpm_max = 6900, -}; - -/* Sona */ -const struct fan_rpm fan_rpm_1 = { - .rpm_min = 2700, - .rpm_start = 2700, - .rpm_max = 6000, -}; - -/* Pantheon */ -const struct fan_rpm fan_rpm_2 = { - .rpm_min = 2100, - .rpm_start = 2300, - .rpm_max = 5100, -}; - -/* Akali */ -const struct fan_rpm fan_rpm_3 = { - .rpm_min = 2700, - .rpm_start = 2700, - .rpm_max = 5500, -}; - -const struct fan_rpm fan_rpm_4 = { - .rpm_min = 2400, - .rpm_start = 2400, - .rpm_max = 4500, -}; - -struct fan_t fans[FAN_CH_COUNT] = { - [FAN_CH_0] = { .conf = &fan_conf_0, .rpm = &fan_rpm_0, }, -}; - -/******************************************************************************/ -/* MFT channels. These are logically separate from pwm_channels. */ -const struct mft_t mft_channels[] = { - [MFT_CH_0] = {NPCX_MFT_MODULE_2, TCKC_LFCLK, PWM_CH_FAN}, -}; -BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); - -/* I2C port map */ -const struct i2c_port_t i2c_ports[] = { - {"tcpc0", NPCX_I2C_PORT0_0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, - {"tcpc1", NPCX_I2C_PORT0_1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, - {"battery", NPCX_I2C_PORT1, 100, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"charger", NPCX_I2C_PORT2, 100, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, - {"pmic", NPCX_I2C_PORT2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA}, - {"accelgyro", NPCX_I2C_PORT3, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA}, -}; -const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); - -/* TCPC mux configuration */ -const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { - [USB_PD_PORT_PS8751] = { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = NPCX_I2C_PORT0_0, - .addr_flags = PS8751_I2C_ADDR1_FLAGS, - }, - .drv = &ps8xxx_tcpm_drv, - /* Alert is active-low, push-pull */ - .flags = 0, - }, - [USB_PD_PORT_ANX7447] = { - .bus_type = EC_BUS_TYPE_I2C, - .i2c_info = { - .port = NPCX_I2C_PORT0_1, - .addr_flags = AN7447_TCPC3_I2C_ADDR_FLAGS, - }, - .drv = &anx7447_tcpm_drv, - /* Alert is active-low, push-pull */ - .flags = 0, - }, -}; - -static int ps8751_tune_mux(const struct usb_mux *me) -{ - /* 0x98 sets lower EQ of DP port (3.6db) */ - mux_write(me, PS8XXX_REG_MUX_DP_EQ_CONFIGURATION, 0x98); - return EC_SUCCESS; -} - -struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { - [USB_PD_PORT_PS8751] = { - .usb_port = USB_PD_PORT_PS8751, - .driver = &tcpci_tcpm_usb_mux_driver, - .hpd_update = &ps8xxx_tcpc_update_hpd_status, - }, - [USB_PD_PORT_ANX7447] = { - .usb_port = USB_PD_PORT_ANX7447, - .driver = &anx7447_usb_mux_driver, - .hpd_update = &anx7447_tcpc_update_hpd_status, - } -}; - -struct pi3usb9281_config pi3usb9281_chips[] = { - { - .i2c_port = I2C_PORT_USB_CHARGER_0, - .mux_lock = NULL, - }, - { - .i2c_port = I2C_PORT_USB_CHARGER_1, - .mux_lock = NULL, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == - CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT); - -const struct charger_config_t chg_chips[] = { - { - .i2c_port = I2C_PORT_CHARGER, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, -}; - -void board_reset_pd_mcu(void) -{ - if (oem == PROJECT_AKALI && board_version < 0x0200) { - if (anx7447_flash_erase(USB_PD_PORT_ANX7447)) - CPRINTS("Failed to erase OCM flash"); - - } - - /* Assert reset */ - gpio_set_level(GPIO_USB_C0_PD_RST_L, 0); - gpio_set_level(GPIO_USB_C1_PD_RST, 1); - msleep(1); - gpio_set_level(GPIO_USB_C0_PD_RST_L, 1); - gpio_set_level(GPIO_USB_C1_PD_RST, 0); - /* After TEST_R release, anx7447/3447 needs 2ms to finish eFuse - * loading. */ - msleep(2); -} - -void board_tcpc_init(void) -{ - /* Only reset TCPC if not sysjump */ - if (!system_jumped_late()) - board_reset_pd_mcu(); - - /* Enable TCPC interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); - gpio_enable_interrupt(GPIO_USB_C1_PD_INT_ODL); - - if (oem == PROJECT_SONA && model != MODEL_SYNDRA) - usb_muxes[USB_PD_PORT_PS8751].board_init = ps8751_tune_mux; - - /* - * Initialize HPD to low; after sysjump SOC needs to see - * HPD pulse to enable video path - */ - for (int port = 0; port < CONFIG_USB_PD_PORT_MAX_COUNT; ++port) - usb_mux_hpd_update(port, USB_PD_MUX_HPD_LVL_DEASSERTED | - USB_PD_MUX_HPD_IRQ_DEASSERTED); -} -DECLARE_HOOK(HOOK_INIT, board_tcpc_init, HOOK_PRIO_INIT_I2C + 2); - -uint16_t tcpc_get_alert_status(void) -{ - uint16_t status = 0; - - if (!gpio_get_level(GPIO_USB_C0_PD_INT_ODL)) { - if (gpio_get_level(GPIO_USB_C0_PD_RST_L)) - status |= PD_STATUS_TCPC_ALERT_0; - } - - if (!gpio_get_level(GPIO_USB_C1_PD_INT_ODL)) { - if (!gpio_get_level(GPIO_USB_C1_PD_RST)) - status |= PD_STATUS_TCPC_ALERT_1; - } - - return status; -} - -/* - * F75303_Remote1 is near CPU, and F75303_Remote2 is near 5V power IC. - */ -const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { - {"F75303_Local", TEMP_SENSOR_TYPE_BOARD, f75303_get_val, - F75303_IDX_LOCAL}, - {"F75303_Remote1", TEMP_SENSOR_TYPE_CPU, f75303_get_val, - F75303_IDX_REMOTE1}, - {"F75303_Remote2", TEMP_SENSOR_TYPE_BOARD, f75303_get_val, - F75303_IDX_REMOTE2}, -}; - -struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; - -/* Nami/Vayne Remote 1, 2 */ -const static struct ec_thermal_config thermal_a = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(75), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(65), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(39), - .temp_fan_max = C_TO_K(50), -}; - -/* Sona Remote 1 */ -const static struct ec_thermal_config thermal_b1 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(82), - [EC_TEMP_THRESH_HALT] = C_TO_K(89), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(72), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(38), - .temp_fan_max = C_TO_K(58), -}; - -/* Sona Remote 2 */ -const static struct ec_thermal_config thermal_b2 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(84), - [EC_TEMP_THRESH_HALT] = C_TO_K(91), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(74), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(40), - .temp_fan_max = C_TO_K(60), -}; - -/* Pantheon Remote 1 */ -const static struct ec_thermal_config thermal_c1 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(66), - [EC_TEMP_THRESH_HALT] = C_TO_K(80), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(56), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(38), - .temp_fan_max = C_TO_K(61), -}; - -/* Pantheon Remote 2 */ -const static struct ec_thermal_config thermal_c2 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(74), - [EC_TEMP_THRESH_HALT] = C_TO_K(82), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = 0, - [EC_TEMP_THRESH_HIGH] = C_TO_K(64), - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = C_TO_K(38), - .temp_fan_max = C_TO_K(61), -}; - -/* Akali Local */ -const static struct ec_thermal_config thermal_d0 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = C_TO_K(79), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = C_TO_K(81), - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = C_TO_K(80), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = C_TO_K(82), - }, - .temp_fan_off = C_TO_K(35), - .temp_fan_max = C_TO_K(70), -}; - -/* Akali Remote 1 */ -const static struct ec_thermal_config thermal_d1 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = C_TO_K(59), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = C_TO_K(60), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = 0, - .temp_fan_max = 0, -}; - -/* Akali Remote 2 */ -const static struct ec_thermal_config thermal_d2 = { - .temp_host = { - [EC_TEMP_THRESH_WARN] = C_TO_K(59), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_host_release = { - [EC_TEMP_THRESH_WARN] = C_TO_K(60), - [EC_TEMP_THRESH_HIGH] = 0, - [EC_TEMP_THRESH_HALT] = 0, - }, - .temp_fan_off = 0, - .temp_fan_max = 0, -}; - -#define I2C_PMIC_READ(reg, data) \ - i2c_read8(I2C_PORT_PMIC, TPS650X30_I2C_ADDR1_FLAGS,\ - (reg), (data)) -#define I2C_PMIC_WRITE(reg, data) \ - i2c_write8(I2C_PORT_PMIC, TPS650X30_I2C_ADDR1_FLAGS,\ - (reg), (data)) - -static void board_pmic_init(void) -{ - int err; - int error_count = 0; - static uint8_t pmic_initialized = 0; - - if (pmic_initialized) - return; - - /* Read vendor ID */ - while (1) { - int data; - err = I2C_PMIC_READ(TPS650X30_REG_VENDORID, &data); - if (!err && data == TPS650X30_VENDOR_ID) - break; - else if (error_count > 5) - goto pmic_error; - error_count++; - } - - /* - * VCCIOCNT register setting - * [6] : CSDECAYEN - * otherbits: default - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_VCCIOCNT, 0x4A); - if (err) - goto pmic_error; - - /* - * VRMODECTRL: - * [4] : VCCIOLPM clear - * otherbits: default - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_VRMODECTRL, 0x2F); - if (err) - goto pmic_error; - - /* - * PGMASK1 : Exclude VCCIO from Power Good Tree - * [7] : MVCCIOPG clear - * otherbits: default - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_PGMASK1, 0x80); - if (err) - goto pmic_error; - - /* - * PWFAULT_MASK1 Register settings - * [7] : 1b V4 Power Fault Masked - * [4] : 1b V7 Power Fault Masked - * [2] : 1b V9 Power Fault Masked - * [0] : 1b V13 Power Fault Masked - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_PWFAULT_MASK1, 0x95); - if (err) - goto pmic_error; - - /* - * Discharge control 4 register configuration - * [7:6] : 00b Reserved - * [5:4] : 01b V3.3S discharge resistance (V6S), 100 Ohm - * [3:2] : 01b V18S discharge resistance (V8S), 100 Ohm - * [1:0] : 01b V100S discharge resistance (V11S), 100 Ohm - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_DISCHCNT4, 0x15); - if (err) - goto pmic_error; - - /* - * Discharge control 3 register configuration - * [7:6] : 01b V1.8U_2.5U discharge resistance (V9), 100 Ohm - * [5:4] : 01b V1.2U discharge resistance (V10), 100 Ohm - * [3:2] : 01b V100A discharge resistance (V11), 100 Ohm - * [1:0] : 01b V085A discharge resistance (V12), 100 Ohm - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_DISCHCNT3, 0x55); - if (err) - goto pmic_error; - - /* - * Discharge control 2 register configuration - * [7:6] : 01b V5ADS3 discharge resistance (V5), 100 Ohm - * [5:4] : 01b V33A_DSW discharge resistance (V6), 100 Ohm - * [3:2] : 01b V33PCH discharge resistance (V7), 100 Ohm - * [1:0] : 01b V18A discharge resistance (V8), 100 Ohm - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_DISCHCNT2, 0x55); - if (err) - goto pmic_error; - - /* - * Discharge control 1 register configuration - * [7:2] : 00b Reserved - * [1:0] : 01b VCCIO discharge resistance (V4), 100 Ohm - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_DISCHCNT1, 0x01); - if (err) - goto pmic_error; - - /* - * Increase Voltage - * [7:0] : 0x2a default - * [5:4] : 10b default - * [5:4] : 01b 5.1V (0x1a) - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_V5ADS3CNT, 0x1a); - if (err) - goto pmic_error; - - /* - * PBCONFIG Register configuration - * [7] : 1b Power button debounce, 0ms (no debounce) - * [6] : 0b Power button reset timer logic, no action (default) - * [5:0] : 011111b Force an Emergency reset time, 31s (default) - */ - err = I2C_PMIC_WRITE(TPS650X30_REG_PBCONFIG, 0x9F); - if (err) - goto pmic_error; - - CPRINTS("PMIC init done"); - pmic_initialized = 1; - return; - -pmic_error: - CPRINTS("PMIC init failed: %d", err); -} - -void chipset_pre_init_callback(void) -{ - board_pmic_init(); -} - -/** - * Buffer the AC present GPIO to the PCH. - */ -static void board_extpower(void) -{ - gpio_set_level(GPIO_PCH_ACPRESENT, extpower_is_present()); -} -DECLARE_HOOK(HOOK_AC_CHANGE, board_extpower, HOOK_PRIO_DEFAULT); - -/* Set active charge port -- only one port can be active at a time. */ -int board_set_active_charge_port(int charge_port) -{ - /* charge port is a physical port */ - int is_real_port = (charge_port >= 0 && - charge_port < CONFIG_USB_PD_PORT_MAX_COUNT); - /* check if we are sourcing VBUS on the port */ - /* dnojiri: revisit */ - int is_source = gpio_get_level(charge_port == 0 ? - GPIO_USB_C0_5V_EN : GPIO_USB_C1_5V_EN); - - if (is_real_port && is_source) { - CPRINTF("No charging on source port p%d is ", charge_port); - return EC_ERROR_INVAL; - } - - CPRINTF("New chg p%d", charge_port); - - if (charge_port == CHARGE_PORT_NONE) { - /* Disable both ports */ - gpio_set_level(GPIO_USB_C0_CHARGE_L, 1); - gpio_set_level(GPIO_USB_C1_CHARGE_L, 1); - } else { - /* Make sure non-charging port is disabled */ - /* dnojiri: revisit. there is always this assumption that - * battery is present. If not, this may cause brownout. */ - gpio_set_level(charge_port ? GPIO_USB_C0_CHARGE_L : - GPIO_USB_C1_CHARGE_L, 1); - /* Enable charging port */ - gpio_set_level(charge_port ? GPIO_USB_C1_CHARGE_L : - GPIO_USB_C0_CHARGE_L, 0); - } - - return EC_SUCCESS; -} - -void board_set_charge_limit(int port, int supplier, int charge_ma, - int max_ma, int charge_mv) -{ - /* - * Limit the input current to 96% negotiated limit, - * to account for the charger chip margin. - */ - int factor = 96; - - if (oem == PROJECT_AKALI && - (model == MODEL_EKKO || model == MODEL_BARD)) - factor = 95; - charge_ma = charge_ma * factor / 100; - charge_set_input_current_limit( - MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT), - charge_mv); -} - -void board_hibernate(void) -{ - CPRINTS("Triggering PMIC shutdown."); - uart_flush_output(); - gpio_set_level(GPIO_EC_HIBERNATE, 1); - while (1) - ; -} - -const struct pwm_t pwm_channels[] = { - [PWM_CH_LED1] = { 3, PWM_CONFIG_DSLEEP, 1200 }, - [PWM_CH_LED2] = { 5, PWM_CONFIG_DSLEEP, 1200 }, - [PWM_CH_FAN] = {4, PWM_CONFIG_OPEN_DRAIN, 25000}, - /* - * 1.2kHz is a multiple of both 50 and 60. So a video recorder - * (generally designed to ignore either 50 or 60 Hz flicker) will not - * alias with refresh rate. - */ - [PWM_CH_KBLIGHT] = { 2, 0, 1200 }, -}; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/* Lid Sensor mutex */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -/* Lid accel private data */ -static struct bmi_drv_data_t g_bmi160_data; -static struct kionix_accel_data g_kx022_data; - -/* BMA255 private data */ -static struct accelgyro_saved_data_t g_bma255_data; - -/* Matrix to rotate accelrator into standard reference frame */ -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)} -}; - -const mat33_fp_t lid_standard_ref = { - { FLOAT_TO_FP(1), 0, 0}, - { 0, FLOAT_TO_FP(-1), 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; - -const mat33_fp_t rotation_x180_z90 = { - { 0, FLOAT_TO_FP(-1), 0 }, - { FLOAT_TO_FP(-1), 0, 0 }, - { 0, 0, FLOAT_TO_FP(-1) } -}; - -const struct motion_sensor_t lid_accel_1 = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_KX022, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &kionix_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_kx022_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = KX022_ADDR1_FLAGS, - .rot_standard_ref = &rotation_x180_z90, - .min_frequency = KX022_ACCEL_MIN_FREQ, - .max_frequency = KX022_ACCEL_MAX_FREQ, - .default_range = 2, /* g, to support lid angle calculation. */ - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, -}; - -struct motion_sensor_t motion_sensors[] = { - [LID_ACCEL] = { - .name = "Lid Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_BMA255, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_LID, - .drv = &bma2x2_accel_drv, - .mutex = &g_lid_mutex, - .drv_data = &g_bma255_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = BMA2x2_I2C_ADDR1_FLAGS, - .rot_standard_ref = &lid_standard_ref, - .min_frequency = BMA255_ACCEL_MIN_FREQ, - .max_frequency = BMA255_ACCEL_MAX_FREQ, - .default_range = 2, /* g, to support lid angle calculation. */ - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 0, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 0, - }, - }, - }, - [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 = &base_standard_ref, - .min_frequency = BMI_ACCEL_MIN_FREQ, - .max_frequency = BMI_ACCEL_MAX_FREQ, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs */ - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - /* Sensor on in S3 */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 0, - }, - }, - }, - [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 = &base_standard_ref, - .min_frequency = BMI_GYRO_MIN_FREQ, - .max_frequency = BMI_GYRO_MAX_FREQ, - }, -}; -unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -/* Enable or disable input devices, based on chipset state and tablet mode */ -__override void lid_angle_peripheral_enable(int enable) -{ - /* If the lid is in 360 position, ignore the lid angle, - * which might be faulty. Disable keyboard. - */ - if (tablet_get_mode() || chipset_in_state(CHIPSET_STATE_ANY_OFF)) - enable = 0; - keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); -} - -/* Called on AP S3 -> S0 transition */ -static void board_chipset_resume(void) -{ - gpio_set_level(GPIO_ENABLE_BACKLIGHT_L, 0); - gpio_set_level(GPIO_USB3_POWER_DOWN_L, 1); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); - -/* Called on AP S0 -> S3 transition */ -static void board_chipset_suspend(void) -{ - gpio_set_level(GPIO_ENABLE_BACKLIGHT_L, 1); - gpio_set_level(GPIO_USB3_POWER_DOWN_L, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); - -static void setup_motion_sensors(void) -{ - switch (oem) { - case PROJECT_AKALI: - if (sku & SKU_ID_MASK_CONVERTIBLE) { - /* Rotate axis for Akali 360 */ - motion_sensors[LID_ACCEL] = lid_accel_1; - motion_sensors[BASE_ACCEL].rot_standard_ref = NULL; - motion_sensors[BASE_GYRO].rot_standard_ref = NULL; - } else { - /* Clamshell Akali has no accel/gyro */ - motion_sensor_count = ARRAY_SIZE(motion_sensors) - 2; - } - break; - default: - break; - } -} - -static void setup_fans(void) -{ - switch (oem) { - case PROJECT_SONA: - if (model == MODEL_SYNDRA) - fans[FAN_CH_0].rpm = &fan_rpm_4; - else - fans[FAN_CH_0].rpm = &fan_rpm_1; - thermal_params[TEMP_SENSOR_REMOTE1] = thermal_b1; - thermal_params[TEMP_SENSOR_REMOTE2] = thermal_b2; - break; - case PROJECT_PANTHEON: - fans[FAN_CH_0].rpm = &fan_rpm_2; - thermal_params[TEMP_SENSOR_REMOTE1] = thermal_c1; - thermal_params[TEMP_SENSOR_REMOTE2] = thermal_c2; - break; - case PROJECT_AKALI: - fans[FAN_CH_0].rpm = &fan_rpm_3; - thermal_params[TEMP_SENSOR_LOCAL] = thermal_d0; - thermal_params[TEMP_SENSOR_REMOTE1] = thermal_d1; - thermal_params[TEMP_SENSOR_REMOTE2] = thermal_d2; - break; - case PROJECT_NAMI: - case PROJECT_VAYNE: - default: - thermal_params[TEMP_SENSOR_REMOTE1] = thermal_a; - thermal_params[TEMP_SENSOR_REMOTE2] = thermal_a; - } -} - -/* - * Read CBI from i2c eeprom and initialize variables for board variants - */ -static void cbi_init(void) -{ - uint32_t val; - - if (cbi_get_board_version(&val) == EC_SUCCESS && val <= UINT16_MAX) - board_version = val; - CPRINTS("Board Version: 0x%04x", board_version); - - if (cbi_get_oem_id(&val) == EC_SUCCESS && val < PROJECT_COUNT) - oem = val; - CPRINTS("OEM: %d", oem); - - if (cbi_get_sku_id(&val) == EC_SUCCESS) - sku = val; - CPRINTS("SKU: 0x%08x", sku); - - if (cbi_get_model_id(&val) == EC_SUCCESS) - model = val; - CPRINTS("MODEL: 0x%08x", model); - - if (board_version < 0x300) - /* Previous boards have GPIO42 connected to TP_INT_CONN */ - gpio_set_flags(GPIO_USB2_ID, GPIO_INPUT); - - setup_motion_sensors(); - - setup_fans(); -} -DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C + 1); - -/* Keyboard scan setting */ -__override struct keyboard_scan_config keyscan_config = { - /* - * F3 key scan cycle completed but scan input is not - * charging to logic high when EC start scan next - * column for "T" key, so we set .output_settle_us - * to 80us from 50us. - */ - .output_settle_us = 80, - .debounce_down_us = 9 * MSEC, - .debounce_up_us = 30 * MSEC, - .scan_period_us = 3 * MSEC, - .min_post_scan_delay_us = 1000, - .poll_timeout_us = 100 * MSEC, - .actual_key_mask = { - 0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, - 0xa4, 0xff, 0xfe, 0x55, 0xfe, 0xff, 0xff, 0xff, /* full set */ - }, -}; - -static void anx7447_set_aux_switch(void) -{ - const int port = USB_PD_PORT_ANX7447; - - /* Debounce */ - if (gpio_get_level(GPIO_CCD_MODE_ODL)) - return; - - CPRINTS("C%d: AUX_SW_SEL=0x%x", port, 0xc); - if (tcpc_write(port, ANX7447_REG_TCPC_AUX_SWITCH, 0xc)) - CPRINTS("C%d: Setting AUX_SW_SEL failed", port); -} -DECLARE_DEFERRED(anx7447_set_aux_switch); - -void ccd_mode_isr(enum gpio_signal signal) -{ - /* Wait 2 seconds until all mux setting is done by PD task */ - hook_call_deferred(&anx7447_set_aux_switch_data, 2 * SECOND); -} - -static void board_init(void) -{ - int reg; - - /* - * This enables pull-down on F_DIO1 (SPI MISO), and F_DIO0 (SPI MOSI), - * whenever the EC is not doing SPI flash transactions. This avoids - * floating SPI buffer input (MISO), which causes power leakage (see - * b/64797021). - */ - NPCX_PUPD_EN1 |= BIT(NPCX_DEVPU1_F_SPI_PUD_EN); - - /* Provide AC status to the PCH */ - gpio_set_level(GPIO_PCH_ACPRESENT, extpower_is_present()); - - /* Reduce Buck-boost mode switching frequency to reduce heat */ - if (i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, - ISL9238_REG_CONTROL3, ®) == EC_SUCCESS) { - reg |= ISL9238_C3_BB_SWITCHING_PERIOD; - if (i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS, - ISL9238_REG_CONTROL3, reg)) - CPRINTF("Failed to set isl9238\n"); - } - - /* Enable VBUS interrupt */ - gpio_enable_interrupt(GPIO_USB_C0_VBUS_WAKE_L); - gpio_enable_interrupt(GPIO_USB_C1_VBUS_WAKE_L); - - /* Enable pericom BC1.2 interrupts */ - gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L); - gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L); - - /* Trigger once to set mux in case CCD cable is already connected. */ - ccd_mode_isr(GPIO_CCD_MODE_ODL); - gpio_enable_interrupt(GPIO_CCD_MODE_ODL); - - /* Enable Accel/Gyro interrupt for convertibles. */ - if (sku & SKU_ID_MASK_CONVERTIBLE) - gpio_enable_interrupt(GPIO_ACCELGYRO3_INT_L); - -#ifndef TEST_BUILD - /* Disable scanning KSO13 & 14 if keypad isn't present. */ - if (!(sku & SKU_ID_MASK_KEYPAD)) { - keyboard_raw_set_cols(KEYBOARD_COLS_NO_KEYPAD); - keyscan_config.actual_key_mask[11] = 0xfa; - keyscan_config.actual_key_mask[12] = 0xca; - } - if (oem == PROJECT_AKALI && model == MODEL_BARD) { - /* Search key is moved to col=0,row=3 */ - keyscan_config.actual_key_mask[0] = 0x1c; - keyscan_config.actual_key_mask[1] = 0xfe; - /* No need to swap scancode_set2[0][3] and [1][0] because both - * are mapped to search key. */ - } - if (sku & SKU_ID_MASK_UK2) { - /* - * Observed on Shyvana with UK keyboard, - * \|: 0x0061->0x61->0x56 - * r-ctrl: 0xe014->0x14->0x1d - */ - uint16_t tmp = get_scancode_set2(4, 0); - set_scancode_set2(4, 0, get_scancode_set2(2, 7)); - set_scancode_set2(2, 7, tmp); - } -#endif - - isl923x_set_ac_prochot(CHARGER_SOLO, 3328 /* mA */); - - switch (oem) { - case PROJECT_VAYNE: - isl923x_set_dc_prochot(CHARGER_SOLO, 11008 /* mA */); - break; - case PROJECT_PANTHEON: - isl923x_set_dc_prochot(CHARGER_SOLO, 9984 /* mA */); - break; - case PROJECT_SONA: - isl923x_set_dc_prochot(CHARGER_SOLO, 5888 /* mA */); - break; - case PROJECT_NAMI: - case PROJECT_AKALI: - /* default 4096mA 0x1000 */ - default: - break; - } -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); - -int board_is_lid_angle_tablet_mode(void) -{ - /* Boards with no GMR sensor use lid angles to detect tablet mode. */ - return oem != PROJECT_AKALI; -} - -void board_kblight_init(void) -{ - if (!(sku & SKU_ID_MASK_KBLIGHT)) - return; - - switch (oem) { - default: - case PROJECT_NAMI: - case PROJECT_AKALI: - case PROJECT_VAYNE: - case PROJECT_PANTHEON: - kblight_register(&kblight_lm3509); - break; - case PROJECT_SONA: - kblight_register(&kblight_pwm); - break; - } -} - -enum critical_shutdown board_critical_shutdown_check( - struct charge_state_data *curr) -{ - if (oem == PROJECT_VAYNE) - return CRITICAL_SHUTDOWN_CUTOFF; - else - return CRITICAL_SHUTDOWN_HIBERNATE; - -} - -uint8_t board_set_battery_level_shutdown(void) -{ - if (oem == PROJECT_VAYNE) - /* We match the shutdown threshold with Powerd's. - * 4 + 1 = 5% because Powerd uses '<=' while EC uses '<'. */ - return CONFIG_BATT_HOST_SHUTDOWN_PERCENTAGE + 1; - else - return BATTERY_LEVEL_SHUTDOWN; -} diff --git a/board/nami/board.h b/board/nami/board.h deleted file mode 100644 index 6d340af1df..0000000000 --- a/board/nami/board.h +++ /dev/null @@ -1,329 +0,0 @@ -/* Copyright 2017 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. - */ - -/* Eve board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -/* - * By default, enable all console messages except ACPI and host event because - * the sensor stack is generating a lot of activity. - */ -#define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_EVENTS) | CC_MASK(CC_LPC))) - -/* EC */ -#define CONFIG_ADC -#define CONFIG_BACKLIGHT_LID -#define CONFIG_BACKLIGHT_LID_ACTIVE_LOW -#define CONFIG_BOARD_VERSION_CBI -#define CONFIG_BOARD_FORCE_RESET_PIN -#define CONFIG_CRC8 -#define CONFIG_CBI_EEPROM -#define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL -#define CONFIG_DPTF -#define CONFIG_FLASH_SIZE_BYTES 0x80000 -#define CONFIG_FPU -#define CONFIG_I2C -#define CONFIG_I2C_CONTROLLER - -#define CONFIG_KEYBOARD_COL2_INVERTED -#define CONFIG_KEYBOARD_PROTOCOL_8042 -#define CONFIG_KEYBOARD_KEYPAD -#define CONFIG_LED_COMMON -#define CONFIG_LID_SWITCH -#define CONFIG_LOW_POWER_IDLE -#define CONFIG_LTO -#define CONFIG_CHIP_PANIC_BACKUP -#define CONFIG_PWM -#define CONFIG_SOFTWARE_PANIC -#define CONFIG_SPI_FLASH_REGS -#define CONFIG_SPI_FLASH_W25X40 -#define CONFIG_VBOOT_HASH -#define CONFIG_SHA256_UNROLLED -#define CONFIG_VOLUME_BUTTONS -#define CONFIG_VSTORE -#define CONFIG_VSTORE_SLOT_COUNT 1 -#define CONFIG_WATCHDOG_HELP -#define CONFIG_WIRELESS -#define CONFIG_WIRELESS_SUSPEND \ - (EC_WIRELESS_SWITCH_WLAN | EC_WIRELESS_SWITCH_WLAN_POWER) -#define WIRELESS_GPIO_WLAN_POWER GPIO_PP3300_DX_WLAN -#undef CONFIG_SUPPORT_CHIP_HIBERNATION -#define CONFIG_FANS 1 -#undef CONFIG_FAN_INIT_SPEED -#define CONFIG_FAN_INIT_SPEED 50 -#define CONFIG_FAN_DYNAMIC -#define CONFIG_THROTTLE_AP -#define CONFIG_PWM_KBLIGHT - -/* EC console commands */ -#define CONFIG_CMD_ACCELS -#define CONFIG_CMD_ACCEL_INFO -#define CONFIG_CMD_BUTTON - -/* Port80 */ -#undef CONFIG_PORT80_HISTORY_LEN -#define CONFIG_PORT80_HISTORY_LEN 256 - -/* SOC */ -#define CONFIG_CHIPSET_SKYLAKE -#define CONFIG_CHIPSET_HAS_PLATFORM_PMIC_RESET -#define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK -#define CONFIG_CHIPSET_RESET_HOOK -#define CONFIG_HOSTCMD_ESPI -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_FLASH_SPI_INFO - -/* Battery */ -#define CONFIG_BATTERY_CUT_OFF -#define CONFIG_BATTERY_HW_PRESENT_CUSTOM -#define CONFIG_BATTERY_DEVICE_CHEMISTRY "LION" -#define CONFIG_BATTERY_PRESENT_CUSTOM -#define CONFIG_BATTERY_SMART -#define CONFIG_PWR_STATE_DISCHARGE_FULL -#define CONFIG_BATTERY_REQUESTS_NIL_WHEN_DEAD -#undef CONFIG_BATT_HOST_FULL_FACTOR -#define CONFIG_BATT_HOST_FULL_FACTOR 100 - -/* Charger */ -#define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGE_RAMP_HW /* This, or just RAMP? */ -#define CONFIG_CHARGE_MANAGER_EXTERNAL_POWER_LIMIT -#define CONFIG_CHARGER -#define CONFIG_CHARGER_ISL9238 -#define CONFIG_CHARGER_DISCHARGE_ON_AC -#define CONFIG_CHARGER_INPUT_CURRENT 512 -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 27000 -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT 15000 -/* AP's thresholds. */ -#define CONFIG_CHARGER_LIMIT_POWER_THRESH_BAT_PCT 3 -#define CONFIG_CHARGER_LIMIT_POWER_THRESH_CHG_MW 27000 -#define CONFIG_CHARGER_PROFILE_OVERRIDE -#define CONFIG_CHARGER_PSYS -#define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 -#define CONFIG_CMD_CHARGER_ADC_AMON_BMON -#define CONFIG_HOSTCMD_PD_CONTROL -#define CONFIG_EXTPOWER_GPIO -#undef CONFIG_EXTPOWER_DEBOUNCE_MS -#define CONFIG_EXTPOWER_DEBOUNCE_MS 1000 -#define CONFIG_POWER_BUTTON -#define CONFIG_POWER_BUTTON_X86 -#undef CONFIG_POWER_BUTTON_INIT_TIMEOUT -#define CONFIG_POWER_BUTTON_INIT_TIMEOUT 6 -#define CONFIG_POWER_COMMON -#define CONFIG_POWER_SIGNAL_INTERRUPT_STORM_DETECT_THRESHOLD 30 -#define CONFIG_POWER_S0IX -#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE - -/* Sensor */ -#define CONFIG_TEMP_SENSOR -#define CONFIG_TEMP_SENSOR_F75303 - -#define CONFIG_MKBP_EVENT -#define CONFIG_MKBP_USE_HOST_EVENT -#define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -#define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT -#define CONFIG_ACCEL_BMA255 -#define CONFIG_ACCEL_KX022 -#define CONFIG_ACCEL_INTERRUPTS -#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 -#define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT - -/* KB backlight driver */ -#define CONFIG_LED_DRIVER_LM3509 - -/* Enable sensor fifo, must also define the _SIZE and _THRES */ -#define CONFIG_ACCEL_FIFO -/* FIFO size is in power of 2. */ -#define CONFIG_ACCEL_FIFO_SIZE 512 -/* Depends on how fast the AP boots and typical ODRs */ -#define CONFIG_ACCEL_FIFO_THRES (CONFIG_ACCEL_FIFO_SIZE / 3) - -#define CONFIG_TABLET_MODE -#define CONFIG_TABLET_MODE_SWITCH -#define CONFIG_GMR_TABLET_MODE -#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE_L - -/* USB */ -#define CONFIG_USB_CHARGER -#define CONFIG_USB_PD_ALT_MODE -#define CONFIG_USB_PD_ALT_MODE_DFP -#define CONFIG_USB_PD_COMM_LOCKED -#define CONFIG_USB_PD_DISCHARGE_TCPC -#define CONFIG_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_LOGGING -#define CONFIG_USB_PD_MAX_SINGLE_SOURCE_CURRENT TYPEC_RP_3A0 -#define CONFIG_USB_PD_PORT_MAX_COUNT 2 -#define CONFIG_USB_PD_MAX_TOTAL_SOURCE_CURRENT 4500 -#define CONFIG_USB_PD_VBUS_DETECT_GPIO -#define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TCPM_TCPCI -#define CONFIG_USB_PD_TCPM_ANX7447 -#define CONFIG_USB_PD_TCPM_ANX7447_OCM_ERASE_COMMAND -#define CONFIG_USB_PD_TCPM_PS8751 -#define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_POWER_DELIVERY -#define CONFIG_USB_PD_TCPMV1 -#define CONFIG_USBC_SS_MUX -#define CONFIG_USBC_VCONN -#define CONFIG_USBC_VCONN_SWAP -#define CONFIG_USB_MUX_RUNTIME_CONFIG - - -/* BC 1.2 charger */ -#define CONFIG_BC12_DETECT_PI3USB9281 -#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2 - -/* Optional feature to configure npcx chip */ -#define NPCX_UART_MODULE2 1 /* 1:GPIO64/65 as UART */ -#define NPCX_JTAG_MODULE2 0 /* 0:GPIO21/17/16/20 as JTAG */ -#define NPCX_TACH_SEL2 1 /* 0:GPIO40/73 1:GPIO93/A6 as TACH */ - -/* I2C ports */ -#define I2C_PORT_TCPC0 NPCX_I2C_PORT0_0 -#define I2C_PORT_TCPC1 NPCX_I2C_PORT0_1 -#define I2C_PORT_USB_CHARGER_0 NPCX_I2C_PORT0_0 -#define I2C_PORT_USB_CHARGER_1 NPCX_I2C_PORT0_1 -#define I2C_PORT_EEPROM NPCX_I2C_PORT0_0 -#define I2C_PORT_BATTERY NPCX_I2C_PORT1 -#define I2C_PORT_CHARGER NPCX_I2C_PORT1 -#define I2C_PORT_PMIC NPCX_I2C_PORT2 -#define I2C_PORT_KBLIGHT NPCX_I2C_PORT2 -#define I2C_PORT_GYRO NPCX_I2C_PORT3 -#define I2C_PORT_ACCEL NPCX_I2C_PORT3 -#define I2C_PORT_THERMAL NPCX_I2C_PORT3 -#define I2C_PORT_ALS NPCX_I2C_PORT3 - -/* I2C addresses */ -#define I2C_ADDR_MP2949_FLAGS 0x20 -#define I2C_ADDR_EEPROM_FLAGS 0x50 - -#ifndef __ASSEMBLER__ - -/* support factory keyboard test */ -#define CONFIG_KEYBOARD_FACTORY_TEST - -#include "gpio_signal.h" -#include "registers.h" - -enum temp_sensor_id { - TEMP_SENSOR_LOCAL = 0, - TEMP_SENSOR_REMOTE1, - TEMP_SENSOR_REMOTE2, - TEMP_SENSOR_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 { - LID_ACCEL = 0, - BASE_ACCEL, - BASE_GYRO, - LID_ALS, - SENSOR_COUNT, -}; - -enum adc_channel { - ADC_BASE_DET, - ADC_VBUS, - ADC_AMON_BMON, - ADC_CH_COUNT, -}; - -enum pwm_channel { - PWM_CH_LED1, - PWM_CH_LED2, - PWM_CH_FAN, - PWM_CH_KBLIGHT, - /* Number of PWM channels */ - PWM_CH_COUNT, -}; - -enum fan_channel { - FAN_CH_0 = 0, - /* Number of FAN channels */ - FAN_CH_COUNT, -}; - -enum mft_channel { - MFT_CH_0 = 0, - /* Number of MFT channels */ - MFT_CH_COUNT, -}; - -enum oem_id { - PROJECT_AKALI = 1, - PROJECT_VAYNE = 3, - PROJECT_SONA, - PROJECT_PANTHEON, - PROJECT_NAMI, - PROJECT_COUNT, -}; - -enum model_id { - /* Sona variants */ - MODEL_SYNDRA = 1, - /* Akali variants */ - MODEL_EKKO = 1, - MODEL_BARD = 2, -}; - -#define SKU_ID_MASK_KBLIGHT BIT(0) -#define SKU_ID_MASK_CONVERTIBLE BIT(9) -#define SKU_ID_MASK_KEYPAD BIT(15) -#define SKU_ID_MASK_UK2 BIT(18) - -/* TODO(crosbug.com/p/61098): Verify the numbers below. */ -/* - * 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 typical operating power and max power */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 70000 -#define PD_MAX_CURRENT_MA 3500 -#define PD_MAX_VOLTAGE_MV 20000 - -/* Board specific handlers */ -void board_reset_pd_mcu(void); -void board_set_tcpc_power_mode(int port, int mode); - -/* Sensors without hardware FIFO are in forced mode */ -#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_ALS)) - -/* These should be referenced only after HOOK_INIT:HOOK_PRIO_INIT_I2C+1. */ -extern uint16_t board_version; -extern uint8_t oem; -extern uint32_t sku; -extern uint8_t model; - -/* SKU_ID[24:31] are dedicated to OEM customization */ -#define CBI_SKU_CUSTOM_FIELD(val) ((val) >> 24) - -void ccd_mode_isr(enum gpio_signal signal); - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/nami/build.mk b/board/nami/build.mk deleted file mode 100644 index f4bf21113d..0000000000 --- a/board/nami/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2017 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 -# - -CHIP:=npcx -CHIP_VARIANT:=npcx5m6g - -board-y=board.o -board-$(CONFIG_BATTERY_SMART)+=battery.o -board-$(CONFIG_LED_COMMON)+=led.o -board-$(CONFIG_USB_POWER_DELIVERY)+=usb_pd_policy.o diff --git a/board/nami/ec.tasklist b/board/nami/ec.tasklist deleted file mode 100644 index 93fcda9f91..0000000000 --- a/board/nami/ec.tasklist +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2017 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, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(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_ALWAYS(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(POWERBTN, power_button_task, NULL, LARGER_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) \ - TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, TASK_STACK_SIZE) diff --git a/board/nami/gpio.inc b/board/nami/gpio.inc deleted file mode 100644 index f4119c96a6..0000000000 --- a/board/nami/gpio.inc +++ /dev/null @@ -1,120 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2017 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. */ - -/* - * ADCs are not configured in this file but listed below for reference. - * - * PIN(4, 4) ADC1: IADP_AMON_BMON - * PIN(4, 3) ADC2: PPVAR_BOOSTIN_SENSE - */ - -GPIO_INT(USB_C0_PD_INT_ODL, PIN(3, 7), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_PD_INT_ODL, PIN(7, 1), GPIO_INT_FALLING, tcpc_alert_event) -#ifdef CONFIG_POWER_S0IX -GPIO_INT(PCH_SLP_S0_L, PIN(7, 5), GPIO_INT_BOTH, power_signal_interrupt) -#endif -GPIO_INT(PCH_SLP_SUS_L, PIN(6, 2), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(RSMRST_L_PGOOD, PIN(B, 0), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(PMIC_DPWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(POWER_BUTTON_L, PIN(0, 3), GPIO_INT_BOTH | GPIO_PULL_UP,power_button_interrupt) -GPIO_INT(LID_OPEN, PIN(8, 3), GPIO_INT_BOTH, lid_interrupt) -GPIO_INT(VOLUME_DOWN_L, PIN(7, 3), GPIO_INT_BOTH | GPIO_PULL_UP,button_interrupt) -GPIO_INT(VOLUME_UP_L, PIN(8, 6), GPIO_INT_BOTH | GPIO_PULL_UP,button_interrupt) -GPIO_INT(WP_L, PIN(9, 3), GPIO_INT_BOTH, switch_interrupt) -GPIO_INT(AC_PRESENT, PIN(C, 1), GPIO_INT_BOTH, extpower_interrupt) -GPIO_INT(USB_C0_VBUS_WAKE_L, PIN(9, 7), GPIO_INT_BOTH | GPIO_PULL_UP,vbus0_evt) -GPIO_INT(USB_C1_VBUS_WAKE_L, PIN(C, 5), GPIO_INT_BOTH | GPIO_PULL_UP,vbus1_evt) -GPIO_INT(USB_C0_BC12_INT_L, PIN(D, 2), GPIO_INT_FALLING, usb0_evt) -GPIO_INT(USB_C1_BC12_INT_L, PIN(D, 3), GPIO_INT_FALLING, usb1_evt) -GPIO_INT(ACCELGYRO3_INT_L, PIN(3, 6), GPIO_INT_FALLING | GPIO_PULL_UP, bmi160_interrupt) -GPIO_INT(TABLET_MODE_L, PIN(7, 2), GPIO_INT_BOTH, gmr_tablet_switch_isr) -GPIO_INT(CCD_MODE_ODL, PIN(6, 3), GPIO_INT_FALLING, ccd_mode_isr) - -GPIO(ENABLE_BACKLIGHT_L, PIN(6, 7), GPIO_OUT_LOW) /* LCD backlight */ -GPIO(PP3300_DX_WLAN, PIN(B, 1), GPIO_OUT_LOW) /* Enable WLAN 3.3V Power */ -GPIO(CPU_PROCHOT, PIN(8, 1), GPIO_OUT_HIGH) /* PROCHOT# to SOC */ -GPIO(PCH_ACPRESENT, PIN(5, 0), GPIO_ODR_LOW) /* ACOK to SOC */ -GPIO(PCH_WAKE_L, PIN(A, 3), GPIO_ODR_HIGH) /* Wake SOC */ -GPIO(PCH_RSMRST_L, PIN(7, 0), GPIO_OUT_LOW) /* RSMRST# to SOC */ -GPIO(PCH_PWRBTN_L, PIN(7, 4), GPIO_ODR_HIGH) /* Power Button to SOC */ -GPIO(EC_PLATFORM_RST, PIN(4, 5), GPIO_OUT_LOW) /* EC Reset to LDO_EN */ -GPIO(SYS_RESET_L, PIN(6, 1), GPIO_ODR_HIGH) /* Cold Reset to SOC */ -GPIO(PMIC_SLP_SUS_L, PIN(8, 5), GPIO_OUT_LOW) /* SLP_SUS# to PMIC */ -GPIO(BATTERY_PRESENT_L, PIN(3, 4), GPIO_INPUT) /* Battery Present */ -GPIO(ENTERING_RW, PIN(7, 6), GPIO_OUTPUT) /* EC Entering RW */ -GPIO(PMIC_INT_L, PIN(6, 0), GPIO_INPUT) /* PMIC interrupt */ -#ifndef CONFIG_POWER_S0IX -GPIO(PCH_SLP_S0_L, PIN(7, 5), GPIO_INPUT) -#endif -GPIO(CR50_RESET_ODL, PIN(0, 2), GPIO_ODR_HIGH) /* Cr50 Reset. dnojiri: unused. */ -GPIO(GPP_B14, PIN(C, 2), GPIO_INPUT) /* Used for Intel's experimental uCode/P-unit update */ -/* Will be used to shut down EC on board_hibernate. */ -GPIO(EC_HIBERNATE, PIN(0, 1), GPIO_OUT_LOW) -/* GPIO(PCH_RTCRST, PIN(E, 7), GPIO_INPUT) dnojiri: Revisit */ - -/* I2C pins - these will be reconfigured for alternate function below */ -GPIO(I2C0_0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C0_0_USBC_3V3_SCL */ -GPIO(I2C0_0_SDA, PIN(B, 4), GPIO_INPUT) /* EC_I2C0_0_USBC_3V3_SDA */ -GPIO(I2C0_1_SCL, PIN(B, 3), GPIO_INPUT) /* EC_I2C0_1_USBC_3V3_SCL */ -GPIO(I2C0_1_SDA, PIN(B, 2), GPIO_INPUT) /* EC_I2C0_1_USBC_3V3_SDA */ -GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* EC_I2C1_3V3_SCL */ -GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* EC_I2C1_3V3_SDA */ -GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* EC_I2C2_PMIC_3V3_SCL */ -GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* EC_I2C2_PMIC_3V3_SDA */ -GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C3_SENSOR_1V8_SCL */ -GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT | GPIO_SEL_1P8V) /* EC_I2C3_SENSOR_1V8_SDA */ - -/* rev0: 5V enables: INPUT=1.5A, OUT_LOW=OFF, OUT_HIGH=3A */ -GPIO(USB_C0_5V_EN, PIN(4, 0), GPIO_OUT_LOW) /* C0 5V Enable */ -GPIO(USB_C0_3A_EN, PIN(3, 5), GPIO_OUT_LOW) /* C0 Enable 3A */ -GPIO(USB_C0_CHARGE_L, PIN(C, 0), GPIO_OUT_LOW) /* C0 Charge enable. Active low. */ -GPIO(USB_C1_5V_EN, PIN(3, 3), GPIO_OUT_LOW) /* C1 5V Enable */ -GPIO(USB_C1_3A_EN, PIN(6, 6), GPIO_OUT_LOW) /* C1 3A Enable */ -GPIO(USB_C1_CHARGE_L, PIN(C, 3), GPIO_OUT_LOW) /* C1 Charge enable. Active low. */ -GPIO(USB_C0_PD_RST_L, PIN(C, 6), GPIO_ODR_HIGH) /* C0 PD Reset */ -GPIO(USB_C1_PD_RST, PIN(0, 0), GPIO_OUT_LOW) /* C1 PD Reset */ -GPIO(USB_C0_DP_HPD, PIN(9, 4), GPIO_INPUT) /* C0 DP Hotplug Detect */ -GPIO(USB_C1_DP_HPD, PIN(A, 5), GPIO_INPUT) /* C1 DP Hotplug Detect */ -GPIO(USB_PP3300_USB_PD, PIN(8, 4), GPIO_INPUT) /* Reserved. Currently, has no effect. */ -GPIO(USB2_ID, PIN(4, 2), GPIO_OUT_HIGH) /* USB OTG ID */ -GPIO(USB3_POWER_DOWN_L, PIN(3, 2), GPIO_OUT_LOW) /* USB3 Redriver Power control. Only used by Sona. */ - -/* Sensors */ - -/* Trackpad */ -GPIO(TP_INT_EN, PIN(A, 1), GPIO_OUT_LOW) - -/* LED */ -GPIO(LED1, PIN(A, 7), GPIO_OUT_LOW) - -/* Alternate functions GPIO definitions */ -ALTERNATE(PIN_MASK(6, 0x30), 1, MODULE_UART, 0) /* GPIO64-65 UART from EC to Servo */ -ALTERNATE(PIN_MASK(8, 0x80), 1, MODULE_I2C, 0) /* GPIO87 EC_I2C1_3V3_SDA */ -ALTERNATE(PIN_MASK(9, 0x01), 1, MODULE_I2C, 0) /* GPIO90 EC_I2C1_3V3_SCL */ -ALTERNATE(PIN_MASK(9, 0x06), 1, MODULE_I2C, 0) /* GPIO91-92 EC_I2C2_SDA/SCL */ -ALTERNATE(PIN_MASK(B, 0x30), 1, MODULE_I2C, 0) /* GPIOB4-B5 EC_I2C0_0_SDA/SCL */ -ALTERNATE(PIN_MASK(B, 0x0C), 1, MODULE_I2C, 0) /* GPOPB2-B3 EC_I2C0_1_SDA/SCL */ -ALTERNATE(PIN_MASK(D, 0x03), 1, MODULE_I2C, 0) /* GPIOD0-D1 EC_I2C3_SDA/SCL */ -ALTERNATE(PIN_MASK(B, 0x40), 1, MODULE_PWM, 0) /* GPIOB6 PWM1 Fan control */ -ALTERNATE(PIN_MASK(8, 0x01), 1, MODULE_PWM, 0) /* GPIO80 PWM3 LED White */ -ALTERNATE(PIN_MASK(B, 0x80), 1, MODULE_PWM, 0) /* GPIOB7 PWM5 LED Yellow */ -ALTERNATE(PIN_MASK(A, 0x40), 1, MODULE_PWM, 0) /* GPIOA6 TA2 */ -ALTERNATE(PIN_MASK(C, 0x10), 1, MODULE_PWM, 0) /* GPIOC4 PWM2 */ - -/* Keyboard pins */ -#define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP) -#define GPIO_KB_OUTPUT (GPIO_ODR_HIGH) -ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(2, 0xfc), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) -ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(1, 0x7f), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(0, 0xf0), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -ALTERNATE(PIN_MASK(8, 0x04), 0, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) diff --git a/board/nami/led.c b/board/nami/led.c deleted file mode 100644 index 17af4d5f82..0000000000 --- a/board/nami/led.c +++ /dev/null @@ -1,613 +0,0 @@ -/* Copyright 2017 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 Nami and its variants - * - * This is an event-driven LED control library. It does not use tasks or - * periodical hooks (HOOK_TICK, HOOK_SECOND), thus, it's more resource - * efficient. - * - * The library defines LED states and assigns an LED behavior to each state. - * The state space consists of tuple of (charge state, power state). - * In each LED state, a color and a pulse interval can be defined. - * - * Charging states are queried each time there is a state transition, thus, not - * stored. We hook power state transitions (e.g. s0->s3) and save the - * destination states (e.g. s3) in power_state. - * - * When system is suspending and AC is unplugged, there will be race condition - * between a power state hook and a charge state hook but whichever is called - * first or last the result will be the same. - * - * Currently, it supports two LEDs, called 'battery LED' and 'power LED'. - * It assumes the battery LED is connected to a PWM pin and the power LED is - * connected to a regular GPIO pin. - */ - -#include "cros_board_info.h" -#include "charge_state.h" -#include "chipset.h" -#include "console.h" -#include "ec_commands.h" -#include "gpio.h" -#include "hooks.h" -#include "led_common.h" -#include "power.h" -#include "pwm.h" -#include "timer.h" -#include "util.h" - -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_BATTERY_LED, EC_LED_ID_POWER_LED}; -const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); - -enum led_color { - LED_OFF = 0, - LED_RED, - LED_GREEN, - LED_AMBER, - LED_WHITE, - LED_WARM_WHITE, - LED_FACTORY, - /* Number of colors, not a color itself */ - LED_COLOR_COUNT -}; - -/* Charging states of LED's interests */ -enum led_charge_state { - LED_STATE_DISCHARGE = 0, - LED_STATE_CHARGE, - LED_STATE_FULL, - LED_CHARGE_STATE_COUNT, -}; - -/* Power states of LED's interests */ -enum led_power_state { - LED_STATE_S0 = 0, - LED_STATE_S3, - LED_STATE_S5, - LED_POWER_STATE_COUNT, -}; - -/* Defines a LED pattern for a single state */ -struct led_pattern { - uint8_t color; - /* Bit 0-5: Interval in 100 msec. 0=solid. Max is 3.2 sec. - * Bit 6: 1=alternate (on-off-off-off), 0=regular (on-off-on-off) - * Bit 7: 1=pulse, 0=blink */ - uint8_t pulse; -}; - -#define PULSE_NO 0 -#define PULSE(interval) (BIT(7) | (interval)) -#define BLINK(interval) (interval) -#define ALTERNATE(interval) (BIT(6) | (interval)) -#define IS_PULSING(pulse) ((pulse) & 0x80) -#define IS_ALTERNATE(pulse) ((pulse) & 0x40) -#define PULSE_INTERVAL(pulse) (((pulse) & 0x3f) * 100 * MSEC) - -/* 40 msec for nice and smooth transition. */ -#define LED_PULSE_TICK_US (40 * MSEC) - -typedef struct led_pattern led_patterns[LED_CHARGE_STATE_COUNT] - [LED_POWER_STATE_COUNT]; - -/* - * Nami/Vayne - One dual color LED: - * Charging Amber on (S0/S3/S5) - * Charging (full) White on (S0/S3/S5) - * Discharge in S0 White on - * Discharge in S3/S0ix Pulsing (rising for 2 sec , falling for 2 sec) - * Discharge in S5 Off - * Battery Error Amber on 1sec off 1sec - * Factory mode White on 2sec, Amber on 2sec - */ -const static led_patterns battery_pattern_0 = { - /* discharging: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE(10)}, {LED_OFF, PULSE_NO}}, - /* charging: s0, s3, s5 */ - {{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}}, -}; - -/* - * Sona - Battery LED (dual color) - */ -const static led_patterns battery_pattern_1 = { - /* discharging: s0, s3, s5 */ - {{LED_OFF, PULSE_NO}, {LED_OFF, PULSE_NO}, {LED_OFF, PULSE_NO}}, - /* charging: s0, s3, s5 */ - {{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}}, -}; - -/* - * Pantheon - AC In/Battery LED(dual color): - * Connected to AC power / Charged (100%) White (solid on) - * Connected to AC power / Charging(1% -99%) Amber (solid on) - * Not connected to AC power Off - */ -const static led_patterns battery_pattern_2 = { - /* discharging: s0, s3, s5 */ - {{LED_OFF, PULSE_NO}, {LED_OFF, PULSE_NO}, {LED_OFF, PULSE_NO}}, - /* charging: s0, s3, s5 */ - {{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}}, -}; - -/* - * Sona - Power LED (single color) - */ -const static led_patterns power_pattern_1 = { - /* discharging: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}}, - /* charging: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}}, -}; - -/* - * Pantheon - Power LED - * S0: White on - * S3/S0ix: White 1 second on, 3 second off - * S5: Off - */ -const static led_patterns power_pattern_2 = { - /* discharging: s0, s3, s5 */ - {{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}}, - /* charging: s0, s3, s5 */ - {{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, 0}, {LED_WHITE, ALTERNATE(BLINK(10))}, {LED_OFF, 0}}, -}; - -/* - * Akali - battery LED - * Charge: Amber on (s0/s3/s5) - * Full: Blue on (s0/s3/s5) - * Discharge in S0: Blue on - * Discharge in S3: Amber on 1 sec off 3 sec - * Discharge in S5: Off - * Battery Error: Amber on 1sec off 1sec - * Factory mode : Blue on 2sec, Amber on 2sec - */ -const static led_patterns battery_pattern_3 = { - /* discharging: s0, s3, s5 */ - {{LED_WHITE, 0}, {LED_AMBER, ALTERNATE(BLINK(10))}, {LED_OFF, 0}}, - /* charging: s0, s3, s5 */ - {{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}}, -}; - -const static led_patterns battery_pattern_4 = { - /* discharging: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, BLINK(10)}, {LED_OFF, PULSE_NO}}, - /* charging: s0, s3, s5 */ - {{LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}, {LED_AMBER, PULSE_NO}}, - /* full: s0, s3, s5 */ - {{LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}, {LED_WHITE, PULSE_NO}}, -}; - -/* Patterns for battery LED and power LED. Initialized at run-time. */ -static led_patterns const *patterns[2]; -/* Pattern for battery error. Only blinking battery LED is supported. */ -static struct led_pattern battery_error = {LED_AMBER, BLINK(10)}; -/* Pattern for low state of charge. Only battery LED is supported. */ -static struct led_pattern low_battery = {LED_WHITE, BLINK(10)}; -/* Pattern for factory mode. Blinking 2-color battery LED. */ -static struct led_pattern battery_factory = {LED_FACTORY, BLINK(20)}; -static int low_battery_soc; -static void led_charge_hook(void); -static enum led_power_state power_state; - -static void led_init(void) -{ - switch (oem) { - case PROJECT_NAMI: - case PROJECT_VAYNE: - patterns[0] = &battery_pattern_0; - break; - case PROJECT_SONA: - if (model == MODEL_SYNDRA) { - /* Syndra doesn't have power LED */ - patterns[0] = &battery_pattern_4; - } else { - patterns[0] = &battery_pattern_1; - patterns[1] = &power_pattern_1; - } - battery_error.pulse = BLINK(5); - low_battery_soc = 100; /* 10.0% */ - break; - case PROJECT_PANTHEON: - patterns[0] = &battery_pattern_2; - patterns[1] = &power_pattern_2; - battery_error.color = LED_OFF; - battery_error.pulse = 0; - break; - case PROJECT_AKALI: - patterns[0] = &battery_pattern_3; - break; - default: - break; - } - - pwm_enable(PWM_CH_LED1, 1); - pwm_enable(PWM_CH_LED2, 1); - - /* After sysjump, power_state is cleared. Thus, we need to actively - * retrieve it. */ - if (chipset_in_state(CHIPSET_STATE_ANY_OFF)) - power_state = LED_STATE_S5; - else if (chipset_in_state(CHIPSET_STATE_ANY_SUSPEND)) - power_state = LED_STATE_S3; - else - power_state = LED_STATE_S0; -} -DECLARE_HOOK(HOOK_INIT, led_init, HOOK_PRIO_DEFAULT); - -static int set_color_battery(enum led_color color, int duty) -{ - int led1 = 0; - int led2 = 0; - - if (duty < 0 || 100 < duty) - return EC_ERROR_UNKNOWN; - - switch (color) { - case LED_OFF: - break; - case LED_AMBER: - led2 = 1; - break; - case LED_WHITE: - led1 = 1; - break; - case LED_WARM_WHITE: - led1 = 1; - led2 = 1; - break; - case LED_FACTORY: - break; - default: - return EC_ERROR_UNKNOWN; - } - - if (color != LED_FACTORY) { - pwm_set_duty(PWM_CH_LED1, led1 ? duty : 0); - pwm_set_duty(PWM_CH_LED2, led2 ? duty : 0); - } else { - pwm_set_duty(PWM_CH_LED1, duty ? 100 : 0); - pwm_set_duty(PWM_CH_LED2, duty ? 0 : 100); - } - - return EC_SUCCESS; -} - -static int set_color_power(enum led_color color, int duty) -{ - if (color == LED_OFF) - duty = 0; - gpio_set_level(GPIO_LED1, !duty /* Reversed logic */); - return EC_SUCCESS; -} - -static int set_color(enum ec_led_id id, enum led_color color, int duty) -{ - switch (id) { - case EC_LED_ID_BATTERY_LED: - return set_color_battery(color, duty); - case EC_LED_ID_POWER_LED: - return set_color_power(color, duty); - default: - return EC_ERROR_UNKNOWN; - } -} - -static struct { - uint32_t interval; - int duty_inc; - enum led_color color; - int duty; - int alternate; - uint8_t pulse; -} tick[2]; - -static void tick_battery(void); -DECLARE_DEFERRED(tick_battery); -static void tick_power(void); -DECLARE_DEFERRED(tick_power); -static void cancel_tick(enum ec_led_id id) -{ - if (id == EC_LED_ID_BATTERY_LED) - hook_call_deferred(&tick_battery_data, -1); - else - hook_call_deferred(&tick_power_data, -1); -} - -static int config_tick(enum ec_led_id id, const struct led_pattern *pattern) -{ - static const struct led_pattern *patterns[2]; - uint32_t stride; - - if (pattern == patterns[id]) - /* This pattern was already set */ - return -1; - - patterns[id] = pattern; - - if (!pattern->pulse) { - /* This is a steady pattern. cancel the tick */ - cancel_tick(id); - set_color(id, pattern->color, 100); - return 1; - } - - stride = PULSE_INTERVAL(pattern->pulse); - if (IS_PULSING(pattern->pulse)) { - tick[id].interval = LED_PULSE_TICK_US; - tick[id].duty_inc = 100 / (stride / LED_PULSE_TICK_US); - } else { - tick[id].interval = stride; - tick[id].duty_inc = 100; - } - tick[id].color = pattern->color; - tick[id].duty = 0; - tick[id].alternate = 0; - tick[id].pulse = pattern->pulse; - - return 0; -} - -/* - * When pulsing, brightness is incremented by <duty_inc> every <interval> usec - * from 0 to 100%. Then it's decremented from 100% to 0. - */ -static void pulse_led(enum ec_led_id id) -{ - if (tick[id].duty + tick[id].duty_inc > 100) { - tick[id].duty_inc = tick[id].duty_inc * -1; - } else if (tick[id].duty + tick[id].duty_inc < 0) { - if (IS_ALTERNATE(tick[id].pulse)) { - /* Falling phase landing. Flip the alternate flag. */ - tick[id].alternate = !tick[id].alternate; - if (tick[id].alternate) - return; - } - tick[id].duty_inc = tick[id].duty_inc * -1; - } - tick[id].duty += tick[id].duty_inc; - set_color(id, tick[id].color, tick[id].duty); -} - -static uint32_t tick_led(enum ec_led_id id) -{ - uint32_t elapsed; - uint32_t start = get_time().le.lo; - uint32_t next; - - if (led_auto_control_is_enabled(id)) - pulse_led(id); - if (tick[id].alternate) - /* Skip 2 phases (rising & falling) */ - next = PULSE_INTERVAL(tick[id].pulse) * 2; - else - next = tick[id].interval; - elapsed = get_time().le.lo - start; - return next > elapsed ? next - elapsed : 0; -} - -static void tick_battery(void) -{ - hook_call_deferred(&tick_battery_data, tick_led(EC_LED_ID_BATTERY_LED)); -} - -static void tick_power(void) -{ - hook_call_deferred(&tick_power_data, tick_led(EC_LED_ID_POWER_LED)); -} - -static void start_tick(enum ec_led_id id, const struct led_pattern *pattern) -{ - if (config_tick(id, pattern)) - /* - * If this pattern is already active, ticking must have started - * already. So, we don't re-start ticking to prevent LED from - * blinking at every SOC change. - * - * If this pattern is static, we skip ticking as well. - */ - return; - - if (id == EC_LED_ID_BATTERY_LED) - tick_battery(); - else - tick_power(); -} - -static void led_alert(int enable) -{ - if (enable) - start_tick(EC_LED_ID_BATTERY_LED, &battery_error); - else - led_charge_hook(); -} - -static void led_factory(int enable) -{ - if (enable) - start_tick(EC_LED_ID_BATTERY_LED, &battery_factory); - else - led_charge_hook(); -} - -void config_led(enum ec_led_id id, enum led_charge_state charge) -{ - const led_patterns *pattern; - - pattern = patterns[id]; - if (!pattern) - return; /* This LED isn't present */ - - start_tick(id, &(*pattern)[charge][power_state]); -} - -void config_leds(enum led_charge_state charge) -{ - config_led(EC_LED_ID_BATTERY_LED, charge); - config_led(EC_LED_ID_POWER_LED, charge); -} - -static void call_handler(void) -{ - int soc; - enum charge_state cs; - - if (!led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) - return; - - cs = charge_get_state(); - soc = charge_get_display_charge(); - if (soc < 0) - cs = PWR_STATE_ERROR; - - switch (cs) { - case PWR_STATE_DISCHARGE: - case PWR_STATE_DISCHARGE_FULL: - if (soc < low_battery_soc) - start_tick(EC_LED_ID_BATTERY_LED, &low_battery); - else - config_led(EC_LED_ID_BATTERY_LED, LED_STATE_DISCHARGE); - config_led(EC_LED_ID_POWER_LED, LED_STATE_DISCHARGE); - break; - case PWR_STATE_CHARGE_NEAR_FULL: - case PWR_STATE_CHARGE: - if (soc >= 1000) - config_leds(LED_STATE_FULL); - else - config_leds(LED_STATE_CHARGE); - break; - case PWR_STATE_ERROR: - /* It doesn't matter what 'charge' state we pass because power - * LED (if it exists) is orthogonal to battery state. */ - config_led(EC_LED_ID_POWER_LED, 0); - led_alert(1); - break; - case PWR_STATE_IDLE: - /* External power connected in IDLE. This is also used to show - * factory mode when 'ectool chargecontrol idle' is run during - * factory process. */ - if (charge_get_flags() & CHARGE_FLAG_FORCE_IDLE) - led_factory(1); - break; - default: - ; - } -} - -/* LED state transition handlers */ -static void s0(void) -{ - power_state = LED_STATE_S0; - call_handler(); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, s0, HOOK_PRIO_DEFAULT); -DECLARE_HOOK(HOOK_CHIPSET_STARTUP, s0, HOOK_PRIO_DEFAULT); - -static void s3(void) -{ - power_state = LED_STATE_S3; - call_handler(); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, s3, HOOK_PRIO_DEFAULT); - -static void s5(void) -{ - power_state = LED_STATE_S5; - call_handler(); -} -DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, s5, HOOK_PRIO_DEFAULT); - -static void led_charge_hook(void) -{ - call_handler(); -} -DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, led_charge_hook, HOOK_PRIO_DEFAULT); - -static void print_config(enum ec_led_id id) -{ - ccprintf("ID:%d\n", id); - ccprintf(" Color:%d\n", tick[id].color); - ccprintf(" Duty:%d\n", tick[id].duty); - ccprintf(" Duty Increment:%d\n", tick[id].duty_inc); - ccprintf(" Interval:%d\n", tick[id].interval); -} - -static int command_led(int argc, char **argv) -{ - enum ec_led_id id = EC_LED_ID_BATTERY_LED; - static int alert = 0; - static int factory; - - if (argc < 2) - return EC_ERROR_PARAM_COUNT; - - if (!strcasecmp(argv[1], "debug")) { - led_auto_control(id, !led_auto_control_is_enabled(id)); - ccprintf("o%s\n", led_auto_control_is_enabled(id) ? "ff" : "n"); - } else if (!strcasecmp(argv[1], "off")) { - set_color(id, LED_OFF, 0); - } else if (!strcasecmp(argv[1], "red")) { - set_color(id, LED_RED, 100); - } else if (!strcasecmp(argv[1], "white")) { - set_color(id, LED_WHITE, 100); - } else if (!strcasecmp(argv[1], "amber")) { - set_color(id, LED_AMBER, 100); - } else if (!strcasecmp(argv[1], "alert")) { - alert = !alert; - led_alert(alert); - } else if (!strcasecmp(argv[1], "s0")) { - s0(); - } else if (!strcasecmp(argv[1], "s3")) { - s3(); - } else if (!strcasecmp(argv[1], "s5")) { - s5(); - } else if (!strcasecmp(argv[1], "conf")) { - print_config(id); - } else if (!strcasecmp(argv[1], "factory")) { - factory = !factory; - led_factory(factory); - } else { - return EC_ERROR_PARAM1; - } - return EC_SUCCESS; -} -DECLARE_CONSOLE_COMMAND(led, command_led, - "[debug|red|green|amber|off|alert|s0|s3|s5|conf|factory]", - "Turn on/off LED."); - -void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) -{ - /* - * We return amber=100, white=100 regardless of OEM ID or led_id. This - * function is for ectool led command, which is used to test LED - * functionality. - */ - brightness_range[EC_LED_COLOR_AMBER] = 100; - brightness_range[EC_LED_COLOR_WHITE] = 100; -} - -int led_set_brightness(enum ec_led_id id, const uint8_t *brightness) -{ - if (brightness[EC_LED_COLOR_AMBER]) - return set_color(id, LED_AMBER, brightness[EC_LED_COLOR_AMBER]); - else if (brightness[EC_LED_COLOR_WHITE]) - return set_color(id, LED_WHITE, brightness[EC_LED_COLOR_WHITE]); - else - return set_color(id, LED_OFF, 0); -} diff --git a/board/nami/usb_pd_policy.c b/board/nami/usb_pd_policy.c deleted file mode 100644 index c1d5591d7c..0000000000 --- a/board/nami/usb_pd_policy.c +++ /dev/null @@ -1,114 +0,0 @@ -/* Copyright 2017 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 "extpower.h" -#include "charge_manager.h" -#include "chipset.h" -#include "common.h" -#include "console.h" -#include "driver/tcpm/ps8xxx.h" -#include "gpio.h" -#include "hooks.h" -#include "host_command.h" -#include "registers.h" -#include "system.h" -#include "task.h" -#include "timer.h" -#include "util.h" -#include "usb_mux.h" -#include "usb_pd.h" -#include "usb_pd_tcpm.h" - -#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args) -#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args) - -static uint8_t vbus_en[CONFIG_USB_PD_PORT_MAX_COUNT]; -static uint8_t vbus_rp[CONFIG_USB_PD_PORT_MAX_COUNT] = {TYPEC_RP_1A5, - TYPEC_RP_1A5}; -int board_vbus_source_enabled(int port) -{ - return vbus_en[port]; -} - -static void board_vbus_update_source_current(int port) -{ - gpio_set_level(port ? GPIO_USB_C1_3A_EN : GPIO_USB_C0_3A_EN, - vbus_rp[port] == TYPEC_RP_3A0 ? 1 : 0); - gpio_set_level(port ? GPIO_USB_C1_5V_EN : GPIO_USB_C0_5V_EN, - vbus_en[port]); -} - -__override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) -{ - vbus_rp[port] = rp; - - /* change the GPIO driving the load switch if needed */ - board_vbus_update_source_current(port); -} - -int pd_set_power_supply_ready(int port) -{ - /* Disable charging */ - gpio_set_level(port ? GPIO_USB_C1_CHARGE_L : - GPIO_USB_C0_CHARGE_L, 1); - - /* Ensure we advertise the proper available current quota */ - charge_manager_source_port(port, 1); - - /* Provide VBUS */ - vbus_en[port] = 1; - board_vbus_update_source_current(port); - - 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) -{ - int prev_en; - - prev_en = vbus_en[port]; - - /* Disable VBUS */ - vbus_en[port] = 0; - board_vbus_update_source_current(port); - - /* Enable discharge if we were previously sourcing 5V */ - if (prev_en) - pd_set_vbus_discharge(port, 1); - - /* Give back the current quota we are no longer using */ - charge_manager_source_port(port, 0); - - /* notify host of power info change */ - pd_send_host_event(PD_EVENT_POWER_CHANGE); -} - -int pd_snk_is_vbus_provided(int port) -{ - return !gpio_get_level(port ? GPIO_USB_C1_VBUS_WAKE_L : - GPIO_USB_C0_VBUS_WAKE_L); -} - -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_PMIC_SLP_SUS_L); -} - -__override void pd_execute_data_swap(int port, - enum pd_data_role data_role) -{ - /* Only port 0 supports device mode. */ - if (port != 0) - return; - - gpio_set_level(GPIO_USB2_ID, (data_role == PD_ROLE_UFP) ? 0 : 1); -} diff --git a/board/nami/vif_override.xml b/board/nami/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/nami/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. ---> |