diff options
Diffstat (limited to 'board/beetley/board.c')
| -rw-r--r-- | board/beetley/board.c | 560 |
1 files changed, 251 insertions, 309 deletions
diff --git a/board/beetley/board.c b/board/beetley/board.c index c956551c60..08c9ba5066 100644 --- a/board/beetley/board.c +++ b/board/beetley/board.c @@ -3,25 +3,28 @@ * found in the LICENSE file. */ -/* Waddledee board-specific configuration */ +/* Beetley board-specific configuration */ #include "adc_chip.h" #include "button.h" +#include "cbi_fw_config.h" +#include "cros_board_info.h" +#include "cbi_ssfc.h" #include "charge_manager.h" #include "charge_state_v2.h" #include "charger.h" -#include "driver/accel_kionix.h" +#include "driver/accel_lis2dw12.h" #include "driver/accelgyro_lsm6dsm.h" #include "driver/bc12/pi3usb9201.h" -#include "driver/charger/sm5803.h" -#include "driver/retimer/tusb544.h" +#include "driver/charger/isl923x.h" #include "driver/temp_sensor/thermistor.h" -#include "driver/tcpm/anx7447.h" -#include "driver/tcpm/it83xx_pd.h" +#include "driver/tcpm/raa489000.h" +#include "driver/tcpm/tcpci.h" #include "driver/usb_mux/it5205.h" #include "gpio.h" #include "hooks.h" #include "intc.h" +#include "keyboard_raw.h" #include "keyboard_scan.h" #include "lid_switch.h" #include "power.h" @@ -41,20 +44,38 @@ #include "usb_pd_tcpm.h" #define CPRINTUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) - #define INT_RECHECK_US 5000 -/* C1 interrupt line swapped between board versions, track it in a variable */ -static enum gpio_signal c1_int_line; +__override struct keyboard_scan_config keyscan_config = { + .output_settle_us = 80, + .debounce_down_us = 30 * MSEC, + .debounce_up_us = 30 * MSEC, + .scan_period_us = 3 * MSEC, + .min_post_scan_delay_us = 1000, + .poll_timeout_us = 100 * MSEC, + .actual_key_mask = { + 0x1c, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff, + 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ + }, +}; /* C0 interrupt line shared by BC 1.2 and charger */ static void check_c0_line(void); DECLARE_DEFERRED(check_c0_line); +static void hdmi_hpd_interrupt(enum gpio_signal s) +{ + gpio_set_level(GPIO_USB_C1_DP_HPD, !gpio_get_level(s)); +} + static void notify_c0_chips(void) { + /* + * The interrupt line is shared between the TCPC and BC 1.2 detection + * chip. Therefore we'll need to check both ICs. + */ + schedule_deferred_pd_interrupt(0); task_set_event(TASK_ID_USB_CHG_P0, USB_CHG_EVENT_BC12); - sm5803_interrupt(0); } static void check_c0_line(void) @@ -79,41 +100,7 @@ static void usb_c0_interrupt(enum gpio_signal s) /* Check the line again in 5ms */ hook_call_deferred(&check_c0_line_data, INT_RECHECK_US); -} -/* C1 interrupt line shared by BC 1.2, TCPC, and charger */ -static void check_c1_line(void); -DECLARE_DEFERRED(check_c1_line); - -static void notify_c1_chips(void) -{ - schedule_deferred_pd_interrupt(1); - task_set_event(TASK_ID_USB_CHG_P1, USB_CHG_EVENT_BC12); - sm5803_interrupt(1); -} - -static void check_c1_line(void) -{ - /* - * If line is still being held low, see if there's more to process from - * one of the chips. - */ - if (!gpio_get_level(c1_int_line)) { - notify_c1_chips(); - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); - } -} - -static void usb_c1_interrupt(enum gpio_signal s) -{ - /* Cancel any previous calls to check the interrupt line */ - hook_call_deferred(&check_c1_line_data, -1); - - /* Notify all chips using this line that an interrupt came in */ - notify_c1_chips(); - - /* Check the line again in 5ms */ - hook_call_deferred(&check_c1_line_data, INT_RECHECK_US); } static void c0_ccsbu_ovp_interrupt(enum gpio_signal s) @@ -148,12 +135,12 @@ const struct adc_t adc_channels[] = { .shift = 0, .channel = CHIP_ADC_CH3 }, - [ADC_SUB_ANALOG] = { - .name = "SUB_ANALOG", + [ADC_TEMP_SENSOR_3] = { + .name = "TEMP_SENSOR3", .factor_mul = ADC_MAX_MVOLT, .factor_div = ADC_READ_MAX + 1, .shift = 0, - .channel = CHIP_ADC_CH13 + .channel = CHIP_ADC_CH15 }, }; BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); @@ -165,52 +152,30 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, .flags = PI3USB9201_ALWAYS_POWERED, }, - { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, - .flags = PI3USB9201_ALWAYS_POWERED, - }, }; /* Charger chips */ const struct charger_config_t chg_chips[] = { - [CHARGER_PRIMARY] = { + { .i2c_port = I2C_PORT_USB_C0, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, - }, - [CHARGER_SECONDARY] = { - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = SM5803_ADDR_CHARGER_FLAGS, - .drv = &sm5803_drv, + .i2c_addr_flags = ISL923X_ADDR_FLAGS, + .drv = &isl923x_drv, }, }; /* TCPCs */ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_MAX_COUNT] = { { - .bus_type = EC_BUS_TYPE_EMBEDDED, - .drv = &it83xx_tcpm_drv, - }, - { .bus_type = EC_BUS_TYPE_I2C, .i2c_info = { - .port = I2C_PORT_SUB_USB_C1, - .addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, + .port = I2C_PORT_USB_C0, + .addr_flags = RAA489000_TCPC0_I2C_FLAGS, }, - .drv = &anx7447_tcpm_drv, .flags = TCPC_FLAGS_TCPCI_REV2_0, + .drv = &raa489000_tcpm_drv, }, }; -/* USB Retimer */ -const struct usb_mux usbc1_retimer = { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = TUSB544_I2C_ADDR_FLAGS0, - .driver = &tusb544_drv, -}; - /* USB Muxes */ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { { @@ -219,86 +184,187 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { .i2c_addr_flags = IT5205_I2C_ADDR1_FLAGS, .driver = &it5205_usb_mux_driver, }, - { - .usb_port = 1, - .i2c_port = I2C_PORT_SUB_USB_C1, - .i2c_addr_flags = AN7447_TCPC0_I2C_ADDR_FLAGS, - .driver = &anx7447_usb_mux_driver, - .next_mux = &usbc1_retimer, +}; + +static const struct ec_response_keybd_config beetley_keybd = { + .num_top_row_keys = 10, + .action_keys = { + TK_BACK, /* T1 */ + TK_REFRESH, /* T2 */ + TK_FULLSCREEN, /* T3 */ + TK_OVERVIEW, /* T4 */ + TK_SNAPSHOT, /* T5 */ + TK_BRIGHTNESS_DOWN, /* T6 */ + TK_BRIGHTNESS_UP, /* T7 */ + TK_VOL_MUTE, /* T8 */ + TK_VOL_DOWN, /* T9 */ + TK_VOL_UP, /* T10 */ }, + .capabilities = KEYBD_CAP_SCRNLOCK_KEY | KEYBD_CAP_NUMERIC_KEYPAD, }; -void board_init(void) +__override const struct ec_response_keybd_config +*board_vivaldi_keybd_config(void) { - int on; + return &beetley_keybd; +} - if (system_get_board_version() <= 0) { - pd_set_max_voltage(5000); - c1_int_line = GPIO_USB_C1_INT_V0_ODL; - } else { - c1_int_line = GPIO_USB_C1_INT_V1_ODL; - } +/* USB-A charging control */ +const int usb_port_enable[USB_PORT_COUNT] = { + GPIO_EN_USB_A0_VBUS +}; + +/* Sensors */ +static struct mutex g_lid_mutex; +static struct mutex g_base_mutex; + +/* Matrices to rotate accelerometers into the standard reference. */ +static const mat33_fp_t base_lsm6dsm_ref = { + { 0, FLOAT_TO_FP(1), 0}, + { FLOAT_TO_FP(-1), 0, 0}, + { 0, 0, FLOAT_TO_FP(1)} +}; + +static struct lsm6dsm_data lsm6dsm_data = LSM6DSM_DATA; + +/* Lid accel private data */ +static struct stprivate_data g_lis2dwl_data; +struct motion_sensor_t motion_sensors[] = { + [LID_ACCEL] = { + .name = "Lid Accel", + .active_mask = SENSOR_ACTIVE_S0_S3, + .chip = MOTIONSENSE_CHIP_LIS2DWL, + .type = MOTIONSENSE_TYPE_ACCEL, + .location = MOTIONSENSE_LOC_LID, + .drv = &lis2dw12_drv, + .mutex = &g_lid_mutex, + .drv_data = &g_lis2dwl_data, + .port = I2C_PORT_SENSOR, + .i2c_spi_addr_flags = LIS2DWL_ADDR1_FLAGS, + .rot_standard_ref = NULL, /* identity matrix */ + .default_range = 2, /* g */ + .min_frequency = LIS2DW12_ODR_MIN_VAL, + .max_frequency = LIS2DW12_ODR_MAX_VAL, + .config = { + /* EC use accel for angle detection */ + [SENSOR_CONFIG_EC_S0] = { + .odr = 12500 | ROUND_UP_FLAG, + }, + /* Sensor on for lid 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_LSM6DS3, + .type = MOTIONSENSE_TYPE_ACCEL, + .location = MOTIONSENSE_LOC_BASE, + .drv = &lsm6dsm_drv, + .mutex = &g_base_mutex, + .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, + MOTIONSENSE_TYPE_ACCEL), + .int_signal = GPIO_BASE_SIXAXIS_INT_L, + .flags = MOTIONSENSE_FLAG_INT_SIGNAL, + .port = I2C_PORT_SENSOR, + .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, + .rot_standard_ref = &base_lsm6dsm_ref, + .default_range = 4, /* g */ + .min_frequency = LSM6DSM_ODR_MIN_VAL, + .max_frequency = LSM6DSM_ODR_MAX_VAL, + .config = { + [SENSOR_CONFIG_EC_S0] = { + .odr = 13000 | ROUND_UP_FLAG, + .ec_rate = 100 * MSEC, + }, + [SENSOR_CONFIG_EC_S3] = { + .odr = 10000 | ROUND_UP_FLAG, + .ec_rate = 100 * MSEC, + }, + }, + }, + [BASE_GYRO] = { + .name = "Base Gyro", + .active_mask = SENSOR_ACTIVE_S0_S3, + .chip = MOTIONSENSE_CHIP_LSM6DS3, + .type = MOTIONSENSE_TYPE_GYRO, + .location = MOTIONSENSE_LOC_BASE, + .drv = &lsm6dsm_drv, + .mutex = &g_base_mutex, + .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, + MOTIONSENSE_TYPE_GYRO), + .int_signal = GPIO_BASE_SIXAXIS_INT_L, + .flags = MOTIONSENSE_FLAG_INT_SIGNAL, + .port = I2C_PORT_SENSOR, + .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, + .default_range = 1000 | ROUND_UP_FLAG, /* dps */ + .rot_standard_ref = &base_lsm6dsm_ref, + .min_frequency = LSM6DSM_ODR_MIN_VAL, + .max_frequency = LSM6DSM_ODR_MAX_VAL, + }, +}; +const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); +void board_init(void) +{ gpio_enable_interrupt(GPIO_USB_C0_INT_ODL); - gpio_enable_interrupt(c1_int_line); + gpio_enable_interrupt(GPIO_USB_C0_CCSBU_OVP_ODL); + + gpio_enable_interrupt(GPIO_HDMI_HPD_SUB_ODL); + + /* Set LEDs luminance */ + pwm_set_duty(PWM_CH_LED_RED, 70); + pwm_set_duty(PWM_CH_LED_GREEN, 70); + pwm_set_duty(PWM_CH_LED_WHITE, 70); + + /*Enable Base Accel interrupt*/ + gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); /* * If interrupt lines are already low, schedule them to be processed * after inits are completed. */ - check_c0_line(); - check_c1_line(); - - gpio_enable_interrupt(GPIO_USB_C0_CCSBU_OVP_ODL); - /* Enable Base Accel interrupt */ - gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); - - /* Charger on the MB will be outputting PROCHOT_ODL and OD CHG_DET */ - sm5803_configure_gpio0(CHARGER_PRIMARY, GPIO0_MODE_PROCHOT, 1); - sm5803_configure_chg_det_od(CHARGER_PRIMARY, 1); + if (!gpio_get_level(GPIO_USB_C0_INT_ODL)) + hook_call_deferred(&check_c0_line_data, 0); - /* Charger on the sub-board will be a push-pull GPIO */ - sm5803_configure_gpio0(CHARGER_SECONDARY, GPIO0_MODE_OUTPUT, 0); + /* Setting scan mask KSO11, KSO12, KSO13 and KSO14 */ + keyscan_config.actual_key_mask[11] = 0xfe; + keyscan_config.actual_key_mask[12] = 0xff; + keyscan_config.actual_key_mask[13] = 0xff; + keyscan_config.actual_key_mask[14] = 0xff; - /* Turn on 5V if the system is on, otherwise turn it off */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | - CHIPSET_STATE_SOFT_OFF); - board_power_5v_enable(on); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -static void board_resume(void) -{ - sm5803_disable_low_power_mode(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_disable_low_power_mode(CHARGER_SECONDARY); -} -DECLARE_HOOK(HOOK_CHIPSET_RESUME, board_resume, HOOK_PRIO_DEFAULT); - -static void board_suspend(void) -{ - sm5803_enable_low_power_mode(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_enable_low_power_mode(CHARGER_SECONDARY); -} -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, board_suspend, HOOK_PRIO_DEFAULT); - void board_hibernate(void) { /* - * Put all charger ICs present into low power mode before entering - * z-state. + * Charger IC need to be put into their "low power mode" before + * entering the Z-state. + * + * b:186717219: In order to solve the power consumption problem of + * hibernate，HW solution is adopted after board id 3 to solve the + * problem that AC cannot wake up hibernate mode. */ - sm5803_hibernate(CHARGER_PRIMARY); - if (board_get_charger_chip_count() > 1) - sm5803_hibernate(CHARGER_SECONDARY); + raa489000_hibernate(0, true); } -__override void board_ocpc_init(struct ocpc_data *ocpc) +__override void board_pulse_entering_rw(void) { - /* There's no provision to measure Isys */ - ocpc->chg_flags[CHARGER_SECONDARY] |= OCPC_NO_ISYS_MEAS_CAP; + /* + * On the ITE variants, the EC_ENTERING_RW signal was connected to a pin + * which is active high by default. This causes Cr50 to think that the + * EC has jumped to its RW image even though this may not be the case. + * The pin is changed to GPIO_EC_ENTERING_RW2. + */ + gpio_set_level(GPIO_EC_ENTERING_RW, 1); + gpio_set_level(GPIO_EC_ENTERING_RW2, 1); + usleep(MSEC); + gpio_set_level(GPIO_EC_ENTERING_RW, 0); + gpio_set_level(GPIO_EC_ENTERING_RW2, 0); } void board_reset_pd_mcu(void) @@ -309,33 +375,24 @@ void board_reset_pd_mcu(void) */ } -__override void board_power_5v_enable(int enable) -{ - /* - * Motherboard has a GPIO to turn on the 5V regulator, but the sub-board - * sets it through the charger GPIO. - */ - gpio_set_level(GPIO_EN_PP5000, !!enable); - gpio_set_level(GPIO_EN_USB_A0_VBUS, !!enable); - if (sm5803_set_gpio0_level(1, !!enable)) - CPRINTUSB("Failed to %sable sub rails!", enable ? "en" : "dis"); -} - uint16_t tcpc_get_alert_status(void) { - /* - * TCPC 0 is embedded in the EC and processes interrupts in the chip - * code (it83xx/intc.c) - */ - uint16_t status = 0; int regval; - /* Check whether TCPC 1 pulled the shared interrupt line */ - if (!gpio_get_level(c1_int_line)) { - if (!tcpc_read16(1, TCPC_REG_ALERT, ®val)) { + /* + * The interrupt line is shared between the TCPC and BC1.2 detector IC. + * Therefore, go out and actually read the alert registers to report the + * alert status. + */ + if (!gpio_get_level(GPIO_USB_C0_INT_ODL)) { + if (!tcpc_read16(0, TCPC_REG_ALERT, ®val)) { + /* The TCPCI Rev 1.0 spec says to ignore bits 14:12. */ + if (!(tcpc_config[0].flags & TCPC_FLAGS_TCPCI_REV2_0)) + regval &= ~((1 << 14) | (1 << 13) | (1 << 12)); + if (regval) - status = PD_STATUS_TCPC_ALERT_1; + status |= PD_STATUS_TCPC_ALERT_0; } } @@ -348,95 +405,64 @@ void board_set_charge_limit(int port, int supplier, int charge_ma, int max_ma, int icl = MAX(charge_ma, CONFIG_CHARGER_INPUT_CURRENT); /* - * TODO(b/151955431): Characterize the input current limit in case a - * scaling needs to be applied here + * b/147463641: The charger IC seems to overdraw ~4%, therefore we + * reduce our target accordingly. */ + icl = icl * 96 / 100; charge_set_input_current_limit(icl, charge_mv); } -int board_set_active_charge_port(int port) -{ - int is_valid_port = (port >= 0 && port < board_get_usb_pd_port_count()); - - if (!is_valid_port && port != CHARGE_PORT_NONE) - return EC_ERROR_INVAL; - - if (port == CHARGE_PORT_NONE) { - CPRINTUSB("Disabling all charge ports"); - - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 0); - - if (board_get_charger_chip_count() > 1) - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 0); - - return EC_SUCCESS; - } - - CPRINTUSB("New chg p%d", port); - - /* - * Ensure other port is turned off, then enable new charge port - */ - if (port == 0) { - if (board_get_charger_chip_count() > 1) - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 0); - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 1); - - } else { - sm5803_vbus_sink_enable(CHARGER_PRIMARY, 0); - sm5803_vbus_sink_enable(CHARGER_SECONDARY, 1); - } - - return EC_SUCCESS; -} - -/* Vconn control for integrated ITE TCPC */ -void board_pd_vconn_ctrl(int port, enum usbpd_cc_pin cc_pin, int enabled) +__override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) { - /* Vconn control is only for port 0 */ - if (port) + if (port < 0 || port > board_get_usb_pd_port_count()) return; - if (cc_pin == USBPD_CC_PIN_1) - gpio_set_level(GPIO_EN_USB_C0_CC1_VCONN, !!enabled); - else - gpio_set_level(GPIO_EN_USB_C0_CC2_VCONN, !!enabled); + raa489000_set_output_current(port, rp); } -__override void ocpc_get_pid_constants(int *kp, int *kp_div, - int *ki, int *ki_div, - int *kd, int *kd_div) +int board_is_sourcing_vbus(int port) { - *kp = 3; - *kp_div = 14; + int regval; - *ki = 3; - *ki_div = 500; + tcpc_read(port, TCPC_REG_POWER_STATUS, ®val); + return !!(regval & TCPC_REG_POWER_STATUS_SOURCING_VBUS); - *kd = 4; - *kd_div = 40; } -__override void typec_set_source_current_limit(int port, enum tcpc_rp_value rp) +int board_set_active_charge_port(int port) { - int current; + if (port != 0 && port != CHARGE_PORT_NONE) + return EC_ERROR_INVAL; - if (port < 0 || port > CONFIG_USB_PD_PORT_MAX_COUNT) - return; + CPRINTUSB("New chg p%d", port); + + /* Disable all ports. */ + if (port == CHARGE_PORT_NONE) { + tcpc_write(0, TCPC_REG_COMMAND, + TCPC_REG_COMMAND_SNK_CTRL_LOW); + raa489000_enable_asgate(0, false); + return EC_SUCCESS; + } - current = (rp == TYPEC_RP_3A0) ? 3000 : 1500; + /* Check if port is sourcing VBUS. */ + if (board_is_sourcing_vbus(port)) { + CPRINTUSB("Skip enable p%d", port); + return EC_ERROR_INVAL; + } - charger_set_otg_current_voltage(port, current, 5000); + /* Enable requested charge port. */ + if (raa489000_enable_asgate(port, true) || + tcpc_write(0, TCPC_REG_COMMAND, + TCPC_REG_COMMAND_SNK_CTRL_HIGH)) { + CPRINTUSB("p%d: sink path enable failed.", port); + return EC_ERROR_UNKNOWN; + } + + return EC_SUCCESS; } /* PWM channels. Must be in the exactly same order as in enum pwm_channel. */ const struct pwm_t pwm_channels[] = { - [PWM_CH_KBLIGHT] = { - .channel = 0, - .flags = PWM_CONFIG_DSLEEP, - .freq_hz = 10000, - }, - [PWM_CH_LED_RED] = { .channel = 1, .flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW, @@ -449,105 +475,17 @@ const struct pwm_t pwm_channels[] = { .freq_hz = 2400, }, - [PWM_CH_LED_BLUE] = { + [PWM_CH_LED_WHITE] = { .channel = 3, .flags = PWM_CONFIG_DSLEEP | PWM_CONFIG_ACTIVE_LOW, .freq_hz = 2400, - } - -}; -BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); - -/* Sensor Mutexes */ -static struct mutex g_lid_mutex; -static struct mutex g_base_mutex; - -/* Sensor Data */ -static struct kionix_accel_data g_kx022_data; -static struct lsm6dsm_data lsm6dsm_data = LSM6DSM_DATA; - -/* Drivers */ -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 = NULL, - .default_range = 2, /* g */ - /* We only use 2g because its resolution is only 8-bits */ - .min_frequency = KX022_ACCEL_MIN_FREQ, - .max_frequency = KX022_ACCEL_MAX_FREQ, - .config = { - [SENSOR_CONFIG_EC_S0] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - }, - }, - }, - [BASE_ACCEL] = { - .name = "Base Accel", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_LSM6DSM, - .type = MOTIONSENSE_TYPE_ACCEL, - .location = MOTIONSENSE_LOC_BASE, - .drv = &lsm6dsm_drv, - .mutex = &g_base_mutex, - .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, - MOTIONSENSE_TYPE_ACCEL), - .int_signal = GPIO_BASE_SIXAXIS_INT_L, - .flags = MOTIONSENSE_FLAG_INT_SIGNAL, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, - .rot_standard_ref = NULL, - .default_range = 4, /* g */ - .min_frequency = LSM6DSM_ODR_MIN_VAL, - .max_frequency = LSM6DSM_ODR_MAX_VAL, - .config = { - [SENSOR_CONFIG_EC_S0] = { - .odr = 13000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - [SENSOR_CONFIG_EC_S3] = { - .odr = 10000 | ROUND_UP_FLAG, - .ec_rate = 100 * MSEC, - }, - }, - }, - [BASE_GYRO] = { - .name = "Base Gyro", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_LSM6DSM, - .type = MOTIONSENSE_TYPE_GYRO, - .location = MOTIONSENSE_LOC_BASE, - .drv = &lsm6dsm_drv, - .mutex = &g_base_mutex, - .drv_data = LSM6DSM_ST_DATA(lsm6dsm_data, - MOTIONSENSE_TYPE_GYRO), - .int_signal = GPIO_BASE_SIXAXIS_INT_L, - .flags = MOTIONSENSE_FLAG_INT_SIGNAL, - .port = I2C_PORT_SENSOR, - .i2c_spi_addr_flags = LSM6DSM_ADDR0_FLAGS, - .default_range = 1000 | ROUND_UP_FLAG, /* dps */ - .rot_standard_ref = NULL, - .min_frequency = LSM6DSM_ODR_MIN_VAL, - .max_frequency = LSM6DSM_ODR_MAX_VAL, }, }; - -const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); +BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); /* Thermistors */ const struct temp_sensor_t temp_sensors[] = { - [TEMP_SENSOR_1] = {.name = "Memory", + [TEMP_SENSOR_1] = {.name = "Charge", .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_51k1_47k_4050b, .idx = ADC_TEMP_SENSOR_1}, @@ -555,6 +493,10 @@ const struct temp_sensor_t temp_sensors[] = { .type = TEMP_SENSOR_TYPE_BOARD, .read = get_temp_3v3_51k1_47k_4050b, .idx = ADC_TEMP_SENSOR_2}, + [TEMP_SENSOR_3] = {.name = "5V_Inductor", + .type = TEMP_SENSOR_TYPE_BOARD, + .read = get_temp_3v3_51k1_47k_4050b, + .idx = ADC_TEMP_SENSOR_3}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); |