diff options
Diffstat (limited to 'board/casta')
| -rw-r--r-- | board/casta/battery.c | 171 | ||||
| -rw-r--r-- | board/casta/board.c | 196 | ||||
| -rw-r--r-- | board/casta/board.h | 95 | ||||
| -rw-r--r-- | board/casta/build.mk | 15 | ||||
| -rw-r--r-- | board/casta/ec.tasklist | 24 | ||||
| -rw-r--r-- | board/casta/gpio.inc | 173 | ||||
| -rw-r--r-- | board/casta/led.c | 131 | ||||
| -rw-r--r-- | board/casta/vif_override.xml | 3 |
8 files changed, 0 insertions, 808 deletions
diff --git a/board/casta/battery.c b/board/casta/battery.c deleted file mode 100644 index 0ced18e734..0000000000 --- a/board/casta/battery.c +++ /dev/null @@ -1,171 +0,0 @@ -/* Copyright 2018 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_fuel_gauge.h" -#include "battery_smart.h" -#include "charge_state.h" -#include "common.h" -#include "util.h" - -#define CHARGING_VOLTAGE_MV_SAFE 8400 -#define CHARGING_CURRENT_MA_SAFE 1500 - -/* - * Battery info for all casta battery types. Note that the fields - * start_charging_min/max and charging_min/max are not used for the charger. - * The effective temperature limits are given by discharging_min/max_c. - * - * Fuel Gauge (FG) parameters which are used for determining if the battery - * is connected, the appropriate ship mode (battery cutoff) command, and the - * charge/discharge FETs status. - * - * Ship mode (battery cutoff) requires 2 writes to the appropriate smart battery - * register. For some batteries, the charge/discharge FET bits are set when - * charging/discharging is active, in other types, these bits set mean that - * charging/discharging is disabled. Therefore, in addition to the mask for - * these bits, a disconnect value must be specified. Note that for TI fuel - * gauge, the charge/discharge FET status is found in Operation Status (0x54), - * but a read of Manufacturer Access (0x00) will return the lower 16 bits of - * Operation status which contains the FET status bits. - * - * The assumption for battery types supported is that the charge/discharge FET - * status can be read with a sb_read() command and therefore, only the register - * address, mask, and disconnect value need to be provided. - */ -const struct board_batt_params board_battery_info[] = { - [BATTERY_SDI] = { - .fuel_gauge = { - .manuf_name = "SDI", - .device_name = "4402D51", - .ship_mode = { - .reg_addr = 0x00, - .reg_data = { 0x0010, 0x0010 }, - }, - .fet = { - .mfgacc_support = 0, - .reg_addr = 0x00, - .reg_mask = 0xc000, - .disconnect_val = 0x8000, - } - }, - .batt_info = { - .voltage_max = 8650, - .voltage_normal = 7700, /* mV */ - .voltage_min = 6000, /* mV */ - .precharge_current = 200, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 50, - .discharging_min_c = -20, - .discharging_max_c = 70, - }, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); - -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_SDI; - -int charger_profile_override(struct charge_state_data *curr) -{ - int current; - int voltage; - /* battery temp in 0.1 deg C */ - int bat_temp_c; - const struct battery_info *batt_info; - - /* - * Keep track of battery temperature range: - * - * ZONE_0 ZONE_1 ZONE_2 ZONE_3 - * ---+------+--------+--------+------+--- Temperature (C) - * 0 5 12 45 50 - */ - enum { - TEMP_ZONE_0, /* 0 <= bat_temp_c <= 5 */ - TEMP_ZONE_1, /* 5 < bat_temp_c <= 12 */ - TEMP_ZONE_2, /* 12 < bat_temp_c <= 45 */ - TEMP_ZONE_3, /* 45 < bat_temp_c <= 50 */ - TEMP_ZONE_COUNT, - TEMP_OUT_OF_RANGE = TEMP_ZONE_COUNT - } temp_zone; - - /* - * Precharge must be executed when communication is failed on - * dead battery. - */ - if(!(curr->batt.flags & BATT_FLAG_RESPONSIVE)) - return 0; - - current = curr->requested_current; - voltage = curr->requested_voltage; - bat_temp_c = curr->batt.temperature - 2731; - batt_info = battery_get_info(); - - /* - * If the temperature reading is bad, assume the temperature - * is out of allowable range. - */ - if ((curr->batt.flags & BATT_FLAG_BAD_TEMPERATURE) || - (bat_temp_c < 0) || (bat_temp_c > 500)) - temp_zone = TEMP_OUT_OF_RANGE; - else if (bat_temp_c <= 50) - temp_zone = TEMP_ZONE_0; - else if (bat_temp_c <= 120) - temp_zone = TEMP_ZONE_1; - else if (bat_temp_c <= 450) - temp_zone = TEMP_ZONE_2; - else - temp_zone = TEMP_ZONE_3; - - switch (temp_zone) { - case TEMP_ZONE_0: - voltage = CHARGING_VOLTAGE_MV_SAFE; - current = CHARGING_CURRENT_MA_SAFE; - break; - case TEMP_ZONE_1: - current = CHARGING_CURRENT_MA_SAFE; - break; - case TEMP_ZONE_2: - break; - case TEMP_ZONE_3: - voltage = CHARGING_VOLTAGE_MV_SAFE; - break; - case TEMP_OUT_OF_RANGE: - /* Don't charge if outside of allowable temperature range */ - current = 0; - voltage = 0; - curr->batt.flags &= ~BATT_FLAG_WANT_CHARGE; - if (curr->state != ST_DISCHARGE) - curr->state = ST_IDLE; - break; - } - - if(voltage > batt_info->voltage_max) - voltage = batt_info->voltage_max; - - curr->requested_voltage = MIN(curr->requested_voltage, voltage); - curr->requested_current = MIN(curr->requested_current, current); - - 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; -} diff --git a/board/casta/board.c b/board/casta/board.c deleted file mode 100644 index 8b36ed0a69..0000000000 --- a/board/casta/board.c +++ /dev/null @@ -1,196 +0,0 @@ -/* Copyright 2018 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. - */ - -/* Casta board-specific configuration */ - -#include "adc.h" -#include "battery.h" -#include "cbi_ssfc.h" -#include "charge_manager.h" -#include "charge_state.h" -#include "common.h" -#include "cros_board_info.h" -#include "driver/charger/bd9995x.h" -#include "driver/charger/bq25710.h" -#include "driver/charger/isl923x.h" -#include "driver/ppc/nx20p348x.h" -#include "driver/tcpm/anx7447.h" -#include "driver/tcpm/ps8xxx.h" -#include "driver/tcpm/tcpci.h" -#include "driver/tcpm/tcpm.h" -#include "extpower.h" -#include "gpio.h" -#include "hooks.h" -#include "i2c.h" -#include "keyboard_scan.h" -#include "lid_switch.h" -#include "power.h" -#include "power_button.h" -#include "switch.h" -#include "system.h" -#include "tcpm/tcpci.h" -#include "temp_sensor.h" -#include "temp_sensor/thermistor.h" -#include "usb_mux.h" -#include "usbc_ppc.h" -#include "util.h" - -#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args) - -#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) - -static uint8_t sku_id; - -static void ppc_interrupt(enum gpio_signal signal) -{ - switch (signal) { - case GPIO_USB_PD_C0_INT_ODL: - nx20p348x_interrupt(0); - break; - - case GPIO_USB_PD_C1_INT_ODL: - nx20p348x_interrupt(1); - break; - - default: - break; - } -} - -/* Must come after other header files and GPIO interrupts*/ -#include "gpio_list.h" - -/* ADC channels */ -const struct adc_t adc_channels[] = { - [ADC_TEMP_SENSOR_AMB] = { - "TEMP_AMB", NPCX_ADC_CH0, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, - [ADC_TEMP_SENSOR_CHARGER] = { - "TEMP_CHARGER", NPCX_ADC_CH1, ADC_MAX_VOLT, ADC_READ_MAX+1, 0}, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - -/* TODO(b/119872005): Casta: confirm thermistor parts */ -const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_BATTERY] = {.name = "Battery", - .type = TEMP_SENSOR_TYPE_BATTERY, - .read = charge_get_battery_temp, - .idx = 0}, - [TEMP_SENSOR_AMBIENT] = {.name = "Ambient", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_51k1_47k_4050b, - .idx = ADC_TEMP_SENSOR_AMB}, - [TEMP_SENSOR_CHARGER] = {.name = "Charger", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = get_temp_3v3_13k7_47k_4050b, - .idx = ADC_TEMP_SENSOR_CHARGER}, -}; -BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -/* Charger config. Start i2c address at isl9238, update during runtime */ -struct charger_config_t chg_chips[] = { - { - .i2c_port = I2C_PORT_CHARGER, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, - }, -}; -const unsigned int chg_cnt = ARRAY_SIZE(chg_chips); - -/* - * I2C callbacks to ensure bus free time for battery I2C transactions is at - * least 5ms. - */ -#define BATTERY_FREE_MIN_DELTA_US (5 * MSEC) -static timestamp_t battery_last_i2c_time; - -static int is_battery_i2c(const int port, const uint16_t slave_addr_flags) -{ - return (port == I2C_PORT_BATTERY) - && (slave_addr_flags == BATTERY_ADDR_FLAGS); -} - -static int is_battery_port(int port) -{ - return (port == I2C_PORT_BATTERY); -} - -void i2c_start_xfer_notify(const int port, const uint16_t slave_addr_flags) -{ - unsigned int time_delta_us; - - if (!is_battery_i2c(port, slave_addr_flags)) - return; - - time_delta_us = time_since32(battery_last_i2c_time); - if (time_delta_us >= BATTERY_FREE_MIN_DELTA_US) - return; - - usleep(BATTERY_FREE_MIN_DELTA_US - time_delta_us); -} - -void i2c_end_xfer_notify(const int port, const uint16_t slave_addr_flags) -{ - /* - * The bus free time needs to be maintained from last transaction - * on I2C bus to any device on it to the next transaction to battery. - */ - if (!is_battery_port(port)) - return; - - battery_last_i2c_time = get_time(); -} - -/* Read CBI from i2c eeprom and initialize variables for board variants */ -static void cbi_init(void) -{ - uint32_t val; - - if (cbi_get_sku_id(&val) != EC_SUCCESS || val > UINT8_MAX) - return; - sku_id = val; - CPRINTS("SKU: %d", sku_id); -} -DECLARE_HOOK(HOOK_INIT, cbi_init, HOOK_PRIO_INIT_I2C); - -static void board_init(void) -{ - if(get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710) - return; - - chg_chips[0].drv = &bq25710_drv; - chg_chips[0].i2c_addr_flags = BQ25710_SMBUS_ADDR1_FLAGS; -} -DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_INIT_I2C); - -static void set_input_limit_on_ac_removal(void) -{ - if (extpower_is_present()) - return; - - if (get_cbi_ssfc_charger() != SSFC_CHARGER_BQ25710) - return; - - charger_set_input_current_limit(0, CONFIG_CHARGER_INPUT_CURRENT); - -} -DECLARE_HOOK(HOOK_AC_CHANGE, set_input_limit_on_ac_removal, HOOK_PRIO_DEFAULT); - -void board_overcurrent_event(int port, int is_overcurrented) -{ - /* Check that port number is valid. */ - if ((port < 0) || (port >= CONFIG_USB_PD_PORT_MAX_COUNT)) - return; - - /* Note that the level is inverted because the pin is active low. */ - gpio_set_level(GPIO_USB_C_OC, !is_overcurrented); -} - -__override uint8_t board_get_usb_pd_port_count(void) -{ - if (sku_id == 2) - return CONFIG_USB_PD_PORT_MAX_COUNT - 1; - return CONFIG_USB_PD_PORT_MAX_COUNT; -} diff --git a/board/casta/board.h b/board/casta/board.h deleted file mode 100644 index 934063c548..0000000000 --- a/board/casta/board.h +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright 2018 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. - */ - -/* Casta board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -/* Select Baseboard features */ -#define VARIANT_OCTOPUS_EC_NPCX796FB -#define VARIANT_OCTOPUS_TCPC_0_PS8751 -#define VARIANT_OCTOPUS_NO_SENSORS -#define CONFIG_CHARGER_RUNTIME_CONFIG -#include "baseboard.h" - -#define CONFIG_LED_COMMON - -/* USB PD */ -#undef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -/* - * This board configures two chargers, one of which can measure VBUS and one of - * which cannot. Leave the default config, which defines - * CONFIG_USB_PD_VBUS_MEASURE_CHARGER. - */ - -#define CONFIG_TEMP_SENSOR -#define CONFIG_THERMISTOR - -/* - * Don't allow the system to boot to S0 when the battery is low and unable to - * communicate on locked systems (which haven't PD negotiated). - */ -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT 15000 - -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON 15001 - -/* - * Allow an additional second during power button init to let PD negotiation - * complete when we have no battery and need to meet - * CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON. SKUs which do not have a TCPC on - * port 1 will take slightly longer to complete negotiation while the PD1 task - * attempts to communicate with its TCPC before suspending. - */ -#undef CONFIG_POWER_BUTTON_INIT_TIMEOUT -#define CONFIG_POWER_BUTTON_INIT_TIMEOUT 2 - -/* Keyboard Backlight is unconnected in casta proto */ -#undef CONFIG_PWM -#undef CONFIG_PWM_KBLIGHT - -/* All casta systems are clamshells */ -#undef CONFIG_TABLET_MODE - -/* TODO(b/119872005): Casta: confirm thermistor parts */ -#define CONFIG_STEINHART_HART_3V3_13K7_47K_4050B -#define CONFIG_STEINHART_HART_3V3_51K1_47K_4050B - -/* Battery W/A */ -#define CONFIG_CHARGER_BQ25710_IDCHG_LIMIT_MA 6144 -#define CONFIG_CHARGER_PROFILE_OVERRIDE -#define CONFIG_I2C_XFER_BOARD_CALLBACK - -/* The board needs 100ms for VBUS_C[0|1]_BC12 to drop to lower VvbusUVLO */ -#undef CONFIG_BC12_MAX14637_DELAY_FROM_OFF_TO_ON_MS -#define CONFIG_BC12_MAX14637_DELAY_FROM_OFF_TO_ON_MS 100 - -#ifndef __ASSEMBLER__ - -#include "gpio_signal.h" -#include "registers.h" - -enum adc_channel { - ADC_TEMP_SENSOR_AMB, /* ADC0 */ - ADC_TEMP_SENSOR_CHARGER, /* ADC1 */ - ADC_CH_COUNT -}; - -enum temp_sensor_id { - TEMP_SENSOR_BATTERY, - TEMP_SENSOR_AMBIENT, - TEMP_SENSOR_CHARGER, - TEMP_SENSOR_COUNT -}; - -/* List of possible batteries */ -enum battery_type { - BATTERY_SDI, - BATTERY_TYPE_COUNT, -}; - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/casta/build.mk b/board/casta/build.mk deleted file mode 100644 index 3d04b75731..0000000000 --- a/board/casta/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2018 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_FAMILY:=npcx7 -CHIP_VARIANT:=npcx7m6fb -BASEBOARD:=octopus - -board-y=board.o led.o -board-$(CONFIG_BATTERY_SMART)+=battery.o diff --git a/board/casta/ec.tasklist b/board/casta/ec.tasklist deleted file mode 100644 index ac41d643dc..0000000000 --- a/board/casta/ec.tasklist +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* - * See CONFIG_TASK_LIST in config.h for details. - */ - -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(CHIPSET, chipset_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(HOSTCMD, host_command_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(POWERBTN, power_button_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C0, pd_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_C1, pd_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C0, pd_interrupt_handler_task, 0, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, VENTI_TASK_STACK_SIZE) diff --git a/board/casta/gpio.inc b/board/casta/gpio.inc deleted file mode 100644 index e37926b72e..0000000000 --- a/board/casta/gpio.inc +++ /dev/null @@ -1,173 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2018 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* Declare symbolic names for all the GPIOs that we care about. - * Note: Those with interrupt handlers must be declared first. */ - -/* Wake Source interrupts */ -GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | - GPIO_HIB_WAKE_HIGH, lid_interrupt) -/* - * High-to-low transition on POWER_BUTTON_L is treated as a wake event from - * hibernate. Absence of GPIO_HIB_WAKE_HIGH flag is treated as wake on - * high-to-low edge. - */ -GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */ -GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | - GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* ACOK_OD */ - -/* USB-C interrupts */ -GPIO_INT(USB_C0_MUX_INT_ODL, PIN(6, 1), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_MUX_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_PD_C0_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_PD_C1_INT_ODL, PIN(F, 1), GPIO_INT_FALLING, ppc_interrupt) - -/* Power State interrupts */ -#ifdef CONFIG_POWER_S0IX -GPIO_INT(PCH_SLP_S0_L, PIN(A, 4), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S0_L */ -#endif -GPIO_INT(PCH_SLP_S4_L, PIN(A, 3), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S4_L */ -GPIO_INT(PCH_SLP_S3_L, PIN(A, 6), GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S3_L */ -GPIO_INT(SUSPWRDNACK, PIN(D, 5), GPIO_INT_BOTH, power_signal_interrupt) /* SUSPWRDNACK */ -GPIO_INT(RSMRST_L_PGOOD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_RSMRST_ODL */ -GPIO_INT(ALL_SYS_PGOOD, PIN(F, 4), GPIO_INT_BOTH, power_signal_interrupt) /* PMIC_EC_PWROK_OD */ - -/* Other interrupts */ -GPIO_INT(WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) /* EC_WP_ODL */ - -/* Define PCH_SLP_S0_L after all interrupts if CONFIG_POWER_S0IX not defined. */ -#ifndef CONFIG_POWER_S0IX -GPIO(PCH_SLP_S0_L, PIN(A, 4), GPIO_INPUT) /* SLP_S0_L */ -#endif - -/* - * PLT_RST_L isn't used since there is a Virtual Wire on eSPI for it. It is here - * only for debugging purposes. - */ -GPIO(PLT_RST_L, PIN(C, 7), GPIO_INPUT) /* Platform Reset from SoC */ -GPIO(SYS_RESET_L, PIN(3, 4), GPIO_ODR_HIGH) /* SYS_RST_ODL */ -GPIO(PCH_RTCRST, PIN(7, 6), GPIO_OUT_LOW) /* EC_PCH_RTCRST */ - -GPIO(ENTERING_RW, PIN(E, 1), GPIO_OUT_LOW) /* EC_ENTERING_RW */ -GPIO(PCH_WAKE_L, PIN(7, 4), GPIO_ODR_HIGH) /* EC_PCH_WAKE_ODL */ -GPIO(PCH_PWRBTN_L, PIN(C, 1), GPIO_ODR_HIGH) /* EC_PCH_PWR_BTN_ODL */ - -GPIO(EN_PP5000, PIN(7, 3), GPIO_OUT_LOW) /* EN_PP5000_A */ -GPIO(PP5000_PG, PIN(C, 0), GPIO_INPUT) /* PP5000_PG_OD */ -GPIO(EN_PP3300, PIN(D, 4), GPIO_OUT_LOW) /* EN_PP3300_A */ -GPIO(PP3300_PG, PIN(6, 0), GPIO_INPUT) /* PP3300_PG_OD */ -GPIO(PMIC_EN, PIN(7, 2), GPIO_OUT_LOW) /* Enable A Rails via PMIC */ -GPIO(PCH_RSMRST_L, PIN(C, 2), GPIO_OUT_LOW) /* RSMRST# to SOC. All _A rails now up. */ -GPIO(PCH_SYS_PWROK, PIN(B, 7), GPIO_OUT_LOW) /* EC_PCH_PWROK. All S0 rails now up. */ - -/* Peripheral rails */ -GPIO(ENABLE_BACKLIGHT, PIN(D, 3), GPIO_ODR_HIGH | - GPIO_SEL_1P8V) /* EC_BL_EN_OD */ -GPIO(EN_P3300_TRACKPAD_ODL, PIN(3, 3), GPIO_ODR_HIGH) - -GPIO(EC_BATT_PRES_L, PIN(E, 5), GPIO_INPUT) - -/* - * EC_RST_ODL acts as a wake source from PSL hibernate mode. However, it does - * not need to be an interrupt for normal EC operations. Thus, configure it as - * GPIO_INPUT with wake on low-to-high edge using GPIO_HIB_WAKE_HIGH so that PSL - * common code can configure PSL_IN correctly. - * - * Reason for choosing low-to-high edge for waking from hibernate is to avoid - * the double reset - one because of PSL_IN wake and other because of VCC1_RST - * being asserted. Also, it should be fine to have the EC in hibernate when H1 - * or servo wants to hold the EC in reset since VCC1 will be down and so entire - * EC logic (except PSL) as well as AP will be in reset. - * - * We need to lock the setting so this gpio can't be reconfigured to overdrive - * the real reset signal. (This is the PSL input pin not the real reset pin). - */ -GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | - GPIO_HIB_WAKE_HIGH | - GPIO_LOCKED) - -/* - * PCH_PROCHOT_ODL is primarily for monitoring the PROCHOT# signal which is - * normally driven by the PMIC. The EC can also drive this signal in the event - * that the ambient or charger temperature sensors exceeds their thresholds. - */ -GPIO(CPU_PROCHOT, PIN(3, 7), GPIO_INPUT | GPIO_SEL_1P8V) /* PCH_PROCHOT_ODL */ - -/* I2C pins - Alternate function below configures I2C module on these pins */ -GPIO(I2C0_SCL, PIN(B, 5), GPIO_INPUT) /* EC_I2C_BATTERY_3V3_SCL */ -GPIO(I2C0_SDA, PIN(B, 4), GPIO_INPUT) /* EC_I2C_BATTERY_3V3_SDA */ -GPIO(I2C1_SCL, PIN(9, 0), GPIO_INPUT) /* EC_I2C_USB_C0_MUX_SCL */ -GPIO(I2C1_SDA, PIN(8, 7), GPIO_INPUT) /* EC_I2C_USB_C0_MUX_SDA */ -GPIO(I2C2_SCL, PIN(9, 2), GPIO_INPUT) /* EC_I2C_USB_C1_MUX_SCL */ -GPIO(I2C2_SDA, PIN(9, 1), GPIO_INPUT) /* EC_I2C_USB_C1_MUX_SDA */ -GPIO(I2C3_SCL, PIN(D, 1), GPIO_INPUT) /* EC_I2C_EEPROM_SCL */ -GPIO(I2C3_SDA, PIN(D, 0), GPIO_INPUT) /* EC_I2C_EEPROM_SDA */ -GPIO(I2C4_SCL, PIN(F, 3), GPIO_INPUT) /* EC_I2C_CHARGER_3V3_SCL */ -GPIO(I2C4_SDA, PIN(F, 2), GPIO_INPUT) /* EC_I2C_CHARGER_3V3_SDA */ - -/* USB pins */ -GPIO(EN_USB_A0_5V, PIN(6, 7), GPIO_OUT_LOW) /* Enable A0 5V Charging */ -GPIO(EN_USB_A1_5V, PIN(9, 6), GPIO_INPUT | GPIO_PULL_DOWN) /* NC */ -GPIO(USB_A0_CHARGE_EN_L, PIN(A, 2), GPIO_OUT_HIGH) /* Enable A0 1.5A Charging */ -GPIO(USB_A1_CHARGE_EN_L, PIN(A, 0), GPIO_INPUT | GPIO_PULL_DOWN) /* NC */ - -GPIO(USB_C0_PD_RST_ODL, PIN(8, 3), GPIO_ODR_HIGH) /* C0 PD Reset */ -GPIO(USB_C0_BC12_VBUS_ON, PIN(6, 3), GPIO_OUT_LOW) /* C0 BC1.2 Power */ -GPIO(USB_C0_BC12_CHG_DET_L, PIN(9, 5), GPIO_INPUT) /* C0 BC1.2 Detect */ -GPIO(USB_C0_HPD_1V8_ODL, PIN(C, 5), GPIO_INPUT | /* C0 DP Hotplug Detect */ - GPIO_SEL_1P8V) -GPIO(USB_C1_PD_RST_ODL, PIN(7, 0), GPIO_ODR_HIGH) /* C1 PD Reset */ -GPIO(USB_C1_BC12_VBUS_ON, PIN(B, 1), GPIO_OUT_LOW) /* C1 BC1.2 Power */ -GPIO(USB_C1_BC12_CHG_DET_L, PIN(E, 4), GPIO_INPUT) /* C1 BC1.2 Detect */ -GPIO(USB_C1_HPD_1V8_ODL, PIN(C, 6), GPIO_INPUT | /* C1 DP Hotplug Detect */ - GPIO_SEL_1P8V) - -/* LED */ -GPIO(BAT_LED_RED_L, PIN(C, 3), GPIO_OUT_HIGH) -GPIO(BAT_LED_GREEN_L, PIN(C, 4), GPIO_OUT_HIGH) -GPIO(PWR_LED_BLUE_L, PIN(D, 7), GPIO_OUT_HIGH) - -/* MKBP event synchronization */ -GPIO(EC_INT_L, PIN(9, 4), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ - -/* Not implemented in hardware */ -UNIMPLEMENTED(KB_BL_PWR_EN) - -/* Overcurrent event to host */ -GPIO(USB_C_OC, PIN(3, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) - -/* Strap pins */ -GPIO(GPO66_NC, PIN(6, 6), GPIO_INPUT | GPIO_PULL_UP) -GPIO(GPOB6_NC, PIN(B, 6), GPIO_INPUT | GPIO_PULL_UP) - -/* Misc. */ -GPIO(CCD_MODE_ODL, PIN(E, 3), GPIO_INPUT) - -/* Keyboard pins */ -ALTERNATE(PIN_MASK(3, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_00-01 */ -ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT) /* KSI_02-07 */ -ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_00-01 */ -ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_03-09 */ -ALTERNATE(PIN_MASK(0, 0xF0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-13 */ -ALTERNATE(PIN_MASK(8, 0x04), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_14 */ -GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW) /* KSO_02 inverted */ - -/* Alternate functions GPIO definitions */ -/* Cr50 requires no pull-ups on UART pins. */ -ALTERNATE(PIN_MASK(6, 0x30), 0, MODULE_UART, 0) /* UART from EC to Servo */ -ALTERNATE(PIN_MASK(B, 0x30), 0, MODULE_I2C, 0) /* I2C0 */ -ALTERNATE(PIN_MASK(9, 0x07), 0, MODULE_I2C, 0) /* I2C1 SCL / I2C2 */ -ALTERNATE(PIN_MASK(8, 0x80), 0, MODULE_I2C, 0) /* I2C1 SDA */ -ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* I2C3 */ -ALTERNATE(PIN_MASK(F, 0x0C), 0, MODULE_I2C, 0) /* I2C4 */ -ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ - -/* Power Switch Logic (PSL) inputs */ -ALTERNATE(PIN_MASK(D, 0x04), 0, MODULE_PMU, 0) /* GPIOD2 = LID_OPEN */ -ALTERNATE(PIN_MASK(0, 0x07), 0, MODULE_PMU, 0) /* GPIO00 = ACOK_OD, - GPIO01 = MECH_PWR_BTN_ODL - GPIO02 = EC_RST_ODL */ diff --git a/board/casta/led.c b/board/casta/led.c deleted file mode 100644 index 514ec096a5..0000000000 --- a/board/casta/led.c +++ /dev/null @@ -1,131 +0,0 @@ -/* Copyright 2018 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 Casta - */ - -#include "chipset.h" -#include "ec_commands.h" -#include "gpio.h" -#include "hooks.h" -#include "led_common.h" -#include "led_onoff_states.h" - -#define LED_OFF_LVL 1 -#define LED_ON_LVL 0 - -__override const int led_charge_lvl_1 = 1; - -__override const int led_charge_lvl_2 = 100; - -/* Casta : There are 3 leds for AC, Battery and Power */ -__override struct led_descriptor - led_bat_state_table[LED_NUM_STATES][LED_NUM_PHASES] = { - [STATE_CHARGING_LVL_1] = {{EC_LED_COLOR_RED, 1 * LED_ONE_SEC}, - {LED_OFF, 1 * LED_ONE_SEC} }, - [STATE_CHARGING_LVL_2] = {{EC_LED_COLOR_RED, LED_INDEFINITE} }, - [STATE_CHARGING_FULL_CHARGE] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0] = {{EC_LED_COLOR_GREEN, LED_INDEFINITE} }, - [STATE_DISCHARGE_S0_BAT_LOW] = {{LED_OFF, LED_INDEFINITE} }, - [STATE_DISCHARGE_S3] = {{LED_OFF, LED_INDEFINITE} }, - [STATE_DISCHARGE_S5] = {{LED_OFF, LED_INDEFINITE} }, - [STATE_BATTERY_ERROR] = {{EC_LED_COLOR_RED, 0.5 * LED_ONE_SEC}, - {LED_OFF, 0.5 * LED_ONE_SEC} }, - [STATE_FACTORY_TEST] = {{EC_LED_COLOR_RED, 1 * LED_ONE_SEC}, - {LED_OFF, 1 * LED_ONE_SEC} }, -}; - -__override const struct led_descriptor - led_pwr_state_table[PWR_LED_NUM_STATES][LED_NUM_PHASES] = { - [PWR_LED_STATE_ON] = {{EC_LED_COLOR_BLUE, LED_INDEFINITE} }, - [PWR_LED_STATE_SUSPEND_AC] = {{LED_OFF, LED_INDEFINITE} }, - [PWR_LED_STATE_SUSPEND_NO_AC] = {{LED_OFF, LED_INDEFINITE} }, - [PWR_LED_STATE_OFF] = {{LED_OFF, LED_INDEFINITE} }, -}; - -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_BATTERY_LED, - EC_LED_ID_POWER_LED -}; - -const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); - -__override void led_set_color_power(enum ec_led_colors color) -{ - /* Don't set led if led_auto_control is disabled. */ - if (!led_auto_control_is_enabled(EC_LED_ID_POWER_LED) || - !led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) { - return; - } - - if (color == EC_LED_COLOR_BLUE) - { - gpio_set_level(GPIO_BAT_LED_RED_L, LED_OFF_LVL); - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_OFF_LVL); - gpio_set_level(GPIO_PWR_LED_BLUE_L, LED_ON_LVL); - } else { - /* LED_OFF and unsupported colors */ - gpio_set_level(GPIO_PWR_LED_BLUE_L, LED_OFF_LVL); - } -} - -__override void led_set_color_battery(enum ec_led_colors color) -{ - /* Don't set led if led_auto_control is disabled. */ - if (!led_auto_control_is_enabled(EC_LED_ID_POWER_LED) || - !led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) { - return; - } - - /* Battery leds must be turn off when blue led is on - * because casta has 3-in-1 led. - */ - if(!gpio_get_level(GPIO_PWR_LED_BLUE_L)) - { - gpio_set_level(GPIO_BAT_LED_RED_L, LED_OFF_LVL); /*red*/ - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_OFF_LVL); /*green*/ - return; - } - - switch (color) { - case EC_LED_COLOR_GREEN: - gpio_set_level(GPIO_BAT_LED_RED_L, LED_OFF_LVL); /*red*/ - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_ON_LVL); /*green*/ - break; - case EC_LED_COLOR_RED: - gpio_set_level(GPIO_BAT_LED_RED_L, LED_ON_LVL); /*red*/ - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_OFF_LVL); /*green*/ - break; - default: /* LED_OFF and other unsupported colors */ - gpio_set_level(GPIO_BAT_LED_RED_L, LED_OFF_LVL); /*red*/ - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_OFF_LVL); /*green*/ - break; - } -} - -void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) -{ - if (led_id == EC_LED_ID_BATTERY_LED) { - brightness_range[EC_LED_COLOR_GREEN] = 1; - brightness_range[EC_LED_COLOR_RED] = 1; - } else if (led_id == EC_LED_ID_POWER_LED) { - brightness_range[EC_LED_COLOR_BLUE] = 1; - } -} - -int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) -{ - if (led_id == EC_LED_ID_BATTERY_LED) { - gpio_set_level(GPIO_PWR_LED_BLUE_L, LED_OFF_LVL); - gpio_set_level(GPIO_BAT_LED_GREEN_L, !brightness[EC_LED_COLOR_GREEN]); - gpio_set_level(GPIO_BAT_LED_RED_L, !brightness[EC_LED_COLOR_RED]); - } else if (led_id == EC_LED_ID_POWER_LED) { - gpio_set_level(GPIO_PWR_LED_BLUE_L, !brightness[EC_LED_COLOR_BLUE]); - gpio_set_level(GPIO_BAT_LED_GREEN_L, LED_OFF_LVL); - gpio_set_level(GPIO_BAT_LED_RED_L, LED_OFF_LVL); - } - - return EC_SUCCESS; -} - diff --git a/board/casta/vif_override.xml b/board/casta/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/casta/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. ---> |