diff options
Diffstat (limited to 'board/berknip')
| -rw-r--r-- | board/berknip/analyzestack.yaml | 2 | ||||
| -rw-r--r-- | board/berknip/battery.c | 94 | ||||
| -rw-r--r-- | board/berknip/board.c | 671 | ||||
| -rw-r--r-- | board/berknip/board.h | 204 | ||||
| -rw-r--r-- | board/berknip/build.mk | 15 | ||||
| -rw-r--r-- | board/berknip/ec.tasklist | 25 | ||||
| -rw-r--r-- | board/berknip/gpio.inc | 156 | ||||
| -rw-r--r-- | board/berknip/led.c | 205 | ||||
| -rw-r--r-- | board/berknip/vif_override.xml | 3 |
9 files changed, 0 insertions, 1375 deletions
diff --git a/board/berknip/analyzestack.yaml b/board/berknip/analyzestack.yaml deleted file mode 100644 index 7ff5f39644..0000000000 --- a/board/berknip/analyzestack.yaml +++ /dev/null @@ -1,2 +0,0 @@ -remove: -- panic_assert_fail diff --git a/board/berknip/battery.c b/board/berknip/battery.c deleted file mode 100644 index 526375c0db..0000000000 --- a/board/berknip/battery.c +++ /dev/null @@ -1,94 +0,0 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - * - * Battery pack vendor provided charging profile - */ - -#include "battery_fuel_gauge.h" -#include "common.h" -#include "util.h" - -/* - * Battery info for all Berknip 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 996QA193H Battery Information */ - [BATTERY_SIMPLO_HIGHPOWER] = { - .fuel_gauge = { - .manuf_name = "333-1D-11-A", - .ship_mode = { - .reg_addr = 0x0, - .reg_data = { 0x0010, 0x0010 }, - }, - .fet = { - .mfgacc_support = 1, - .reg_addr = 0x0, - .reg_mask = 0x0006, - .disconnect_val = 0x0, - }, - }, - .batt_info = { - .voltage_max = 13200, /* mV */ - .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 256, /* mA */ - .start_charging_min_c = 0, - .start_charging_max_c = 45, - .charging_min_c = 0, - .charging_max_c = 45, - .discharging_min_c = -20, - .discharging_max_c = 60, - }, - }, -/* Cosmx CA407792G Battery Information */ - [BATTERY_COSMX] = { - .fuel_gauge = { - .manuf_name = "333-AC-11-A", - .ship_mode = { - .reg_addr = 0x0, - .reg_data = { 0x0010, 0x0010 }, - }, - .fet = { - .mfgacc_support = 1, - .reg_addr = 0x0, - .reg_mask = 0x0006, - .disconnect_val = 0x0, - }, - }, - .batt_info = { - .voltage_max = 13200, /* mV */ - .voltage_normal = 11550, /* mV */ - .voltage_min = 9000, /* mV */ - .precharge_current = 256, /* mA */ - .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, - }, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(board_battery_info) == BATTERY_TYPE_COUNT); - -const enum battery_type DEFAULT_BATTERY_TYPE = BATTERY_SIMPLO_HIGHPOWER; diff --git a/board/berknip/board.c b/board/berknip/board.c deleted file mode 100644 index a119007de6..0000000000 --- a/board/berknip/board.c +++ /dev/null @@ -1,671 +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. - */ - -/* Berknip board configuration */ - -#include "adc.h" -#include "button.h" -#include "charger.h" -#include "cbi_ec_fw_config.h" -#include "cros_board_info.h" -#include "driver/accelgyro_bmi_common.h" -#include "driver/accel_kionix.h" -#include "driver/accel_kx022.h" -#include "driver/retimer/pi3hdx1204.h" -#include "driver/retimer/tusb544.h" -#include "driver/temp_sensor/sb_tsi.h" -#include "driver/usb_mux/amd_fp5.h" -#include "driver/usb_mux/ps8743.h" -#include "extpower.h" -#include "fan.h" -#include "fan_chip.h" -#include "gpio.h" -#include "hooks.h" -#include "lid_switch.h" -#include "power.h" -#include "power_button.h" -#include "pwm.h" -#include "pwm_chip.h" -#include "switch.h" -#include "system.h" -#include "task.h" -#include "temp_sensor.h" -#include "temp_sensor/thermistor.h" -#include "usb_charge.h" -#include "usb_mux.h" - -static void hdmi_hpd_interrupt(enum gpio_signal signal); - -#include "gpio_list.h" - -#define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args) - -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, - }, -}; -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_115_ALL_CHANNELS, - .de_offset = PI3HDX1204_DE_DB_MINUS5, -}; - -static int check_hdmi_hpd_status(void) -{ - return gpio_get_level(GPIO_DP1_HPD_EC_IN); -} - -/***************************************************************************** - * Board suspend / resume - */ - -static void board_chipset_resume(void) -{ - ioex_set_level(IOEX_HDMI_DATA_EN_DB, 1); - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) { - 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(void) -{ - if (ec_config_has_hdmi_retimer_pi3hdx1204()) { - pi3hdx1204_enable(I2C_PORT_TCPC1, - PI3HDX1204_I2C_ADDR_FLAGS, - 0); - ioex_set_level(IOEX_HDMI_POWER_EN_DB, 0); - } - - ioex_set_level(IOEX_HDMI_DATA_EN_DB, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_chipset_suspend, HOOK_PRIO_DEFAULT); - -/* - * USB C0 port SBU mux use standalone PI3USB221 - * chip and it need a board specific driver. - * Overall, it will use chained mux framework. - */ -static int pi3usb221_set_mux(const struct usb_mux *me, mux_state_t mux_state, - bool *ack_required) -{ - /* This driver does not use host command ACKs */ - *ack_required = false; - - if (mux_state & USB_PD_MUX_POLARITY_INVERTED) - ioex_set_level(IOEX_USB_C0_SBU_FLIP, 0); - else - ioex_set_level(IOEX_USB_C0_SBU_FLIP, 1); - return EC_SUCCESS; -} -/* - * .init is not necessary here because it has nothing - * to do. Primary mux will handle mux state so .get is - * not needed as well. usb_mux.c can handle the situation - * properly. - */ -const struct usb_mux_driver usbc0_sbu_mux_driver = { - .set = pi3usb221_set_mux, -}; -/* - * Since PI3USB221 is not a i2c device, .i2c_port and - * .i2c_addr_flags are not required here. - */ -const struct usb_mux usbc0_sbu_mux = { - .usb_port = USBC_PORT_C0, - .driver = &usbc0_sbu_mux_driver, -}; - -/***************************************************************************** - * USB-C MUX/Retimer dynamic configuration - */ -static void setup_mux(void) -{ - if (ec_config_has_usbc1_retimer_tusb544()) { - ccprints("C1 TUSB544 detected"); - /* - * Main MUX is FP5, secondary MUX is TUSB544 - * - * 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 TUSB544 as the secondary MUX */ - usb_muxes[USBC_PORT_C1].next_mux = &usbc1_tusb544; - } else if (ec_config_has_usbc1_retimer_ps8743()) { - ccprints("C1 PS8743 detected"); - /* - * Main MUX is PS8743, secondary MUX is modified FP5 - * - * Replace usb_muxes[USBC_PORT_C1] with the PS8743 - * table entry. - */ - memcpy(&usb_muxes[USBC_PORT_C1], - &usbc1_ps8743, - 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; - } -} - -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_sbu_mux, - }, - [USBC_PORT_C1] = { - /* Filled in dynamically at startup */ - }, -}; -BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); - -static int board_tusb544_mux_set(const struct usb_mux *me, - mux_state_t mux_state) -{ - int rv = EC_SUCCESS; - - if (mux_state & USB_PD_MUX_USB_ENABLED) { - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_USB3_1_1, - TUSB544_EQ_RX_MASK, - TUSB544_EQ_RX_DFP_04_UFP_MINUS15); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_USB3_1_1, - TUSB544_EQ_TX_MASK, - TUSB544_EQ_TX_DFP_MINUS14_UFP_MINUS33); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_USB3_1_2, - TUSB544_EQ_RX_MASK, - TUSB544_EQ_RX_DFP_04_UFP_MINUS15); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_USB3_1_2, - TUSB544_EQ_TX_MASK, - TUSB544_EQ_TX_DFP_MINUS14_UFP_MINUS33); - if (rv) - return rv; - } - - if (mux_state & USB_PD_MUX_DP_ENABLED) { - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_DISPLAYPORT_1, - TUSB544_EQ_RX_MASK, - TUSB544_EQ_RX_DFP_61_UFP_43); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_DISPLAYPORT_1, - TUSB544_EQ_TX_MASK, - TUSB544_EQ_TX_DFP_61_UFP_43); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_DISPLAYPORT_2, - TUSB544_EQ_RX_MASK, - TUSB544_EQ_RX_DFP_61_UFP_43); - if (rv) - return rv; - - rv = tusb544_i2c_field_update8(me, - TUSB544_REG_DISPLAYPORT_2, - TUSB544_EQ_TX_MASK, - TUSB544_EQ_TX_DFP_61_UFP_43); - if (rv) - return rv; - - /* Enable IN_HPD on the DB */ - gpio_or_ioex_set_level(board_usbc1_retimer_inhpd, 1); - } else { - /* Disable IN_HPD on the DB */ - gpio_or_ioex_set_level(board_usbc1_retimer_inhpd, 0); - } - return EC_SUCCESS; -} - -const struct usb_mux usbc1_tusb544 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS1, - .driver = &tusb544_drv, - .board_set = &board_tusb544_mux_set, -}; -const struct usb_mux usbc1_ps8743 = { - .usb_port = USBC_PORT_C1, - .i2c_port = I2C_PORT_TCPC1, - .i2c_addr_flags = PS8743_I2C_ADDR1_FLAG, - .driver = &ps8743_usb_mux_driver, -}; - -/***************************************************************************** - * Use FW_CONFIG to set correct configuration. - */ -enum gpio_signal GPIO_S0_PGOOD = GPIO_S0_PWROK_OD_V0; -static uint32_t board_ver; -int board_usbc1_retimer_inhpd = GPIO_USB_C1_HPD_IN_DB_V1; - -static void board_version_check(void) -{ - cbi_get_board_version(&board_ver); - - if (board_ver <= 2) - chg_chips[0].i2c_port = I2C_PORT_CHARGER_V0; - - if (board_ver == 2) { - power_signal_list[X86_S0_PGOOD].gpio = GPIO_S0_PWROK_OD_V1; - GPIO_S0_PGOOD = GPIO_S0_PWROK_OD_V1; - } -} -/* - * Use HOOK_PRIO_INIT_I2C so we re-map before charger_chips_init() - * talks to the charger. - */ -DECLARE_HOOK(HOOK_INIT, board_version_check, HOOK_PRIO_INIT_I2C); - -static void board_remap_gpio(void) -{ - if (board_ver >= 3) { - /* - * TODO: remove code when older version_2 - * hardware is retired and no longer needed - */ - gpio_set_flags(GPIO_USB_C1_HPD_IN_DB_V1, GPIO_OUT_LOW); - board_usbc1_retimer_inhpd = GPIO_USB_C1_HPD_IN_DB_V1; - - if (ec_config_has_hdmi_retimer_pi3hdx1204()) - gpio_enable_interrupt(GPIO_DP1_HPD_EC_IN); - - } else - board_usbc1_retimer_inhpd = IOEX_USB_C1_HPD_IN_DB; -} - -static void setup_fw_config(void) -{ - setup_mux(); - - board_remap_gpio(); -} -/* Use HOOK_PRIO_INIT_I2C + 2 to be after ioex_init(). */ -DECLARE_HOOK(HOOK_INIT, setup_fw_config, HOOK_PRIO_INIT_I2C + 2); - -static void hdmi_hpd_handler(void) -{ - /* Pass HPD through 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(enum gpio_signal signal) -{ - /* Debounce for 2 msec */ - hook_call_deferred(&hdmi_hpd_handler_data, (2 * MSEC)); -} - -/***************************************************************************** - * 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 = 3000, - .rpm_start = 3500, - .rpm_max = 6200, -}; -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_SOC: - /* thermistor is not powered in G3 */ - if (chipset_in_state(CHIPSET_STATE_HARD_OFF)) - return EC_ERROR_NOT_POWERED; - - /* adc power not ready when transition to S5 */ - if (chipset_in_or_transitioning_to_state( - CHIPSET_STATE_SOFT_OFF)) - return EC_ERROR_NOT_POWERED; - - channel = ADC_TEMP_SENSOR_SOC; - 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; - - /* adc power not ready when transition to S5 */ - if (chipset_in_or_transitioning_to_state( - CHIPSET_STATE_SOFT_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_5V_REGULATOR] = { - .name = "5V_REGULATOR", - .input_ch = NPCX_ADC_CH0, - .factor_mul = ADC_MAX_VOLT, - .factor_div = ADC_READ_MAX + 1, - .shift = 0, - }, - [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_SOC] = { - .name = "SOC", - .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_SOC] = { - .name = "SOC", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = board_get_temp, - .idx = TEMP_SENSOR_SOC, - }, - [TEMP_SENSOR_CPU] = { - .name = "CPU", - .type = TEMP_SENSOR_TYPE_CPU, - .read = sb_tsi_get_val, - .idx = 0, - }, - [TEMP_SENSOR_5V_REGULATOR] = { - .name = "5V_REGULATOR", - .type = TEMP_SENSOR_TYPE_BOARD, - .read = board_get_temp, - .idx = TEMP_SENSOR_5V_REGULATOR, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); - -const static struct ec_thermal_config thermal_thermistor_soc = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(62), - [EC_TEMP_THRESH_HALT] = C_TO_K(66), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(57), - }, - .temp_fan_off = C_TO_K(39), - .temp_fan_max = C_TO_K(60), -}; - -const static struct ec_thermal_config thermal_thermistor_charger = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(99), - [EC_TEMP_THRESH_HALT] = C_TO_K(99), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(98), - }, - .temp_fan_off = C_TO_K(98), - .temp_fan_max = C_TO_K(99), -}; - -const static struct ec_thermal_config thermal_thermistor_5v = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(60), - [EC_TEMP_THRESH_HALT] = C_TO_K(99), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(50), - }, - .temp_fan_off = C_TO_K(98), - .temp_fan_max = C_TO_K(99), -}; - -const static struct ec_thermal_config thermal_cpu = { - .temp_host = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(100), - [EC_TEMP_THRESH_HALT] = C_TO_K(105), - }, - .temp_host_release = { - [EC_TEMP_THRESH_HIGH] = C_TO_K(99), - }, -}; - -struct ec_thermal_config thermal_params[TEMP_SENSOR_COUNT]; - -struct fan_step { - int on; - int off; - int rpm; -}; - -static const struct fan_step fan_table0[] = { - {.on = 0, .off = 5, .rpm = 0}, - {.on = 29, .off = 5, .rpm = 3700}, - {.on = 38, .off = 19, .rpm = 4000}, - {.on = 48, .off = 33, .rpm = 4500}, - {.on = 62, .off = 43, .rpm = 4800}, - {.on = 76, .off = 52, .rpm = 5200}, - {.on = 100, .off = 67, .rpm = 6200}, -}; -/* All fan tables must have the same number of levels */ -#define NUM_FAN_LEVELS ARRAY_SIZE(fan_table0) - -static const struct fan_step *fan_table = fan_table0; - -int fan_percent_to_rpm(int fan, int pct) -{ - static int current_level; - static int previous_pct; - int i; - - /* - * Compare the pct and previous pct, we have the three paths : - * 1. decreasing path. (check the off point) - * 2. increasing path. (check the on point) - * 3. invariant path. (return the current RPM) - */ - if (pct < previous_pct) { - for (i = current_level; i >= 0; i--) { - if (pct <= fan_table[i].off) - current_level = i - 1; - else - break; - } - } else if (pct > previous_pct) { - for (i = current_level + 1; i < NUM_FAN_LEVELS; i++) { - if (pct >= fan_table[i].on) - current_level = i; - else - break; - } - } - - if (current_level < 0) - current_level = 0; - - previous_pct = pct; - - if (fan_table[current_level].rpm != - fan_get_rpm_target(FAN_CH(fan))) - cprints(CC_THERMAL, "Setting fan RPM to %d", - fan_table[current_level].rpm); - - return fan_table[current_level].rpm; -} - -static void setup_fans(void) -{ - thermal_params[TEMP_SENSOR_CHARGER] = thermal_thermistor_charger; - thermal_params[TEMP_SENSOR_SOC] = thermal_thermistor_soc; - thermal_params[TEMP_SENSOR_CPU] = thermal_cpu; - thermal_params[TEMP_SENSOR_5V_REGULATOR] = thermal_thermistor_5v; -} -DECLARE_HOOK(HOOK_INIT, setup_fans, HOOK_PRIO_DEFAULT); - -#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] = { - {0, 5}, {1, 1}, {1, 0}, {0, 6}, {0, 7}, - {1, 4}, {1, 3}, {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}, -}; - -const int keyboard_factory_scan_pins_used = - ARRAY_SIZE(keyboard_factory_scan_pins); -#endif - -/***************************************************************************** - * Power signals - */ - -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_PWROK_OD_V0, - .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); - -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 GPIO_NO_HPD - * version_3 uses USB_C1_HPD_IN_DB_V1 via RTD2141B MST hub - * to drive AP HPD, EC drives MST hub HPD input - * from USB-PD messages.. - */ - else if (ec_config_has_mst_hub_rtd2141b()) - return (board_ver >= 3) - ? GPIO_USB_C1_HPD_IN_DB_V1 - : GPIO_NO_HPD; - - /* USB-C1 OPT1 DB uses DP2_HPD. */ - return GPIO_DP2_HPD; -} diff --git a/board/berknip/board.h b/board/berknip/board.h deleted file mode 100644 index 5ef9e33f0c..0000000000 --- a/board/berknip/board.h +++ /dev/null @@ -1,204 +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. - */ - -/* Berknip board configuration */ - -#ifndef __CROS_EC_BOARD_H -#define __CROS_EC_BOARD_H - -#define VARIANT_ZORK_TREMBYLE - -#include <stdbool.h> -#include "baseboard.h" - -#define RPM_DEVIATION 1 -#define CONFIG_FAN_RPM_CUSTOM - -#undef CONFIG_LED_ONOFF_STATES -#define CONFIG_LED_COMMON - -#define CONFIG_KEYBOARD_FACTORY_TEST - -/* Type C mux/retimer */ -#define CONFIG_USB_MUX_PS8743 -#define CONFIG_USBC_RETIMER_TUSB544 -#define TUSB544_I2C_ADDR_FLAGS1 0x0F -#define CONFIG_TUSB544_EQ_BY_REGISTER - -#define CONFIG_POWER_SIGNAL_RUNTIME_CONFIG - -/* 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_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 - -#ifndef __ASSEMBLER__ - -/* This GPIOs moved. Temporarily detect and support the V0 HW. */ -extern enum gpio_signal GPIO_S0_PGOOD; - -enum adc_channel { - ADC_TEMP_SENSOR_5V_REGULATOR, - ADC_TEMP_SENSOR_CHARGER, - ADC_TEMP_SENSOR_SOC, - ADC_CH_COUNT -}; - -enum battery_type { - BATTERY_SIMPLO_HIGHPOWER, - BATTERY_COSMX, - 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_COUNT -}; - -enum temp_sensor_id { - TEMP_SENSOR_CHARGER = 0, - TEMP_SENSOR_SOC, - TEMP_SENSOR_CPU, - TEMP_SENSOR_5V_REGULATOR, - TEMP_SENSOR_COUNT -}; - -enum usba_port { - USBA_PORT_A0 = 0, - USBA_PORT_A1, - USBA_PORT_COUNT -}; - -/***************************************************************************** - * CBI EC FW Configuration - */ - -/** - * BERKNIP_MB_USBAC - * USB-A0 Speed: 5 Gbps - * Retimer: none - * USB-C0 Speed: 5 Gbps - * Retimer: none - * TCPC: NCT3807 - * PPC: AOZ1380 - * IOEX: TCPC - */ -enum ec_cfg_usb_mb_type { - BERKNIP_MB_USBAC = 0, -}; - -/** - * BERKNIP_DB_T_OPT1_USBAC_HMDI - * USB-A1 Speed: 5 Gbps - * Retimer: PS8719 - * USB-C1 Speed: 5 Gbps - * Retimer: TUSB544 - * TCPC: NCT3807 - * PPC: NX20P3483 - * IOEX: TCPC - * HDMI Exists: yes - * Retimer: PI3HDX1204 - * MST Hub: none - * - * - * BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB - * USB-A1 Speed: 5 Gbps - * Retimer: PS8719 - * USB-C1 Speed: 5 Gbps - * Retimer: PS8743 - * TCPC: NCT3807 - * PPC: NX20P3483 - * IOEX: TCPC - * HDMI Exists: yes - * Retimer: none - * MST Hub: RTD2141B - */ -enum ec_cfg_usb_db_type { - BERKNIP_DB_T_OPT1_USBAC_HMDI = 0, - BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB = 1, -}; - -#include "cbi_ec_fw_config.h" - -#define HAS_USBC1_RETIMER_PS8743 \ - (BIT(BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB)) - -static inline bool ec_config_has_usbc1_retimer_ps8743(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1_RETIMER_PS8743); -} - -#define HAS_USBC1_RETIMER_TUSB544 \ - (BIT(BERKNIP_DB_T_OPT1_USBAC_HMDI)) - -static inline bool ec_config_has_usbc1_retimer_tusb544(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_USBC1_RETIMER_TUSB544); -} - -#define HAS_HDMI_RETIMER_PI3HDX1204 \ - (BIT(BERKNIP_DB_T_OPT1_USBAC_HMDI)) - -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(BERKNIP_DB_T_OPT3_USBAC_HDMI_MSTHUB)) - -static inline bool ec_config_has_mst_hub_rtd2141b(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_MST_HUB_RTD2141B); -} - -#define HAS_HDMI_CONN_HPD \ - (BIT(BERKNIP_DB_T_OPT1_USBAC_HMDI)) - -static inline bool ec_config_has_hdmi_conn_hpd(void) -{ - return !!(BIT(ec_config_get_usb_db()) & - HAS_HDMI_CONN_HPD); -} - -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 usbc1_tusb544; -extern const struct usb_mux usbc1_ps8743; -extern struct usb_mux usbc1_amd_fp5_usb_mux; - -#endif /* !__ASSEMBLER__ */ - -#endif /* __CROS_EC_BOARD_H */ diff --git a/board/berknip/build.mk b/board/berknip/build.mk deleted file mode 100644 index 1c0cbc4f63..0000000000 --- a/board/berknip/build.mk +++ /dev/null @@ -1,15 +0,0 @@ -# -*- makefile -*- -# Copyright 2020 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# -# Board specific files build -# - -CHIP:=npcx -CHIP_FAMILY:=npcx7 -CHIP_VARIANT:=npcx7m7wc -BASEBOARD:=zork - -board-y=board.o led.o -board-$(CONFIG_BATTERY_SMART)+=battery.o diff --git a/board/berknip/ec.tasklist b/board/berknip/ec.tasklist deleted file mode 100644 index 3a08ebc972..0000000000 --- a/board/berknip/ec.tasklist +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* - * See CONFIG_TASK_LIST in config.h for details. - */ - -#define CONFIG_TASK_LIST \ - TASK_ALWAYS(HOOKS, hook_task, NULL, 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_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/berknip/gpio.inc b/board/berknip/gpio.inc deleted file mode 100644 index 860cbba284..0000000000 --- a/board/berknip/gpio.inc +++ /dev/null @@ -1,156 +0,0 @@ -/* -*- mode:c -*- - * - * Copyright 2020 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -/* Declare symbolic names for all the GPIOs that we care about. - * Note: Those with interrupt handlers must be declared first. */ - -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_V0, PIN(5, 6), GPIO_INT_BOTH, power_signal_interrupt) - -/* - * TODO(dbrockus@): remove code when older version_2 of hardware is - * retired and no longer needed - */ -#if 0 -GPIO(USB_C1_HPD_IN_DB_V1, PIN(B, 1), GPIO_OUT_LOW) /* C1 HPD V1 */ -#else -#define GPIO_USB_C1_HPD_IN_DB_V1 GPIO_S0_PWROK_OD_V1 -GPIO_INT(S0_PWROK_OD_V1, PIN(B, 1), GPIO_INT_BOTH, power_signal_interrupt) -#endif - -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(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(DP1_HPD_EC_IN, PIN(7, 5), GPIO_INT_BOTH, hdmi_hpd_interrupt) - -/* 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_INPUT) /* 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_H1_PACKET_MODE, PIN(8, 6), GPIO_OUT_LOW) /* H1 Packet Mode */ - -UNIMPLEMENTED(NO_HPD) - -UNIMPLEMENTED(PCH_SMI_L) - -GPIO(LED_FULL_L, PIN(6, 0), GPIO_OUT_HIGH) -GPIO(LED_CHRG_L, PIN(C, 0), GPIO_OUT_HIGH) -GPIO(C1_CHARGE_LED_WHITE_DB_L, PIN(7, 0), GPIO_OUT_HIGH) -GPIO(C1_CHARGE_LED_AMBER_DB_L, PIN(6, 7), GPIO_OUT_HIGH) - -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_C0_SBU_FLIP, EXPIN(USBC_PORT_C0, 1, 7), GPIO_OUT_LOW) /* C0 SBU Flip */ - -IOEX(USB_A1_RETIMER_EN, EXPIN(USBC_PORT_C1, 0, 0), GPIO_OUT_LOW) /* A1 Retimer Enable */ -IOEX(USB_A1_RETIMER_RST_DB, EXPIN(USBC_PORT_C1, 0, 1), GPIO_OUT_LOW) /* A1 Retimer Reset */ -IOEX(USB_C1_HPD_IN_DB, EXPIN(USBC_PORT_C1, 0, 2), GPIO_OUT_LOW) /* C1 HPD */ -IOEX(HDMI_POWER_EN_DB, EXPIN(USBC_PORT_C1, 0, 3), GPIO_OUT_LOW) /* HDMI retimer power enable */ -IOEX(USB_C1_TCPC_FASTSW_CTL_EN, EXPIN(USBC_PORT_C1, 0, 4), GPIO_OUT_LOW) /* C1 FastSwitch Control */ -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(0) | BIT(2) | BIT(3)), 0, MODULE_ADC, 0) /* ADC0, 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 */ diff --git a/board/berknip/led.c b/board/berknip/led.c deleted file mode 100644 index 79d691ffac..0000000000 --- a/board/berknip/led.c +++ /dev/null @@ -1,205 +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 "battery.h" -#include "charge_manager.h" -#include "charge_state.h" -#include "chipset.h" -#include "ec_commands.h" -#include "gpio.h" -#include "host_command.h" -#include "led_common.h" -#include "hooks.h" - -#define BAT_LED_ON 0 -#define BAT_LED_OFF 1 - -#define POWER_LED_ON 0 -#define POWER_LED_OFF 1 - -#define LED_TICKS_PER_CYCLE 10 -#define LED_TICKS_PER_CYCLE_S3 35 -#define LED_ON_TICKS 5 -#define POWER_LED_ON_S3_TICKS 5 - -const enum ec_led_id supported_led_ids[] = { - EC_LED_ID_LEFT_LED, - EC_LED_ID_RIGHT_LED, -}; - -const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); - -enum led_color { - LED_OFF = 0, - LED_AMBER, - LED_WHITE, - LED_COLOR_COUNT /* Number of colors, not a color itself */ -}; - -enum led_port { - RIGHT_PORT = 0, - LEFT_PORT -}; - -static void led_set_color_battery(int port, enum led_color color) -{ - enum gpio_signal amber_led, white_led; - - amber_led = (port == RIGHT_PORT ? GPIO_LED_CHRG_L : - GPIO_C1_CHARGE_LED_AMBER_DB_L); - white_led = (port == RIGHT_PORT ? GPIO_LED_FULL_L : - GPIO_C1_CHARGE_LED_WHITE_DB_L); - - switch (color) { - case LED_WHITE: - gpio_set_level(white_led, BAT_LED_ON); - gpio_set_level(amber_led, BAT_LED_OFF); - break; - case LED_AMBER: - gpio_set_level(white_led, BAT_LED_OFF); - gpio_set_level(amber_led, BAT_LED_ON); - break; - case LED_OFF: - gpio_set_level(white_led, BAT_LED_OFF); - gpio_set_level(amber_led, BAT_LED_OFF); - break; - default: - break; - } -} - -void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) -{ - switch (led_id) { - case EC_LED_ID_LEFT_LED: - brightness_range[EC_LED_COLOR_WHITE] = 1; - brightness_range[EC_LED_COLOR_AMBER] = 1; - break; - case EC_LED_ID_RIGHT_LED: - brightness_range[EC_LED_COLOR_WHITE] = 1; - brightness_range[EC_LED_COLOR_AMBER] = 1; - break; - default: - break; - } -} - -int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) -{ - switch (led_id) { - case EC_LED_ID_LEFT_LED: - if (brightness[EC_LED_COLOR_WHITE] != 0) - led_set_color_battery(LEFT_PORT, LED_WHITE); - else if (brightness[EC_LED_COLOR_AMBER] != 0) - led_set_color_battery(LEFT_PORT, LED_AMBER); - else - led_set_color_battery(LEFT_PORT, LED_OFF); - break; - case EC_LED_ID_RIGHT_LED: - if (brightness[EC_LED_COLOR_WHITE] != 0) - led_set_color_battery(RIGHT_PORT, LED_WHITE); - else if (brightness[EC_LED_COLOR_AMBER] != 0) - led_set_color_battery(RIGHT_PORT, LED_AMBER); - else - led_set_color_battery(RIGHT_PORT, LED_OFF); - break; - default: - return EC_ERROR_PARAM1; - } - - return EC_SUCCESS; -} - -/* - * Set active charge port color to the parameter, turn off all others. - * If no port is active (-1), turn off all LEDs. - */ -static void set_active_port_color(enum led_color color) -{ - int port = charge_manager_get_active_charge_port(); - - if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) - led_set_color_battery(RIGHT_PORT, - (port == RIGHT_PORT) ? color : LED_OFF); - if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) - led_set_color_battery(LEFT_PORT, - (port == LEFT_PORT) ? color : LED_OFF); -} - -static void led_set_battery(void) -{ - static int battery_ticks; - static int power_ticks; - uint32_t chflags = charge_get_flags(); - - battery_ticks++; - - /* - * Override battery LEDs for Berknip, Berknip is non-power LED - * design, blinking both two side battery white LEDs to indicate - * system suspend with non-charging state. - */ - if (chipset_in_state(CHIPSET_STATE_SUSPEND | - CHIPSET_STATE_STANDBY) && - charge_get_state() != PWR_STATE_CHARGE) { - - power_ticks++; - - led_set_color_battery(RIGHT_PORT, power_ticks - % LED_TICKS_PER_CYCLE_S3 < POWER_LED_ON_S3_TICKS - ? LED_WHITE : LED_OFF); - led_set_color_battery(LEFT_PORT, power_ticks - % LED_TICKS_PER_CYCLE_S3 < POWER_LED_ON_S3_TICKS - ? LED_WHITE : LED_OFF); - return; - } - - power_ticks = 0; - - switch (charge_get_state()) { - case PWR_STATE_CHARGE: - /* Always indicate when charging, even in suspend. */ - set_active_port_color(LED_AMBER); - break; - case PWR_STATE_DISCHARGE: - if (led_auto_control_is_enabled(EC_LED_ID_RIGHT_LED)) { - if (charge_get_percent() < 10) - led_set_color_battery(RIGHT_PORT, - (battery_ticks % LED_TICKS_PER_CYCLE - < LED_ON_TICKS) ? LED_WHITE : LED_OFF); - else - led_set_color_battery(RIGHT_PORT, LED_OFF); - } - - if (led_auto_control_is_enabled(EC_LED_ID_LEFT_LED)) - led_set_color_battery(LEFT_PORT, LED_OFF); - break; - case PWR_STATE_ERROR: - set_active_port_color((battery_ticks & 0x2) ? - LED_WHITE : LED_OFF); - break; - case PWR_STATE_CHARGE_NEAR_FULL: - set_active_port_color(LED_WHITE); - break; - case PWR_STATE_IDLE: /* External power connected in IDLE */ - if (chflags & CHARGE_FLAG_FORCE_IDLE) - set_active_port_color((battery_ticks % - LED_TICKS_PER_CYCLE < LED_ON_TICKS) ? - LED_AMBER : LED_OFF); - else - set_active_port_color(LED_WHITE); - break; - default: - /* Other states don't alter LED behavior */ - break; - } -} - -/* Called by hook task every TICK */ -static void led_tick(void) -{ - led_set_battery(); -} -DECLARE_HOOK(HOOK_TICK, led_tick, HOOK_PRIO_DEFAULT); diff --git a/board/berknip/vif_override.xml b/board/berknip/vif_override.xml deleted file mode 100644 index 32736caf64..0000000000 --- a/board/berknip/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. ---> |