diff options
Diffstat (limited to 'board/morphius')
| -rw-r--r-- | board/morphius/analyzestack.yaml | 2 | ||||
| -rw-r--r-- | board/morphius/battery.c | 120 | ||||
| -rw-r--r-- | board/morphius/board.c | 890 | ||||
| -rw-r--r-- | board/morphius/board.h | 223 | ||||
| -rw-r--r-- | board/morphius/build.mk | 15 | ||||
| -rw-r--r-- | board/morphius/ec.tasklist | 26 | ||||
| -rw-r--r-- | board/morphius/gpio.inc | 175 | ||||
| -rw-r--r-- | board/morphius/led.c | 248 | ||||
| -rw-r--r-- | board/morphius/thermal.c | 522 | ||||
| -rw-r--r-- | board/morphius/vif_override.xml | 3 |
10 files changed, 0 insertions, 2224 deletions
diff --git a/board/morphius/analyzestack.yaml b/board/morphius/analyzestack.yaml deleted file mode 100644 index 7ff5f39644..0000000000 --- a/board/morphius/analyzestack.yaml +++ /dev/null @@ -1,2 +0,0 @@ -remove: -- panic_assert_fail diff --git a/board/morphius/battery.c b/board/morphius/battery.c deleted file mode 100644 index 6d8a8190b2..0000000000 --- a/board/morphius/battery.c +++ /dev/null @@ -1,120 +0,0 @@ -/* Copyright 2019 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_fuel_gauge.h" -#include "common.h" -#include "util.h" - -/* - * Battery info for all Morphius 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[] = { - /* SMP SB10x63140 */ - [BATTERY_SMP] = { - .fuel_gauge = { - .manuf_name = "SMP", - .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, - }, - .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, - } - }, - .batt_info = { - .voltage_max = 8800, /* mV */ - .voltage_normal = 7680, /* mV */ - .voltage_min = 6000, /* mV */ - .precharge_current = 332, /* mA */ - .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, - }, - }, - /* Sunwoda L18D3PG1 */ - [BATTERY_SUNWODA] = { - .fuel_gauge = { - .manuf_name = "SUNWODA", - .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, - }, - .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, - } - }, - .batt_info = { - .voltage_max = 8800, /* mV */ - .voltage_normal = 7680, /* mV */ - .voltage_min = 6000, /* mV */ - .precharge_current = 333, /* mA */ - .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, - }, - }, - /* LG L19L4PG2 */ - [BATTERY_LGC] = { - .fuel_gauge = { - .manuf_name = "LGC", - .ship_mode = { - .reg_addr = 0x34, - .reg_data = { 0x0000, 0x1000 }, - }, - .fet = { - .reg_addr = 0x34, - .reg_mask = 0x0100, - .disconnect_val = 0x0100, - } - }, - .batt_info = { - .voltage_max = 8800, /* mV */ - .voltage_normal = 7700, /* mV */ - .voltage_min = 6000, /* mV */ - .precharge_current = 256, /* mA */ - .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 = 73, - }, - }, -}; - -BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); - -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_SMP; diff --git a/board/morphius/board.c b/board/morphius/board.c deleted file mode 100644 index 48712ffb0c..0000000000 --- a/board/morphius/board.c +++ /dev/null @@ -1,890 +0,0 @@ -/* Copyright 2019 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. - */ - -/* Morphius board configuration */ - -#include "adc.h" -#include "battery_smart.h" -#include "button.h" -#include "cbi_ssfc.h" -#include "charger.h" -#include "cros_board_info.h" -#include "driver/accelgyro_bmi_common.h" -#include "driver/accelgyro_icm_common.h" -#include "driver/accelgyro_icm426xx.h" -#include "driver/accel_kionix.h" -#include "driver/accel_kx022.h" -#include "driver/ppc/aoz1380.h" -#include "driver/ppc/nx20p348x.h" -#include "driver/retimer/pi3dpx1207.h" -#include "driver/retimer/pi3hdx1204.h" -#include "driver/temp_sensor/sb_tsi.h" -#include "driver/temp_sensor/tmp432.h" -#include "driver/usb_mux/amd_fp5.h" -#include "extpower.h" -#include "gpio.h" -#include "fan.h" -#include "fan_chip.h" -#include "hooks.h" -#include "keyboard_8042.h" -#include "lid_switch.h" -#include "mkbp_event.h" -#include "power.h" -#include "power_button.h" -#include "ps2_chip.h" -#include "pwm.h" -#include "pwm_chip.h" -#include "switch.h" -#include "system.h" -#include "tablet_mode.h" -#include "task.h" -#include "temp_sensor.h" -#include "temp_sensor/thermistor.h" -#include "usb_mux.h" -#include "usb_charge.h" -#include "usbc_ppc.h" - -static void hdmi_hpd_interrupt_v2(enum ioex_signal signal); -static void hdmi_hpd_interrupt_v3(enum gpio_signal signal); -static void board_gmr_tablet_switch_isr(enum gpio_signal signal); - -#include "gpio_list.h" - -static bool support_aoz_ppc; -static bool ignore_c1_dp; - -/* Motion sensors */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -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 base_standard_ref_1 = { - { FLOAT_TO_FP(-1), 0, 0}, - { 0, FLOAT_TO_FP(1), 0}, - { 0, 0, FLOAT_TO_FP(-1)} -}; -mat33_fp_t lid_standard_ref = { - { 0, FLOAT_TO_FP(1), 0}, - { FLOAT_TO_FP(-1), 0, 0}, - { 0, 0, FLOAT_TO_FP(1)} -}; - -/* sensor private data */ -static struct kionix_accel_data g_kx022_data; -static struct bmi_drv_data_t g_bmi160_data; -static struct icm_drv_data_t g_icm426xx_data; - -/* TODO(gcc >= 5.0) Remove the casts to const pointer at rot_standard_ref */ -struct motion_sensor_t motion_sensors[] = { - [LID_ACCEL] = { - .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_SENSOR, - .i2c_spi_addr_flags = KX022_ADDR1_FLAGS, - .rot_standard_ref = (const mat33_fp_t *)&lid_standard_ref, - .default_range = 2, /* g, enough for laptop. */ - .min_frequency = KX022_ACCEL_MIN_FREQ, - .max_frequency = KX022_ACCEL_MAX_FREQ, - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - - [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_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs.*/ - .rot_standard_ref = (const mat33_fp_t *)&base_standard_ref, - .min_frequency = BMI_ACCEL_MIN_FREQ, - .max_frequency = BMI_ACCEL_MAX_FREQ, - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - - [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_SENSOR, - .i2c_spi_addr_flags = BMI160_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = (const mat33_fp_t *)&base_standard_ref, - .min_frequency = BMI_GYRO_MIN_FREQ, - .max_frequency = BMI_GYRO_MAX_FREQ, - }, -}; - -unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -struct motion_sensor_t icm426xx_base_accel = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &icm426xx_drv, - .mutex = &g_base_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .default_range = 4, /* g, to meet CDD 7.3.1/C-1-4 reqs.*/ - .rot_standard_ref = &base_standard_ref_1, - .min_frequency = ICM426XX_ACCEL_MIN_FREQ, - .max_frequency = ICM426XX_ACCEL_MAX_FREQ, - .config = { - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100, - }, - /* EC use accel for angle detection */ - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, -}; -struct motion_sensor_t icm426xx_base_gyro = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_ICM426XX, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &icm426xx_drv, - .mutex = &g_base_mutex, - .drv_data = &g_icm426xx_data, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = ICM426XX_ADDR0_FLAGS, - .default_range = 1000, /* dps */ - .rot_standard_ref = &base_standard_ref_1, - .min_frequency = ICM426XX_GYRO_MIN_FREQ, - .max_frequency = ICM426XX_GYRO_MAX_FREQ, -}; - -const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { - .channel = 3, - .flags = PWM_CONFIG_DSLEEP, - .freq = 100, - }, - [PWM_CH_FAN] = { - .channel = 2, - .flags = PWM_CONFIG_OPEN_DRAIN, - .freq = 25000, - }, - [PWM_CH_POWER_LED] = { - .channel = 0, - .flags = PWM_CONFIG_DSLEEP, - .freq = 100, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/* MFT channels. These are logically separate from pwm_channels. */ -const struct mft_t mft_channels[] = { - [MFT_CH_0] = { - .module = NPCX_MFT_MODULE_1, - .clk_src = TCKC_LFCLK, - .pwm_id = PWM_CH_FAN, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(mft_channels) == MFT_CH_COUNT); - -const int usb_port_enable[USBA_PORT_COUNT] = { - IOEX_EN_USB_A0_5V, - IOEX_EN_USB_A1_5V_DB, -}; - -const struct pi3hdx1204_tuning pi3hdx1204_tuning = { - .eq_ch0_ch1_offset = PI3HDX1204_EQ_DB710, - .eq_ch2_ch3_offset = PI3HDX1204_EQ_DB710, - .vod_offset = PI3HDX1204_VOD_130_ALL_CHANNELS, - .de_offset = PI3HDX1204_DE_DB_MINUS7, -}; - -/***************************************************************************** - * Base Gyro Sensor dynamic configuration - */ -static enum ec_cfg_base_gyro_sensor_type base_gyro_config; - -enum ec_cfg_base_gyro_sensor_type get_base_gyro_sensor(void) -{ - switch (get_cbi_ssfc_base_sensor()) { - case SSFC_BASE_GYRO_NONE: - return ec_config_has_base_gyro_sensor(); - default: - return get_cbi_ssfc_base_sensor(); - } -} - -static void setup_base_gyro_config(void) -{ - base_gyro_config = get_base_gyro_sensor(); - - switch (base_gyro_config) { - case BASE_GYRO_BMI160: - ccprints("BASE GYRO is BMI160"); - break; - case BASE_GYRO_ICM426XX: - motion_sensors[BASE_ACCEL] = icm426xx_base_accel; - motion_sensors[BASE_GYRO] = icm426xx_base_gyro; - ccprints("BASE GYRO is ICM426XX"); - break; - default: - break; - } -} - -void motion_interrupt(enum gpio_signal signal) -{ - switch (base_gyro_config) { - case BASE_GYRO_BMI160: - bmi160_interrupt(signal); - break; - case BASE_GYRO_ICM426XX: - icm426xx_interrupt(signal); - break; - default: - break; - } -} - -/***************************************************************************** - * USB-C MUX/Retimer dynamic configuration - */ -static void setup_mux(void) -{ - if (ec_config_has_usbc1_retimer_ps8802()) { - ccprints("C1 PS8802 detected"); - - /* - * Main MUX is PS8802, secondary MUX is modified FP5 - * - * Replace usb_muxes[USBC_PORT_C1] with the PS8802 - * table entry. - */ - memcpy(&usb_muxes[USBC_PORT_C1], - &usbc1_ps8802, - sizeof(struct usb_mux)); - - /* Set the AMD FP5 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_amd_fp5_usb_mux; - - /* Don't have the AMD FP5 flip */ - usbc1_amd_fp5_usb_mux.flags = USB_MUX_FLAG_SET_WITHOUT_FLIP; - - } else if (ec_config_has_usbc1_retimer_ps8818()) { - ccprints("C1 PS8818 detected"); - - /* - * Main MUX is FP5, secondary MUX is PS8818 - * - * Replace usb_muxes[USBC_PORT_C1] with the AMD FP5 - * table entry. - */ - memcpy(&usb_muxes[USBC_PORT_C1], - &usbc1_amd_fp5_usb_mux, - sizeof(struct usb_mux)); - - /* Set the PS8818 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_ps8818; - } -} - -const struct pi3dpx1207_usb_control pi3dpx1207_controls[] = { - [USBC_PORT_C0] = { - .enable_gpio = IOEX_USB_C0_DATA_EN, - .dp_enable_gpio = GPIO_USB_C0_IN_HPD, - }, - [USBC_PORT_C1] = { - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pi3dpx1207_controls) == USBC_PORT_COUNT); - -const struct usb_mux usbc0_pi3dpx1207_usb_retimer = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_TCPC0, - .i2c_addr_flags = PI3DPX1207_I2C_ADDR_FLAGS, - .driver = &pi3dpx1207_usb_retimer, -}; - -struct usb_mux usb_muxes[] = { - [USBC_PORT_C0] = { - .usb_port = USBC_PORT_C0, - .i2c_port = I2C_PORT_USB_AP_MUX, - .i2c_addr_flags = AMD_FP5_MUX_I2C_ADDR_FLAGS, - .driver = &amd_fp5_usb_mux_driver, - .next_mux = &usbc0_pi3dpx1207_usb_retimer, - }, - [USBC_PORT_C1] = { - /* Filled in dynamically at startup */ - }, -}; -BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); - -/***************************************************************************** - * Use FW_CONFIG to set correct configuration. - */ -static uint32_t board_ver; -enum gpio_signal gpio_ec_ps2_reset = GPIO_EC_PS2_RESET_V1; -int board_usbc1_retimer_inhpd = GPIO_USB_C1_HPD_IN_DB_V1; - -static void setup_v0_charger(void) -{ - cbi_get_board_version(&board_ver); - - if (board_ver <= 2) - chg_chips[0].i2c_port = I2C_PORT_CHARGER_V0; -} -/* - * Use HOOK_PRIO_INIT_I2C so we re-map before charger_chips_init() - * talks to the charger. - */ -DECLARE_HOOK(HOOK_INIT, setup_v0_charger, HOOK_PRIO_INIT_I2C); - -enum gpio_signal board_usbc_port_to_hpd_gpio(int port) -{ - /* USB-C0 always uses USB_C0_HPD (= DP3_HPD). */ - if (port == 0) - return GPIO_USB_C0_HPD; - - /* - * USB-C1 OPT3 DB - * version_2 uses EC_DP1_HPD - * version_3 uses DP1_HPD via RTD2141B MST hub to drive AP - * HPD, EC drives MST hub HPD input from USB-PD messages. - * - * This would have been ec_config_has_usbc1_retimer_ps8802 - * on version_2 hardware but the result is the same and - * this will be removed when version_2 hardware is retired. - */ - else if (ec_config_has_mst_hub_rtd2141b()) - return (board_ver >= 4) - ? GPIO_USB_C1_HPD_IN_DB_V1 - : (board_ver == 3) - ? IOEX_USB_C1_HPD_IN_DB - : GPIO_EC_DP1_HPD; - - /* USB-C1 OPT1 DB uses DP2_HPD. */ - return GPIO_DP2_HPD; -} - -static void board_remap_gpio(void) -{ - int ppc_id = 0; - - if (board_ver >= 3) { - int rv; - - gpio_ec_ps2_reset = GPIO_EC_PS2_RESET_V1; - ccprintf("GPIO_EC_PS2_RESET_V1\n"); - - /* - * TODO(dbrockus@): remove code when older version_2 - * hardware is retired and no longer needed - */ - rv = ioex_set_flags(IOEX_HDMI_POWER_EN_DB, GPIO_OUT_LOW); - rv |= ioex_set_flags(IOEX_USB_C1_PPC_ILIM_3A_EN, GPIO_OUT_LOW); - if (rv) - ccprintf("IOEX Board>=3 Remap FAILED\n"); - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) - gpio_enable_interrupt(GPIO_DP1_HPD_EC_IN); - } else { - gpio_ec_ps2_reset = GPIO_EC_PS2_RESET_V0; - ccprintf("GPIO_EC_PS2_RESET_V0\n"); - - /* - * TODO(dbrockus@): remove code when older version_2 - * hardware is retired and no longer needed - */ - if (ec_config_has_mst_hub_rtd2141b()) - ioex_enable_interrupt(IOEX_MST_HPD_OUT); - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) - ioex_enable_interrupt(IOEX_HDMI_CONN_HPD_3V3_DB); - } - - if (board_ver >= 4) - board_usbc1_retimer_inhpd = GPIO_USB_C1_HPD_IN_DB_V1; - else - board_usbc1_retimer_inhpd = IOEX_USB_C1_HPD_IN_DB; - - ioex_get_level(IOEX_PPC_ID, &ppc_id); - - support_aoz_ppc = (board_ver == 3) || ((board_ver >= 4) && !ppc_id); - if (support_aoz_ppc) { - ccprintf("DB USBC PPC aoz1380\n"); - ppc_chips[USBC_PORT_C1].drv = &aoz1380_drv; - } -} - -static void setup_fw_config(void) -{ - /* Enable Gyro interrupts */ - gpio_enable_interrupt(GPIO_6AXIS_INT_L); - - /* Enable PS2 power interrupts */ - gpio_enable_interrupt(GPIO_EN_PWR_TOUCHPAD_PS2); - - ps2_enable_channel(NPCX_PS2_CH0, 1, send_aux_data_to_host_interrupt); - - setup_mux(); - - board_remap_gpio(); - - setup_base_gyro_config(); -} -/* Use HOOK_PRIO_INIT_I2C + 2 to be after ioex_init(). */ -DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); - -/***************************************************************************** - * Fan - */ - -/* 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, -}; -const struct fan_rpm fan_rpm_0 = { - .rpm_min = 1800, - .rpm_start = 3000, - .rpm_max = 5200, -}; -const struct fan_t fans[] = { - [FAN_CH_0] = { - .conf = &fan_conf_0, - .rpm = &fan_rpm_0, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(fans) == FAN_CH_COUNT); - -int board_get_temp(int idx, int *temp_k) -{ - int mv; - int temp_c; - enum adc_channel channel; - - /* idx is the sensor index set in board temp_sensors[] */ - switch (idx) { - case TEMP_SENSOR_CHARGER: - channel = ADC_TEMP_SENSOR_CHARGER; - break; - - case TEMP_SENSOR_5V_REGULATOR: - /* thermistor is not powered in G3 */ - if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) - return EC_ERROR_NOT_POWERED; - - channel = ADC_TEMP_SENSOR_5V_REGULATOR; - break; - default: - return EC_ERROR_INVAL; - } - - mv = adc_read_channel(channel); - if (mv < 0) - return EC_ERROR_INVAL; - - temp_c = thermistor_linear_interpolate(mv, &thermistor_info); - *temp_k = C_TO_K(temp_c); - return EC_SUCCESS; -} - -const struct adc_t adc_channels[] = { - [ADC_TEMP_SENSOR_CHARGER] = { - .name = "CHARGER", - .input_ch = NPCX_ADC_CH2, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, - [ADC_TEMP_SENSOR_5V_REGULATOR] = { - .name = "5V_REGULATOR", - .input_ch = NPCX_ADC_CH3, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); - -const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_CHARGER] = { - .name = "Charger", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = board_get_temp, - .idx = TEMP_SENSOR_CHARGER, - }, - [TEMP_SENSOR_5V_REGULATOR] = { - .name = "5V_REGULATOR", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = board_get_temp, - .idx = TEMP_SENSOR_5V_REGULATOR, - }, - [TEMP_SENSOR_CPU] = { - .name = "CPU", - .type = TEMP_SENSOR_TYPE_CPU, - .read = sb_tsi_get_val, - .idx = 0, - }, - [TEMP_SENSOR_SSD] = { - .name = "SSD", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = tmp432_get_val, - .idx = TMP432_IDX_LOCAL, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -const static struct ec_thermal_config thermal_cpu = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(90), - [EC_TEMP_THRESH_HALT] = C_TO_K(105), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(80), - }, - .temp_fan_off = C_TO_K(98), - .temp_fan_max = C_TO_K(99), -}; - -struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; - -static void setup_fans(void) -{ - thermal_params[TEMP_SENSOR_CPU] = thermal_cpu; -} -DECLARE_HOOK(HOOK_INIT, setup_fans, HOOK_PRIO_DEFAULT); - -/* Battery functions */ -#define SB_OPTIONALMFG_FUNCTION2 0x26 -#define SMART_CHARGE_SUPPORT 0x01 -#define SMART_CHARGE_ENABLE 0x02 -#define SB_SMART_CHARGE_ENABLE 1 -#define SB_SMART_CHARGE_DISABLE 0 - -static void sb_smart_charge_mode(int enable) -{ - int val, rv; - - rv = sb_read(SB_OPTIONALMFG_FUNCTION2, &val); - if (rv) - return; - if (val & SMART_CHARGE_SUPPORT) { - if (enable) - val |= SMART_CHARGE_ENABLE; - else - val &= ~SMART_CHARGE_ENABLE; - sb_write(SB_OPTIONALMFG_FUNCTION2, val); - } -} - -__override void ppc_interrupt(enum gpio_signal signal) -{ - switch (signal) { - case GPIO_USB_C0_PPC_FAULT_ODL: - aoz1380_interrupt(USBC_PORT_C0); - break; - - case GPIO_USB_C1_PPC_INT_ODL: - if (support_aoz_ppc) - aoz1380_interrupt(USBC_PORT_C1); - else - nx20p348x_interrupt(USBC_PORT_C1); - break; - - default: - break; - } -} - -/* - * In the AOZ1380 PPC, there are no programmable features. We use - * the attached NCT3807 to control a GPIO to indicate 1A5 or 3A0 - * current limits. - */ -__override int board_aoz1380_set_vbus_source_current_limit(int port, - enum tcpc_rp_value rp) -{ - int rv; - - /* Use the TCPC to set the current limit */ - if (port == 0) { - rv = ioex_set_level(IOEX_USB_C0_PPC_ILIM_3A_EN, - (rp == TYPEC_RP_3A0) ? 1 : 0); - } else if (board_ver >= 3) { - rv = ioex_set_level(IOEX_USB_C1_PPC_ILIM_3A_EN, - (rp == TYPEC_RP_3A0) ? 1 : 0); - } else { - rv = 1; - } - - return rv; -} - -static void trackpoint_reset_deferred(void) -{ - gpio_set_level(gpio_ec_ps2_reset, 1); - msleep(2); - gpio_set_level(gpio_ec_ps2_reset, 0); - msleep(10); -} -DECLARE_DEFERRED(trackpoint_reset_deferred); - -void send_aux_data_to_device(uint8_t data) -{ - ps2_transmit_byte(NPCX_PS2_CH0, data); -} - -void ps2_pwr_en_interrupt(enum gpio_signal signal) -{ - hook_call_deferred(&trackpoint_reset_deferred_data, MSEC); -} - -static int check_hdmi_hpd_status(void) -{ - int hpd = 0; - - if (board_ver < 3) - ioex_get_level(IOEX_HDMI_CONN_HPD_3V3_DB, &hpd); - else - hpd = gpio_get_level(GPIO_DP1_HPD_EC_IN); - - return hpd; -} - -/***************************************************************************** - * Board suspend / resume - */ - -static void board_chipset_resume(void) -{ - /* Normal charge current */ - sb_smart_charge_mode(SB_SMART_CHARGE_DISABLE); - ioex_set_level(IOEX_HDMI_DATA_EN_DB, 1); - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) { - if (board_ver >= 3) { - ioex_set_level(IOEX_HDMI_POWER_EN_DB, 1); - msleep(PI3HDX1204_POWER_ON_DELAY_MS); - } - pi3hdx1204_enable(I2C_PORT_TCPC1, - PI3HDX1204_I2C_ADDR_FLAGS, - check_hdmi_hpd_status()); - } -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_chipset_resume, HOOK_PRIO_DEFAULT); - -static void board_chipset_suspend_delay(void) -{ - ignore_c1_dp = false; -} -DECLARE_DEFERRED(board_chipset_suspend_delay); - -static void board_chipset_suspend(void) -{ - /* SMART charge current */ - sb_smart_charge_mode(SB_SMART_CHARGE_ENABLE); - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) { - pi3hdx1204_enable(I2C_PORT_TCPC1, - PI3HDX1204_I2C_ADDR_FLAGS, - 0); - if (board_ver >= 3) - ioex_set_level(IOEX_HDMI_POWER_EN_DB, 0); - } - - /* Wait 500ms before allowing DP event to cause resume. */ - if (ec_config_has_mst_hub_rtd2141b() - && (dp_flags[USBC_PORT_C1] & DP_FLAGS_DP_ON)) { - ignore_c1_dp = true; - hook_call_deferred(&board_chipset_suspend_delay_data, - 500 * MSEC); - } - - ioex_set_level(IOEX_HDMI_DATA_EN_DB, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); - -/***************************************************************************** - * Power signals - */ - -const struct power_signal_info power_signal_list[] = { - [X86_SLP_S3_N] = { - .gpio = GPIO_PCH_SLP_S3_L, - .flags = POWER_SIGNAL_ACTIVE_HIGH, - .name = "SLP_S3_DEASSERTED", - }, - [X86_SLP_S5_N] = { - .gpio = GPIO_PCH_SLP_S5_L, - .flags = POWER_SIGNAL_ACTIVE_HIGH, - .name = "SLP_S5_DEASSERTED", - }, - [X86_S0_PGOOD] = { - .gpio = GPIO_S0_PGOOD, - .flags = POWER_SIGNAL_ACTIVE_HIGH, - .name = "S0_PGOOD", - }, - [X86_S5_PGOOD] = { - .gpio = GPIO_S5_PGOOD, - .flags = POWER_SIGNAL_ACTIVE_HIGH, - .name = "S5_PGOOD", - }, -}; -BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); - -#ifdef CONFIG_KEYBOARD_FACTORY_TEST -/* - * Map keyboard connector pins to EC GPIO pins for factory test. - * Pins mapped to {-1, -1} are skipped. - * The connector has 24 pins total, and there is no pin 0. - */ -const int keyboard_factory_scan_pins[][2] = { - {3, 0}, {2, 2}, {2, 3}, {1, 2}, {2, 5}, - {2, 4}, {2, 1}, {2, 7}, {2, 6}, {1, 5}, - {2, 0}, {3, 1}, {1, 7}, {1, 6}, {-1, -1}, - {1, 3}, {1, 4}, {-1, -1}, {-1, -1}, {0, 7}, - {0, 6}, {1, 0}, {1, 1}, {0, 5}, -}; - -const int keyboard_factory_scan_pins_used = - ARRAY_SIZE(keyboard_factory_scan_pins); -#endif - -/***************************************************************************** - * MST hub - * - * TODO(dbrockus@): remove VERSION_2 code when older version of hardware is - * retired and no longer needed - */ -static void mst_hpd_handler(void) -{ - int hpd = 0; - - /* - * Ensure level on GPIO_EC_DP1_HPD matches IOEX_MST_HPD_OUT, in case - * we got out of sync. - */ - ioex_get_level(IOEX_MST_HPD_OUT, &hpd); - gpio_set_level(GPIO_EC_DP1_HPD, hpd); - ccprints("MST HPD %d", hpd); -} -DECLARE_DEFERRED(mst_hpd_handler); - -void mst_hpd_interrupt(enum ioex_signal signal) -{ - /* - * Goal is to pass HPD through from DB OPT3 MST hub to AP's DP1. - * Immediately invert GPIO_EC_DP1_HPD, to pass through the edge on - * IOEX_MST_HPD_OUT. Then check level after 2 msec debounce. - */ - int hpd = !gpio_get_level(GPIO_EC_DP1_HPD); - - gpio_set_level(GPIO_EC_DP1_HPD, hpd); - hook_call_deferred(&mst_hpd_handler_data, (2 * MSEC)); -} - -static void hdmi_hpd_handler(void) -{ - /* Pass HPD through from DB OPT1 HDMI connector to AP's DP1. */ - int hpd = check_hdmi_hpd_status(); - - gpio_set_level(GPIO_EC_DP1_HPD, hpd); - ccprints("HDMI HPD %d", hpd); - pi3hdx1204_enable(I2C_PORT_TCPC1, - PI3HDX1204_I2C_ADDR_FLAGS, - chipset_in_or_transitioning_to_state(CHIPSET_STATE_ON) - && hpd); -} -DECLARE_DEFERRED(hdmi_hpd_handler); - -static void hdmi_hpd_interrupt_v2(enum ioex_signal signal) -{ - /* Debounce for 2 msec. */ - hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); -} - -static void hdmi_hpd_interrupt_v3(enum gpio_signal signal) -{ - /* Debounce for 2 msec. */ - hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); -} - -static void board_gmr_tablet_switch_isr(enum gpio_signal signal) -{ - /* Board version more than 3, DUT support GMR sensor */ - if (board_ver >= 3) - gmr_tablet_switch_isr(signal); -} - -int board_sensor_at_360(void) -{ - /* - * Board version >= 3 supports GMR sensor. For older boards return 0 - * indicating not in 360-degree mode and rely on lid angle for tablet - * mode. - */ - if (board_ver >= 3) - return !gpio_get_level(GMR_TABLET_MODE_GPIO_L); - - return 0; -} - -/* - * b/167949458: Suppress setting the host event for 500ms after entering S3. - * Otherwise turning off the MST hub in S3 (via IOEX_HDMI_DATA_EN_DB) causes - * a VDM:Attention that immediately wakes us back up from S3. - */ -__override void pd_notify_dp_alt_mode_entry(int port) -{ - if (port == USBC_PORT_C1 && ignore_c1_dp) - return; - cprints(CC_USBPD, "Notifying AP of DP Alt Mode Entry..."); - mkbp_send_event(EC_MKBP_EVENT_DP_ALT_MODE_ENTERED); -} diff --git a/board/morphius/board.h b/board/morphius/board.h deleted file mode 100644 index 603bcec69b..0000000000 --- a/board/morphius/board.h +++ /dev/null @@ -1,223 +0,0 @@ -/* Copyright 2019 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. - */ - -/* Morphius board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -#define VARIANT_ZORK_TREMBYLE - -#include <stdbool.h> -#include "baseboard.h" - -#define CONFIG_USBC_RETIMER_PI3DPX1207 -#define CONFIG_8042_AUX -#define CONFIG_PS2 -#define CONFIG_CMD_PS2 -#define CONFIG_KEYBOARD_FACTORY_TEST -#define CONFIG_DEVICE_EVENT -#define CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT - -#undef CONFIG_LED_ONOFF_STATES -#define CONFIG_BATTERY_LEVEL_NEAR_FULL 91 - -#undef ZORK_PS8818_RX_INPUT_TERM -#define ZORK_PS8818_RX_INPUT_TERM PS8818_RX_INPUT_TERM_85_OHM - -/* Motion sensing drivers */ -#define CONFIG_ACCELGYRO_ICM426XX -#define CONFIG_ACCELGYRO_ICM426XX_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -#define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) -#define CONFIG_ACCEL_INTERRUPTS -#define CONFIG_ACCEL_KX022 -#define CONFIG_CMD_ACCELS -#define CONFIG_CMD_ACCEL_INFO -#define CONFIG_CUSTOM_FAN_CONTROL -#define CONFIG_TABLET_MODE -#define CONFIG_TEMP_SENSOR -#define CONFIG_TEMP_SENSOR_TMP432 -#define CONFIG_TEMP_SENSOR_POWER_GPIO GPIO_EN_PWR_A -#define CONFIG_LID_ANGLE -#define CONFIG_LID_ANGLE_UPDATE -#define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL -#define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL -#define CONFIG_GMR_TABLET_MODE -#define CONFIG_GMR_TABLET_MODE_CUSTOM -#define GMR_TABLET_MODE_GPIO_L GPIO_TABLET_MODE -#define RPM_DEVIATION 1 - -/* GPIO mapping from board specific name to EC common name. */ -#define CONFIG_BATTERY_PRESENT_GPIO GPIO_EC_BATT_PRES_ODL -#define CONFIG_SCI_GPIO GPIO_EC_FCH_SCI_ODL -#define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_CPU_PROCHOT GPIO_PROCHOT_ODL -#define GPIO_EC_INT_L GPIO_EC_AP_INT_ODL -#define GPIO_ENABLE_BACKLIGHT_L GPIO_EC_EDP_BL_DISABLE -#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW -#define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV -#define GPIO_PCH_PWRBTN_L GPIO_EC_FCH_PWR_BTN_L -#define GPIO_PCH_RSMRST_L GPIO_EC_FCH_RSMRST_L -#define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L -#define GPIO_PCH_SLP_S5_L GPIO_SLP_S5_L -#define GPIO_PCH_SYS_PWROK GPIO_EC_FCH_PWROK -#define GPIO_PCH_WAKE_L GPIO_EC_FCH_WAKE_L -#define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_ODL -#define GPIO_S0_PGOOD GPIO_S0_PWROK_OD -#define GPIO_S5_PGOOD GPIO_EC_PWROK_OD -#define GPIO_SYS_RESET_L GPIO_EC_SYS_RST_L -#define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL -#define GPIO_VOLUME_UP_L GPIO_VOLUP_BTN_ODL -#define GPIO_WP_L GPIO_EC_WP_L -#define GPIO_PACKET_MODE_EN GPIO_EC_H1_PACKET_MODE - -/* I2C mapping from board specific function*/ -#define I2C_PORT_THERMAL I2C_PORT_AP_HDMI - -#ifndef __ASSEMBLER__ - - -void ps2_pwr_en_interrupt(enum gpio_signal signal); - -enum adc_channel { - ADC_TEMP_SENSOR_CHARGER, - ADC_TEMP_SENSOR_5V_REGULATOR, - ADC_CH_COUNT -}; - -enum battery_type { - BATTERY_SMP, - BATTERY_SUNWODA, - BATTERY_LGC, - BATTERY_TYPE_COUNT, -}; - -enum mft_channel { - MFT_CH_0 = 0, - /* Number of MFT channels */ - MFT_CH_COUNT, -}; - -enum pwm_channel { - PWM_CH_KBLIGHT = 0, - PWM_CH_FAN, - PWM_CH_POWER_LED, - PWM_CH_COUNT -}; - -enum temp_sensor_id { - TEMP_SENSOR_CHARGER = 0, - TEMP_SENSOR_5V_REGULATOR, - TEMP_SENSOR_CPU, - TEMP_SENSOR_SSD, - TEMP_SENSOR_COUNT -}; - -enum usba_port { - USBA_PORT_A0 = 0, - USBA_PORT_A1, - USBA_PORT_COUNT -}; - -/***************************************************************************** - * CBI EC FW Configuration - */ - -/** - * MORPHIUS_MB_USBAC - * USB-A0 Speed: 5 Gbps - * Retimer: none - * USB-C0 Speed: 5 Gbps - * Retimer: PI3DPX1207 - * TCPC: NCT3807 - * PPC: AOZ1380 - * IOEX: TCPC - */ -enum ec_cfg_usb_mb_type { - MORPHIUS_MB_USBAC = 0, -}; - -/** - * MORPHIUS_DB_T_OPT1_USBC_HDMI - * USB-A1 none - * USB-C1 Speed: 5 Gbps - * Retimer: PS8818 - * TCPC: NCT3807 - * PPC: NX20P3483 - * IOEX: TCPC - * HDMI Exists: yes - * Retimer: PI3HDX1204 - * MST Hub: none - * - * MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB - * USB-A1 none - * USB-C1 Speed: 5 Gbps - * Retimer: PS8802 - * TCPC: NCT3807 - * PPC: NX20P3483 - * IOEX: TCPC - * HDMI Exists: yes - * Retimer: none - * MST Hub: RTD2141B - */ -enum ec_cfg_usb_db_type { - MORPHIUS_DB_T_OPT1_USBC_HDMI = 0, - MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB = 1, -}; - -#include "cbi_ec_fw_config.h" - -#define HAS_USBC1_RETIMER_PS8802 \ - (BIT(MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB)) - -static inline bool ec_config_has_usbc1_retimer_ps8802(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1_RETIMER_PS8802); -} - -#define HAS_USBC1_RETIMER_PS8818 \ - (BIT(MORPHIUS_DB_T_OPT1_USBC_HDMI)) - -static inline bool ec_config_has_usbc1_retimer_ps8818(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1_RETIMER_PS8818); -} - -#define HAS_HDMI_RETIMER_PI3HDX1204 \ - (BIT(MORPHIUS_DB_T_OPT1_USBC_HDMI)) - -static inline bool ec_config_has_hdmi_retimer_pi3hdx1204(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_HDMI_RETIMER_PI3HDX1204); -} - -#define HAS_MST_HUB_RTD2141B \ - (BIT(MORPHIUS_DB_T_OPT3_USBC_HDMI_MSTHUB)) - -static inline bool ec_config_has_mst_hub_rtd2141b(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_MST_HUB_RTD2141B); -} - -void motion_interrupt(enum gpio_signal signal); -enum gpio_signal board_usbc_port_to_hpd_gpio(int port); -#define PORT_TO_HPD(port) board_usbc_port_to_hpd_gpio(port) - -extern const struct usb_mux usbc0_pi3dpx1207_usb_retimer; -extern const struct usb_mux usbc1_ps8802; -extern const struct usb_mux usbc1_ps8818; -extern struct usb_mux usbc1_amd_fp5_usb_mux; - -#endif /* !__ASSEMBLER__ */ - - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/morphius/build.mk b/board/morphius/build.mk deleted file mode 100644 index 4c2a6c5546..0000000000 --- a/board/morphius/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2019 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:=npcx7m7wc -BASEBOARD:=zork - -board-y=board.o led.o thermal.o -board-$(CONFIG_BATTERY_SMART)+=battery.o diff --git a/board/morphius/ec.tasklist b/board/morphius/ec.tasklist deleted file mode 100644 index 41b83cf4f3..0000000000 --- a/board/morphius/ec.tasklist +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 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(CHG_RAMP, chg_ramp_task, NULL, TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P0, usb_charger_task, 0, TASK_STACK_SIZE) \ - TASK_ALWAYS(USB_CHG_P1, usb_charger_task, 1, TASK_STACK_SIZE) \ - TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ - TASK_ALWAYS(MOTIONSENSE, motion_sense_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, LARGER_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, 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, TASK_STACK_SIZE) \ - TASK_ALWAYS(PD_INT_C1, pd_interrupt_handler_task, 1, TASK_STACK_SIZE) diff --git a/board/morphius/gpio.inc b/board/morphius/gpio.inc deleted file mode 100644 index f14c56c66f..0000000000 --- a/board/morphius/gpio.inc +++ /dev/null @@ -1,175 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2019 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* Declare symbolic names for all the GPIOs that we care about. - * Note: Those with interrupt handlers must be declared first. */ - -GPIO_INT(USB_C0_TCPC_INT_ODL, PIN(3, 4), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C1_TCPC_INT_ODL, PIN(F, 1), GPIO_INT_FALLING, tcpc_alert_event) -GPIO_INT(USB_C0_PPC_FAULT_ODL, PIN(6, 3), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_C1_PPC_INT_ODL, PIN(D, 4), GPIO_INT_FALLING, ppc_interrupt) -GPIO_INT(USB_C0_BC12_INT_ODL, PIN(9, 3), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) -GPIO_INT(USB_C1_BC12_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_PULL_UP, bc12_interrupt) -GPIO_INT(SLP_S3_L, PIN(7, 4), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(SLP_S5_L, PIN(E, 0), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(S0_PWROK_OD, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(EC_PWROK_OD, PIN(3, 7), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) -GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) -GPIO_INT(TABLET_MODE, PIN(4, 4), GPIO_INT_BOTH, board_gmr_tablet_switch_isr) -GPIO_INT(ACOK_OD, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) -GPIO_INT(EC_WP_L, PIN(5, 0), GPIO_INT_BOTH, switch_interrupt) -GPIO_INT(VOLDN_BTN_ODL, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(VOLUP_BTN_ODL, PIN(9, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) -GPIO_INT(6AXIS_INT_L, PIN(A, 0), GPIO_INT_FALLING | GPIO_PULL_UP, motion_interrupt) -GPIO_INT(EN_PWR_TOUCHPAD_PS2, PIN(C, 2), GPIO_INT_RISING, ps2_pwr_en_interrupt) -GPIO_INT(DP1_HPD_EC_IN, PIN(7, 5), GPIO_INT_BOTH, hdmi_hpd_interrupt_v3) - -/* GPIO_INT_BOTH is required for PSL wake from hibernate, but we don't need an interrupt handler. */ -GPIO(EC_RST_ODL, PIN(0, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH) - -GPIO(3AXIS_INT_L, PIN(9, 6), GPIO_INPUT | GPIO_PULL_DOWN) /* 3 Axis Accel */ -GPIO(CCD_MODE_ODL, PIN(C, 6), GPIO_ODR_HIGH) /* Case Closed Debug Mode */ -GPIO(PROCHOT_ODL, PIN(D, 5), GPIO_ODR_HIGH) /* PROCHOT to SOC */ -GPIO(EC_BATT_PRES_ODL, PIN(4, 1), GPIO_INPUT) /* Battery Present */ -GPIO(EC_AP_INT_ODL, PIN(A, 3), GPIO_ODR_HIGH) /* Sensor MKBP event to SOC */ -GPIO(EN_PWR_A, PIN(B, 7), GPIO_OUT_LOW) /* Enable Power */ -GPIO(EC_EDP_BL_DISABLE, PIN(A, 2), GPIO_OUT_HIGH) /* Enable Backlight */ -GPIO(EC_ENTERING_RW, PIN(E, 5), GPIO_OUT_LOW) /* EC Entering RW */ -GPIO(EC_FCH_PWR_BTN_L, PIN(6, 2), GPIO_OUT_HIGH) /* Power Button to SOC */ -GPIO(EC_FCH_RSMRST_L, PIN(A, 1), GPIO_OUT_LOW) /* RSMRST# to SOC */ -GPIO(EC_FCH_PWROK, PIN(D, 3), GPIO_OUT_LOW) /* Power OK to SOC */ -GPIO(EC_FCH_WAKE_L, PIN(0, 3), GPIO_OUT_HIGH) /* Wake SOC */ -GPIO(EC_FCH_SCI_ODL, PIN(7, 6), GPIO_ODR_HIGH) /* SCI to SOC */ -GPIO(EC_SYS_RST_L, PIN(C, 7), GPIO_ODR_HIGH) /* Cold Reset to SOC */ -GPIO(USB_C0_TCPC_RST_L, PIN(E, 1), GPIO_OUT_HIGH) /* C0 TCPC Reset */ -GPIO(USB_C1_TCPC_RST_L, PIN(F, 0), GPIO_OUT_HIGH) /* C1 TCPC Reset */ -GPIO(USB_C0_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ -GPIO(USB_C0_IN_HPD, PIN(7, 3), GPIO_OUT_LOW) /* C0 IN Hotplug Detect */ -GPIO(EC_DP1_HPD, PIN(F, 4), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ -GPIO(DP2_HPD, PIN(C, 1), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ -GPIO(EC_PS2_RESET_V0, PIN(3, 2), GPIO_OUT_LOW) /* Trackpoint reset pin V0*/ -GPIO(EC_PS2_RESET_V1, PIN(4, 5), GPIO_OUT_LOW) /* Trackpoint reset pin V1 */ -GPIO(EC_H1_PACKET_MODE, PIN(8, 6), GPIO_OUT_LOW) /* H1 Packet Mode */ -GPIO(FAN_ID, PIN(8, 2), GPIO_INPUT | GPIO_PULL_UP) /* Fan ID*/ -GPIO(USB_C1_HPD_IN_DB_V1, PIN(B, 1), GPIO_OUT_LOW) /* C1 HPD V1 */ - -UNIMPLEMENTED(NO_HPD) - -UNIMPLEMENTED(PCH_SMI_L) - -GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_LOW) -GPIO(LED_CHRG_L, PIN(C, 0), GPIO_OUT_LOW) - -IOEX_INT(USB_C0_SBU_FAULT_ODL, EXPIN(USBC_PORT_C0, 1, 2), GPIO_INT_FALLING, sbu_fault_interrupt) -IOEX_INT(USB_C1_SBU_FAULT_DB_ODL, EXPIN(USBC_PORT_C1, 1, 2), GPIO_INT_FALLING, sbu_fault_interrupt) - -IOEX(USB_A0_RETIMER_EN, EXPIN(USBC_PORT_C0, 0, 0), GPIO_OUT_LOW) /* A0 Retimer Enable */ -IOEX(USB_A0_RETIMER_RST, EXPIN(USBC_PORT_C0, 0, 1), GPIO_OUT_LOW) /* A0 Retimer Reset */ -IOEX(USB_C0_FAULT_ODL, EXPIN(USBC_PORT_C0, 0, 3), GPIO_ODR_HIGH) /* C0 Fault to SOC */ -IOEX(USB_C0_TCPC_FASTSW_CTL_EN, EXPIN(USBC_PORT_C0, 0, 4), GPIO_OUT_LOW) /* C0 FastSwitch Control */ -IOEX(USB_C1_FAULT_ODL, EXPIN(USBC_PORT_C0, 1, 0), GPIO_ODR_HIGH) /* C1 Fault to SOC */ -IOEX(USB_C0_PPC_ILIM_3A_EN, EXPIN(USBC_PORT_C0, 1, 1), GPIO_OUT_LOW) /* C0 3A Current Limit Enable */ -IOEX(KB_BL_EN, EXPIN(USBC_PORT_C0, 1, 3), GPIO_OUT_LOW) /* KB Backlight Enable */ -IOEX(USB_C0_DATA_EN, EXPIN(USBC_PORT_C0, 1, 4), GPIO_OUT_LOW) /* C0 Data Enable */ -IOEX(EN_USB_A0_5V, EXPIN(USBC_PORT_C0, 1, 5), GPIO_OUT_LOW) /* A0 5V Source Enable */ -IOEX(USB_A0_CHARGE_EN_L, EXPIN(USBC_PORT_C0, 1, 6), GPIO_OUT_HIGH) /* A0 5V High Current Enable */ - -IOEX(USB_A1_RETIMER_EN, EXPIN(USBC_PORT_C1, 0, 0), GPIO_OUT_LOW) /* A1 Retimer Enable */ -IOEX(PPC_ID, EXPIN(USBC_PORT_C1, 0, 1), GPIO_INPUT) /* PPC ID */ -IOEX(USB_C1_HPD_IN_DB, EXPIN(USBC_PORT_C1, 0, 2), GPIO_OUT_LOW) /* C1 HPD */ - -/* - * TODO(dbrockus@): remove code when older version_2 of hardware is - * retired and no longer needed - */ -#if 0 -IOEX(HDMI_POWER_EN_DB, EXPIN(USBC_PORT_C1, 0, 3), GPIO_OUT_LOW) /* HDMI retimer power enable */ -#else -#define IOEX_HDMI_POWER_EN_DB IOEX_MST_HPD_OUT -IOEX_INT(MST_HPD_OUT, EXPIN(USBC_PORT_C1, 0, 3), GPIO_INT_BOTH, mst_hpd_interrupt) -#endif - -IOEX(USB_C1_TCPC_FASTSW_CTL_EN, EXPIN(USBC_PORT_C1, 0, 4), GPIO_OUT_LOW) /* C1 FastSwitch Control */ - -/* - * TODO(dbrockus@): remove code when older version_2 of hardware is - * retired and no longer needed - */ -#if 0 -IOEX(USB_C1_PPC_ILIM_3A_EN, EXPIN(USBC_PORT_C1, 1, 0), GPIO_OUT_LOW) /* C1 3A Current Limit Enable */ -#else -#define IOEX_USB_C1_PPC_ILIM_3A_EN IOEX_HDMI_CONN_HPD_3V3_DB -IOEX_INT(HDMI_CONN_HPD_3V3_DB, EXPIN(USBC_PORT_C1, 1, 0), GPIO_INT_BOTH, hdmi_hpd_interrupt_v2) -#endif - -IOEX(USB_C1_MUX_RST_DB, EXPIN(USBC_PORT_C1, 1, 1), GPIO_OUT_LOW) /* C1 Mux Reset */ -IOEX(USB_C1_PPC_EN_L, EXPIN(USBC_PORT_C1, 1, 3), GPIO_OUT_LOW) /* C1 PPC Enable */ -IOEX(HDMI_DATA_EN_DB, EXPIN(USBC_PORT_C1, 1, 4), GPIO_OUT_LOW) /* HDMI Retimer Enable */ -IOEX(USB_C1_DATA_EN, EXPIN(USBC_PORT_C1, 1, 5), GPIO_OUT_HIGH) /* C1 Retimer Enable */ -IOEX(EN_USB_A1_5V_DB, EXPIN(USBC_PORT_C1, 1, 6), GPIO_OUT_LOW) /* A1 5V Source Enable */ -IOEX(USB_A1_CHARGE_EN_DB_L, EXPIN(USBC_PORT_C1, 1, 7), GPIO_OUT_HIGH) /* A1 5V High Current Enable */ - -/* - * The NPCX LPC driver configures and controls SCI, so PCH_SCI_ODL [PIN(7, 6)] - * is not defined here as GPIO. - */ - -/* I2C pins - these will be reconfigured for alternate function below */ -GPIO(EC_I2C_USB_A0_C0_SCL, PIN(B, 5), GPIO_INPUT) -GPIO(EC_I2C_USB_A0_C0_SDA, PIN(B, 4), GPIO_INPUT) -GPIO(EC_I2C_USB_A1_C1_SCL, PIN(9, 0), GPIO_INPUT) -GPIO(EC_I2C_USB_A1_C1_SDA, PIN(8, 7), GPIO_INPUT) -GPIO(EC_I2C_BATT_SCL, PIN(9, 2), GPIO_INPUT) -GPIO(EC_I2C_BATT_SDA, PIN(9, 1), GPIO_INPUT) -GPIO(EC_I2C_USBC_AP_MUX_SCL, PIN(D, 1), GPIO_INPUT) -GPIO(EC_I2C_USBC_AP_MUX_SDA, PIN(D, 0), GPIO_INPUT) -GPIO(FCH_SIC_POWER_SCL, PIN(F, 3), GPIO_INPUT) -GPIO(FCH_SID_POWER_SDA, PIN(F, 2), GPIO_INPUT) -GPIO(EC_I2C_SENSOR_CBI_SCL, PIN(3, 3), GPIO_INPUT) -GPIO(EC_I2C_SENSOR_CBI_SDA, PIN(3, 6), GPIO_INPUT) -GPIO(FCH_I2C_AUDIO_SCL, PIN(E, 4), GPIO_INPUT | GPIO_SEL_1P8V) -GPIO(FCH_I2C_AUDIO_SDA, PIN(E, 3), GPIO_INPUT | GPIO_SEL_1P8V) -GPIO(FCH_I2C_HDMI_HUB_3V3_SCL, PIN(B, 3), GPIO_INPUT) -GPIO(FCH_I2C_HDMI_HUB_3V3_SDA, PIN(B, 2), GPIO_INPUT) - -ALTERNATE(PIN_MASK(6, BIT(4) | BIT(5)), 0, MODULE_UART, 0) /* Cr50 requires no pullups. */ - -ALTERNATE(PIN_MASK(B, BIT(4) | BIT(5)), 0, MODULE_I2C, 0) /* I2C0 */ -ALTERNATE(PIN_MASK(9, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_I2C, 0) /* I2C1 SCL / I2C2 */ -ALTERNATE(PIN_MASK(8, BIT(7)), 0, MODULE_I2C, 0) /* I2C1 SDA */ -ALTERNATE(PIN_MASK(D, BIT(0) | BIT(1)), 0, MODULE_I2C, 0) /* I2C3 */ -ALTERNATE(PIN_MASK(F, BIT(2) | BIT(3)), 0, MODULE_I2C, 0) /* I2C4 */ -ALTERNATE(PIN_MASK(3, BIT(3) | BIT(6)), 0, MODULE_I2C, 0) /* I2C5 */ -ALTERNATE(PIN_MASK(E, BIT(3) | BIT(4)), 0, MODULE_I2C, 0) /* I2C6 */ -ALTERNATE(PIN_MASK(B, BIT(2) | BIT(3)), 0, MODULE_I2C, 0) /* I2C7 */ - -ALTERNATE(PIN_MASK(4, BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC2, ADC3 Temp Sensors */ - -ALTERNATE(PIN_MASK(C, BIT(3)), 0, MODULE_PWM, 0) /* PWM0 LED */ -ALTERNATE(PIN_MASK(C, BIT(4)), 0, MODULE_PWM, 0) /* PWM2 - EC_FAN_PWM */ -ALTERNATE(PIN_MASK(8, BIT(0)), 0, MODULE_PWM, 0) /* PWM3 KB Backlight */ -ALTERNATE(PIN_MASK(4, BIT(0)), 0, MODULE_PWM, 0) /* TA1 - EC_FAN_SPEED */ - -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 */ -GPIO(EC_KSO_02_INV, PIN(1, 7), GPIO_OUT_LOW) /* KSO_02 inverted */ -ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_03-09 */ -ALTERNATE(PIN_MASK(0, 0xE0), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH) /* KSO_10-12 */ - -/* Power Switch Logic (PSL) inputs */ -ALTERNATE(PIN_MASK(0, BIT(0) | BIT(1) | BIT(2)), 0, MODULE_PMU, 0) /* AC_PRESENT, POWER_BUTTON_L, EC_RST_ODL */ -ALTERNATE(PIN_MASK(D, BIT(2)), 0, MODULE_PMU, 0) /* LID_OPEN */ - -ALTERNATE(PIN_MASK(A, 0xA0), 1, MODULE_WOV, 0) /* I2S_SYNC/I2S_SCLK GPIOA5/A7 */ -ALTERNATE(PIN_MASK(B, 0x01), 1, MODULE_WOV, 0) /* I2S_SDAT GPIOB0 */ -ALTERNATE(PIN_MASK(9, 0x90), 1, MODULE_WOV, 0) /* DMIC_CLK/DMIC_IN GPIO94/97 */ - -/* PS/2 channel 0 for aux device */ -ALTERNATE(PIN_MASK(6, 0x80), 1, MODULE_PS2, 0) /* PS2_CLK0 GPIO67 */ -ALTERNATE(PIN_MASK(7, 0x01), 1, MODULE_PS2, 0) /* PS2_DAT0 GPIO70 */ diff --git a/board/morphius/led.c b/board/morphius/led.c deleted file mode 100644 index fc57b46d6b..0000000000 --- a/board/morphius/led.c +++ /dev/null @@ -1,248 +0,0 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "battery.h" -#include "charge_manager.h" -#include "charge_state.h" -#include "chipset.h" -#include "cros_board_info.h" -#include "ec_commands.h" -#include "extpower.h" -#include "gpio.h" -#include "hooks.h" -#include "led_common.h" -#include "pwm.h" -#include "timer.h" -#include "util.h" - -#define LED_BAT_OFF_LVL 0 -#define LED_BAT_ON_LVL 1 -#define LED_BAT_S3_OFF_TIME_MS 3000 -#define LED_BAT_S3_PWM_RESCALE 5 -#define LED_BAT_S3_TICK_MS 50 - -#define LED_TOTAL_TICKS 2 -#define LED_ON_TICKS 1 - -#define LED_PWR_TICKS_PER_CYCLE 7 - -#define TICKS_STEP1_BRIGHTER 0 -#define TICKS_STEP2_DIMMER 20 -#define TICKS_STEP3_OFF 40 - -static int ticks; - -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_WHITE, - LED_AMBER, - LED_COLOR_COUNT /* Number of colors, not a color itself */ -}; - -/* PWM brightness vs. color, in the order of off, white */ -static const uint8_t color_brightness[2] = { - [LED_OFF] = 0, - [LED_WHITE] = 100, -}; - -void led_set_color_power(enum ec_led_colors color) -{ - pwm_set_duty(PWM_CH_POWER_LED, color_brightness[color]); -} - -void led_set_color_battery(enum ec_led_colors color) -{ - uint32_t board_ver = 0; - int led_batt_on_lvl, led_batt_off_lvl; - - cbi_get_board_version(&board_ver); - if (board_ver >= 3) { - led_batt_on_lvl = LED_BAT_ON_LVL; - led_batt_off_lvl = LED_BAT_OFF_LVL; - } else { - led_batt_on_lvl = !LED_BAT_ON_LVL; - led_batt_off_lvl = !LED_BAT_OFF_LVL; - } - - switch (color) { - case LED_AMBER: - gpio_set_level(GPIO_LED_FULL_L, led_batt_off_lvl); - gpio_set_level(GPIO_LED_CHRG_L, led_batt_on_lvl); - break; - case LED_WHITE: - gpio_set_level(GPIO_LED_FULL_L, led_batt_on_lvl); - gpio_set_level(GPIO_LED_CHRG_L, led_batt_off_lvl); - break; - default: /* LED_OFF and other unsupported colors */ - gpio_set_level(GPIO_LED_FULL_L, led_batt_off_lvl); - gpio_set_level(GPIO_LED_CHRG_L, led_batt_off_lvl); - 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_AMBER] = 1; - brightness_range[EC_LED_COLOR_WHITE] = 1; - } else if (led_id == EC_LED_ID_POWER_LED) { - brightness_range[EC_LED_COLOR_WHITE] = 100; - } -} - -int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) -{ - if (led_id == EC_LED_ID_BATTERY_LED) { - if (brightness[EC_LED_COLOR_AMBER] != 0) - led_set_color_battery(LED_AMBER); - else if (brightness[EC_LED_COLOR_WHITE] != 0) - led_set_color_battery(LED_WHITE); - else - led_set_color_battery(LED_OFF); - } else if (led_id == EC_LED_ID_POWER_LED) { - if (brightness[EC_LED_COLOR_WHITE] != 0) - pwm_set_duty(PWM_CH_POWER_LED, - color_brightness[LED_WHITE]); - else - pwm_set_duty(PWM_CH_POWER_LED, - color_brightness[LED_OFF]); - } - - return EC_SUCCESS; -} - -static void suspend_led_update_deferred(void); -DECLARE_DEFERRED(suspend_led_update_deferred); - -static void suspend_led_update_deferred(void) -{ - int delay = LED_BAT_S3_TICK_MS * MSEC; - - ticks++; - - /* 1s gradual on, 1s gradual off, 3s off */ - if (ticks <= TICKS_STEP2_DIMMER) { - pwm_set_duty(PWM_CH_POWER_LED, ticks * LED_BAT_S3_PWM_RESCALE); - } else if (ticks <= TICKS_STEP3_OFF) { - pwm_set_duty(PWM_CH_POWER_LED, - (TICKS_STEP3_OFF - ticks) * LED_BAT_S3_PWM_RESCALE); - } else { - ticks = TICKS_STEP1_BRIGHTER; - delay = LED_BAT_S3_OFF_TIME_MS * MSEC; - } - - hook_call_deferred(&suspend_led_update_deferred_data, delay); -} - -static void suspend_led_init(void) -{ - ticks = TICKS_STEP2_DIMMER; - - hook_call_deferred(&suspend_led_update_deferred_data, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, suspend_led_init, HOOK_PRIO_DEFAULT); - -static void suspend_led_deinit(void) -{ - hook_call_deferred(&suspend_led_update_deferred_data, -1); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, suspend_led_deinit, HOOK_PRIO_DEFAULT); -DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, suspend_led_deinit, HOOK_PRIO_DEFAULT); - -static void led_set_battery(void) -{ - static int battery_ticks; - uint32_t chflags = charge_get_flags(); - - battery_ticks++; - - switch (charge_get_state()) { - case PWR_STATE_CHARGE: - /* Always indicate when charging, even in suspend. */ - led_set_color_battery(LED_AMBER); - break; - case PWR_STATE_DISCHARGE: - led_set_color_battery(LED_OFF); - break; - case PWR_STATE_CHARGE_NEAR_FULL: - led_set_color_battery(LED_WHITE); - break; - case PWR_STATE_IDLE: /* External power connected in IDLE */ - if (chflags & CHARGE_FLAG_FORCE_IDLE) - led_set_color_battery( - (battery_ticks & 0x4) ? LED_AMBER : LED_OFF); - else - led_set_color_battery(LED_WHITE); - break; - default: - /* Other states don't alter LED behavior */ - break; - } -} - -static void led_set_power(void) -{ - static int power_ticks; - static int previous_state_suspend; - static int blink_ticks; - - power_ticks++; - - /* Blink 3 times (0.25s on/0.25s off, repeat 3 times) */ - if (extpower_is_present()) { - blink_ticks++; - if (!previous_state_suspend) - power_ticks = 0; - - while (blink_ticks < LED_PWR_TICKS_PER_CYCLE) { - led_set_color_power( - (power_ticks % LED_TOTAL_TICKS) < LED_ON_TICKS ? - LED_WHITE : LED_OFF); - - previous_state_suspend = 1; - return; - } - } - if (!extpower_is_present()) - blink_ticks = 0; - - previous_state_suspend = 0; - - if (chipset_in_state(CHIPSET_STATE_SOFT_OFF)) - led_set_color_power(LED_OFF); - if (chipset_in_state(CHIPSET_STATE_ON)) - led_set_color_power(LED_WHITE); -} - -static void pwr_led_init(void) -{ - /* Configure GPIOs */ - gpio_config_module(MODULE_PWM, 1); - - /* - * Enable PWMs and set to 0% duty cycle. If they're disabled, - * seems to ground the pins instead of letting them float. - */ - pwm_enable(PWM_CH_POWER_LED, 1); - led_set_color_power(LED_OFF); -} -DECLARE_HOOK(HOOK_INIT, pwr_led_init, HOOK_PRIO_DEFAULT); - -/* Called by hook task every 200 ms */ -static void led_tick(void) -{ - if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - led_set_power(); - if (led_auto_control_is_enabled(EC_LED_ID_BATTERY_LED)) - led_set_battery(); -} -DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT); diff --git a/board/morphius/thermal.c b/board/morphius/thermal.c deleted file mode 100644 index 449fd92d5d..0000000000 --- a/board/morphius/thermal.c +++ /dev/null @@ -1,522 +0,0 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "chipset.h" -#include "common.h" -#include "console.h" -#include "extpower.h" -#include "fan.h" -#include "hooks.h" -#include "host_command.h" -#include "lid_switch.h" -#include "motion_lid.h" -#include "tablet_mode.h" -#include "temp_sensor.h" -#include "thermal.h" -#include "util.h" - -/* Console output macros */ -#define CPUTS(outstr) cputs(CC_THERMAL, outstr) -#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) - -struct fan_step { - /* - * Sensor 1~4 trigger point, set -1 if we're not using this - * sensor to determine fan speed. - */ - int8_t on[TEMP_SENSOR_COUNT]; - - /* - * Sensor 1~4 trigger point, set -1 if we're not using this - * sensor to determine fan speed. - */ - int8_t off[TEMP_SENSOR_COUNT]; - - /* Fan 1~2 rpm */ - uint16_t rpm[FAN_CH_COUNT]; -}; - -static const struct fan_step *fan_step_table; - -static const struct fan_step fan1_table_clamshell[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 40, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {1900}, - }, - { - /* level 2 */ - .on = {-1, -1, 45, -1}, - .off = {-1, -1, 43, -1}, - .rpm = {2900}, - }, - { - /* level 3 */ - .on = {-1, -1, 48, -1}, - .off = {-1, -1, 46, -1}, - .rpm = {3200}, - }, - { - /* level 4 */ - .on = {-1, -1, 51, -1}, - .off = {-1, -1, 49, -1}, - .rpm = {3550}, - }, - { - /* level 5 */ - .on = {-1, -1, 54, -1}, - .off = {-1, -1, 52, -1}, - .rpm = {3950}, - }, - { - /* level 6 */ - .on = {-1, -1, 57, -1}, - .off = {-1, -1, 55, -1}, - .rpm = {4250}, - }, - { - /* level 7 */ - .on = {-1, -1, 60, -1}, - .off = {-1, -1, 58, -1}, - .rpm = {4650}, - }, -}; - -static const struct fan_step fan1_table_tablet[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 41, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {2100}, - }, - { - /* level 2 */ - .on = {-1, -1, 50, -1}, - .off = {-1, -1, 48, -1}, - .rpm = {2600}, - }, - { - /* level 3 */ - .on = {-1, -1, 54, -1}, - .off = {-1, -1, 52, -1}, - .rpm = {2800}, - }, - { - /* level 4 */ - .on = {-1, -1, 57, -1}, - .off = {-1, -1, 55, -1}, - .rpm = {3300}, - }, - { - /* level 5 */ - .on = {-1, -1, 60, -1}, - .off = {-1, -1, 58, -1}, - .rpm = {3800}, - }, - { - /* level 6 */ - .on = {-1, -1, 72, -1}, - .off = {-1, -1, 69, -1}, - .rpm = {4000}, - }, - { - /* level 7 */ - .on = {-1, -1, 74, -1}, - .off = {-1, -1, 73, -1}, - .rpm = {4300}, - }, -}; - -static const struct fan_step fan1_table_stand[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 34, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {1850}, - }, - { - /* level 2 */ - .on = {-1, -1, 42, -1}, - .off = {-1, -1, 39, -1}, - .rpm = {2550}, - }, - { - /* level 3 */ - .on = {-1, -1, 49, -1}, - .off = {-1, -1, 48, -1}, - .rpm = {2900}, - }, - { - /* level 4 */ - .on = {-1, -1, 51, -1}, - .off = {-1, -1, 50, -1}, - .rpm = {3350}, - }, - { - /* level 5 */ - .on = {-1, -1, 53, -1}, - .off = {-1, -1, 52, -1}, - .rpm = {3700}, - }, - { - /* level 6 */ - .on = {-1, -1, 55, -1}, - .off = {-1, -1, 54, -1}, - .rpm = {3900}, - }, - { - /* level 7 */ - .on = {-1, -1, 57, -1}, - .off = {-1, -1, 56, -1}, - .rpm = {4250}, - }, -}; - -static const struct fan_step fan0_table_clamshell[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 41, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {2350}, - }, - { - /* level 2 */ - .on = {-1, -1, 44, -1}, - .off = {-1, -1, 42, -1}, - .rpm = {3300}, - }, - { - /* level 3 */ - .on = {-1, -1, 47, -1}, - .off = {-1, -1, 45, -1}, - .rpm = {3600}, - }, - { - /* level 4 */ - .on = {-1, -1, 50, -1}, - .off = {-1, -1, 48, -1}, - .rpm = {4050}, - }, - { - /* level 5 */ - .on = {-1, -1, 53, -1}, - .off = {-1, -1, 51, -1}, - .rpm = {4450}, - }, - { - /* level 6 */ - .on = {-1, -1, 56, -1}, - .off = {-1, -1, 54, -1}, - .rpm = {4750}, - }, - { - /* level 7 */ - .on = {-1, -1, 59, -1}, - .off = {-1, -1, 57, -1}, - .rpm = {5150}, - }, -}; - -static const struct fan_step fan0_table_tablet[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 41, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {2250}, - }, - { - /* level 2 */ - .on = {-1, -1, 50, -1}, - .off = {-1, -1, 48, -1}, - .rpm = {2850}, - }, - { - /* level 3 */ - .on = {-1, -1, 54, -1}, - .off = {-1, -1, 51, -1}, - .rpm = {3100}, - }, - { - /* level 4 */ - .on = {-1, -1, 57, -1}, - .off = {-1, -1, 55, -1}, - .rpm = {3500}, - }, - { - /* level 5 */ - .on = {-1, -1, 60, -1}, - .off = {-1, -1, 58, -1}, - .rpm = {3900}, - }, - { - /* level 6 */ - .on = {-1, -1, 72, -1}, - .off = {-1, -1, 69, -1}, - .rpm = {4150}, - }, - { - /* level 7 */ - .on = {-1, -1, 74, -1}, - .off = {-1, -1, 73, -1}, - .rpm = {4400}, - }, -}; - -static const struct fan_step fan0_table_stand[] = { - { - /* level 0 */ - .on = {-1, -1, -1, -1}, - .off = {-1, -1, -1, -1}, - .rpm = {0}, - }, - { - /* level 1 */ - .on = {-1, -1, 34, -1}, - .off = {-1, -1, 31, -1}, - .rpm = {2250}, - }, - { - /* level 2 */ - .on = {-1, -1, 42, -1}, - .off = {-1, -1, 39, -1}, - .rpm = {2800}, - }, - { - /* level 3 */ - .on = {-1, -1, 49, -1}, - .off = {-1, -1, 48, -1}, - .rpm = {3150}, - }, - { - /* level 4 */ - .on = {-1, -1, 51, -1}, - .off = {-1, -1, 50, -1}, - .rpm = {3550}, - }, - { - /* level 5 */ - .on = {-1, -1, 53, -1}, - .off = {-1, -1, 52, -1}, - .rpm = {3900}, - }, - { - /* level 6 */ - .on = {-1, -1, 55, -1}, - .off = {-1, -1, 54, -1}, - .rpm = {4150}, - }, - { - /* level 7 */ - .on = {-1, -1, 57, -1}, - .off = {-1, -1, 56, -1}, - .rpm = {4400}, - }, -}; - -#define NUM_FAN_LEVELS ARRAY_SIZE(fan1_table_clamshell) - -#define lid_angle_tablet 340 -static int throttle_on; - -BUILD_ASSERT(ARRAY_SIZE(fan1_table_clamshell) == - ARRAY_SIZE(fan1_table_tablet)); - -#define average_time 60 -int fan_table_to_rpm(int fan, int *temp) -{ - static int current_level; - static int avg_tmp[TEMP_SENSOR_COUNT]; - static int avg_calc_tmp[TEMP_SENSOR_COUNT][average_time]; - static int prev_tmp[TEMP_SENSOR_COUNT]; - static int new_rpm; - int i, j, avg_sum = 0; - int lid_angle = motion_lid_get_angle(); - static int fan_up_count, fan_down_count; - static int temp_count; - - /* - * Select different fan curve table - * by mode: clamshell, tent/stand, tablet and fan id - */ - if (tablet_get_mode()) { - if (gpio_get_level(GPIO_FAN_ID)) - fan_step_table = fan1_table_stand; - else - fan_step_table = fan0_table_stand; - - if (lid_angle >= lid_angle_tablet) { - if (gpio_get_level(GPIO_FAN_ID)) - fan_step_table = fan1_table_tablet; - else - fan_step_table = fan0_table_tablet; - } - } else { - if (gpio_get_level(GPIO_FAN_ID)) - fan_step_table = fan1_table_clamshell; - else - fan_step_table = fan0_table_clamshell; - } - - /* - * Average temp 60 sec timing average - */ - if (temp_count < average_time) { - avg_calc_tmp[TEMP_SENSOR_CPU][temp_count] = - temp[TEMP_SENSOR_CPU]; - temp_count++; - } else - temp_count = 0; - - for (j = 0; j < average_time; j++) - avg_sum = avg_sum + avg_calc_tmp[TEMP_SENSOR_CPU][j]; - - avg_tmp[TEMP_SENSOR_CPU] = avg_sum/average_time; - - /* - * Compare the current and previous temperature, we have - * the three paths : - * 1. decreasing path. (check the release point) - * 2. increasing path. (check the trigger point) - * 3. invariant path. (return the current RPM) - */ - if (avg_tmp[TEMP_SENSOR_CPU] < prev_tmp[TEMP_SENSOR_CPU]) { - for (i = current_level; i >= 0; i--) { - if (avg_tmp[TEMP_SENSOR_CPU] < - fan_step_table[i].off[TEMP_SENSOR_CPU]) { - /* - * fan step down debounce - */ - if (fan_down_count < 10) { - fan_down_count++; - fan_up_count = 0; - - return new_rpm; - } - fan_down_count = 0; - fan_up_count = 0; - - current_level = i - 1; - } else - break; - } - } else if (avg_tmp[TEMP_SENSOR_CPU] > prev_tmp[TEMP_SENSOR_CPU]) { - for (i = current_level+1; i < NUM_FAN_LEVELS; i++) { - if ((avg_tmp[TEMP_SENSOR_CPU] > - fan_step_table[i].on[TEMP_SENSOR_CPU])) { - /* - * fan step up debounce - */ - if (fan_up_count < 10) { - fan_up_count++; - fan_down_count = 0; - - return new_rpm; - } - fan_down_count = 0; - fan_up_count = 0; - - current_level = i; - } else - break; - } - } else { - fan_down_count = 0; - fan_up_count = 0; - } - - if (current_level < 1) - current_level = 1; - - if (current_level >= 7) - current_level = 7; - - for (i = 0; i < TEMP_SENSOR_COUNT; ++i) - prev_tmp[i] = avg_tmp[i]; - - ASSERT(current_level < NUM_FAN_LEVELS); - - switch (fan) { - case FAN_CH_0: - new_rpm = fan_step_table[current_level].rpm[FAN_CH_0]; - break; - default: - break; - } - - return new_rpm; -} - -void board_override_fan_control(int fan, int *tmp) -{ - if (chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND)) { - int new_rpm = fan_table_to_rpm(fan, tmp); - - if (new_rpm != fan_get_rpm_target(FAN_CH(fan))) { - cprints(CC_THERMAL, "Setting fan RPM to %d", new_rpm); - board_print_temps(); - fan_set_rpm_mode(FAN_CH(fan), 1); - fan_set_rpm_target(FAN_CH(fan), new_rpm); - } - } -} - -void thermal_protect(void) -{ - if ((!lid_is_open()) && (!extpower_is_present())) { - int rv1, rv2; - int thermal_sensor1, thermal_sensor2; - - rv1 = temp_sensor_read(TEMP_SENSOR_5V_REGULATOR, - &thermal_sensor1); - rv2 = temp_sensor_read(TEMP_SENSOR_CPU, - &thermal_sensor2); - - if (rv2 == EC_SUCCESS) { - if (thermal_sensor2 > C_TO_K(70)) { - chipset_throttle_cpu(1); - throttle_on = 1; - } else if (thermal_sensor2 < C_TO_K(60) && - throttle_on) { - chipset_throttle_cpu(0); - throttle_on = 0; - } - } - if (rv1 == EC_SUCCESS && - thermal_sensor1 > C_TO_K(51)) - chipset_force_shutdown(CHIPSET_SHUTDOWN_THERMAL); - } -} -DECLARE_HOOK(HOOK_SECOND, thermal_protect, HOOK_PRIO_DEFAULT); diff --git a/board/morphius/vif_override.xml b/board/morphius/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/morphius/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. ---> |