From 1f37c24033121cce0eb83f2adab49407bfdb3942 Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Wed, 22 Jun 2022 10:00:31 +0800 Subject: crota: add more BYD battery support BUG=b:236739228 BRANCH=none TEST=make -j BOARD=crota Signed-off-by: Peter Chi Change-Id: I73f4b5da9243d9161743276c68e8011264c602d6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3716430 Commit-Queue: caveh jalali Reviewed-by: caveh jalali --- board/crota/board.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 46f3eb7755..3b0bea06dc 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -234,7 +234,7 @@ enum ioex_port { enum battery_type { BATTERY_ATL, - BATTERY_BYD, + BATTERY_BYD_GSL4, BATTERY_COM, BATTERY_LGC, BATTERY_SMP_ATL3, @@ -243,6 +243,7 @@ enum battery_type { BATTERY_SWD_COS3, BATTERY_SMP_ATL4, BATTERY_SMP_COS4, + BATTERY_BYD_CSL4, BATTERY_SWD_ATL4, BATTERY_SWD_COS4, BATTERY_TYPE_COUNT -- cgit v1.2.1 From a11e8ae9dcdd295122e36105f5a4ab14abb2348d Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Mon, 16 May 2022 09:32:25 +0800 Subject: crota: add custom fan control BUG=b:232656160 BRANCH=none TEST=make -j BOARD=crota Signed-off-by: Peter Chi Change-Id: I1dbafced042678af75f714121d421ff0f263dba7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3650086 Reviewed-by: Boris Mittelberg --- board/crota/board.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 3b0bea06dc..e972cf3425 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -188,6 +188,10 @@ #define CONFIG_LED_ONOFF_STATES #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10 +/* Fan features */ +#define CONFIG_CUSTOM_FAN_CONTROL +#define CONFIG_FAN_DYNAMIC + /* Charger defines */ #define CONFIG_CHARGER_BQ25720 #define CONFIG_CHARGER_BQ25720_VSYS_TH2_CUSTOM @@ -204,18 +208,18 @@ #include "usbc_config.h" enum adc_channel { - ADC_TEMP_SENSOR_1_DDR_SOC, - ADC_TEMP_SENSOR_2_AMBIENT, + ADC_TEMP_SENSOR_1_SOC, + ADC_TEMP_SENSOR_2_DDR, ADC_TEMP_SENSOR_3_CHARGER, - ADC_TEMP_SENSOR_4_WWAN, + ADC_TEMP_SENSOR_4_AMBIENT, ADC_CH_COUNT }; enum temp_sensor_id { - TEMP_SENSOR_1_DDR_SOC, - TEMP_SENSOR_2_AMBIENT, + TEMP_SENSOR_1_SOC, + TEMP_SENSOR_2_DDR, TEMP_SENSOR_3_CHARGER, - TEMP_SENSOR_4_WWAN, + TEMP_SENSOR_4_AMBIENT, TEMP_SENSOR_COUNT }; -- cgit v1.2.1 From f19210efe1a3897ff182d272466a5cade7175cc5 Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Tue, 28 Jun 2022 09:24:29 +0000 Subject: Revert "crota: add power share support" This reverts commit aa949e591d8261a387315f211492062a4779cf4e. Reason for revert: Because firmware_ECUsbPorts test will FAILED when power share support, so we need revert this CL to make sure the test PASS. Original change's description: > crota: add power share support > > We need add feture for power share in S5/G3 state. > > BUG=b:230074336, b:230083233 > BRANCH=none > TEST=make -j BOARD=crota > > Signed-off-by: Peter Chi > Change-Id: Ic95887aeffea90b35159056af121f81513975ab2 > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3602116 > Commit-Queue: Boris Mittelberg > Reviewed-by: Boris Mittelberg Bug: b:230074336, b:230083233 Change-Id: I55c95b1a352001589d94fd2f3f6b265cc48e63e7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3731770 Tested-by: Peter Chi Auto-Submit: Peter Chi Commit-Queue: Boris Mittelberg Reviewed-by: Boris Mittelberg --- board/crota/board.h | 1 - 1 file changed, 1 deletion(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index e972cf3425..9343e1b111 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -56,7 +56,6 @@ /* USB Type A Features */ #define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB -#define CONFIG_USB_PORT_POWER_DUMB_CUSTOM_HOOK /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_REQUIRE_AP_MODE_ENTRY -- cgit v1.2.1 From 0c110ab2873d2b5146d404b3975a1fe9ed10b16b Mon Sep 17 00:00:00 2001 From: Jack Rosenthal Date: Mon, 27 Jun 2022 13:28:56 -0600 Subject: board/crota/board.h: Format with clang-format BUG=b:236386294 BRANCH=none TEST=none Change-Id: Iffaf4cfac43a3c14400c0e740a8c52ab4313bb3b Signed-off-by: Jack Rosenthal Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3728190 Reviewed-by: Jeremy Bettis --- board/crota/board.h | 151 +++++++++++++++++++++++----------------------------- 1 file changed, 68 insertions(+), 83 deletions(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 9343e1b111..5cd94147fd 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -22,7 +22,7 @@ #define CONFIG_MP2964 /* Sensors */ -#define CONFIG_ACCELGYRO_LSM6DSO /* Base accel */ +#define CONFIG_ACCELGYRO_LSM6DSO /* Base accel */ #define CONFIG_ACCEL_LSM6DSO_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) @@ -36,14 +36,14 @@ /* Lid accel */ #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_LID_ANGLE_SENSOR_BASE BASE_ACCEL +#define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL #define CONFIG_ACCEL_LIS2DWL #define CONFIG_ACCEL_LIS2DW12_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL) #define CONFIG_BODY_DETECTION -#define CONFIG_BODY_DETECTION_SENSOR BASE_ACCEL +#define CONFIG_BODY_DETECTION_SENSOR BASE_ACCEL #define CONFIG_BODY_DETECTION_VAR_NOISE_FACTOR 150 /* % */ #define CONFIG_GESTURE_DETECTION #define CONFIG_GESTURE_DETECTION_MASK BIT(CONFIG_BODY_DETECTION_SENSOR) @@ -54,7 +54,7 @@ #define CONFIG_CMD_ACCEL_INFO /* USB Type A Features */ -#define USB_PORT_COUNT 1 +#define USB_PORT_COUNT 1 #define CONFIG_USB_PORT_POWER_DUMB /* USB Type C and USB PD defines */ @@ -62,7 +62,7 @@ #define CONFIG_IO_EXPANDER #define CONFIG_IO_EXPANDER_NCT38XX -#define CONFIG_IO_EXPANDER_PORT_COUNT 2 +#define CONFIG_IO_EXPANDER_PORT_COUNT 2 #define CONFIG_USBC_RETIMER_INTEL_BB @@ -77,17 +77,17 @@ #define CONFIG_USB_PD_FRS_PPC /* TODO: b/177608416 - measure and check these values on brya */ -#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ -#define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#define PD_VCONN_SWAP_DELAY 5000 /* us */ +#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ +#define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ +#define PD_VCONN_SWAP_DELAY 5000 /* us */ /* * Passive USB-C cables only support up to 60W. */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 +#define PD_OPERATING_POWER_MW 15000 +#define PD_MAX_POWER_MW 60000 +#define PD_MAX_CURRENT_MA 3000 +#define PD_MAX_VOLTAGE_MV 20000 /* * Macros for GPIO signals used in common code that don't match the @@ -95,35 +95,35 @@ * then redefined here to so it's more clear which signal is being used for * which purpose. */ -#define GPIO_AC_PRESENT GPIO_ACOK_OD -#define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL -#define GPIO_EC_INT_L GPIO_EC_PCH_INT_ODL -#define GPIO_ENABLE_BACKLIGHT GPIO_EC_EN_EDP_BL -#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW -#define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV -#define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE -#define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL -#define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_L -#define GPIO_PCH_RTCRST GPIO_EC_PCH_RTCRST -#define GPIO_PCH_SLP_S0_L GPIO_SYS_SLP_S0IX_L -#define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L -#define GPIO_TEMP_SENSOR_POWER GPIO_SEQ_EC_DSW_PWROK +#define GPIO_AC_PRESENT GPIO_ACOK_OD +#define GPIO_CPU_PROCHOT GPIO_EC_PROCHOT_ODL +#define GPIO_EC_INT_L GPIO_EC_PCH_INT_ODL +#define GPIO_ENABLE_BACKLIGHT GPIO_EC_EN_EDP_BL +#define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW +#define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV +#define GPIO_PACKET_MODE_EN GPIO_EC_GSC_PACKET_MODE +#define GPIO_PCH_PWRBTN_L GPIO_EC_PCH_PWR_BTN_ODL +#define GPIO_PCH_RSMRST_L GPIO_EC_PCH_RSMRST_L +#define GPIO_PCH_RTCRST GPIO_EC_PCH_RTCRST +#define GPIO_PCH_SLP_S0_L GPIO_SYS_SLP_S0IX_L +#define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L +#define GPIO_TEMP_SENSOR_POWER GPIO_SEQ_EC_DSW_PWROK /* * GPIO_EC_PCH_INT_ODL is used for MKBP events as well as a PCH wakeup * signal. */ -#define GPIO_PCH_WAKE_L GPIO_EC_PCH_INT_ODL -#define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_SEQ_EC_ALL_SYS_PG -#define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK -#define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL -#define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL -#define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL -#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL -#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL -#define GPIO_WP_L GPIO_EC_WP_ODL - -#define GPIO_ID_1_EC_KB_BL_EN GPIO_EC_BATT_PRES_ODL +#define GPIO_PCH_WAKE_L GPIO_EC_PCH_INT_ODL +#define GPIO_PG_EC_ALL_SYS_PWRGD GPIO_SEQ_EC_ALL_SYS_PG +#define GPIO_PG_EC_DSW_PWROK GPIO_SEQ_EC_DSW_PWROK +#define GPIO_PG_EC_RSMRST_ODL GPIO_SEQ_EC_RSMRST_ODL +#define GPIO_POWER_BUTTON_L GPIO_GSC_EC_PWR_BTN_ODL +#define GPIO_SYS_RESET_L GPIO_SYS_RST_ODL +#define GPIO_VOLUME_DOWN_L GPIO_EC_VOLDN_BTN_ODL +#define GPIO_VOLUME_UP_L GPIO_EC_VOLUP_BTN_ODL +#define GPIO_WP_L GPIO_EC_WP_ODL + +#define GPIO_ID_1_EC_KB_BL_EN GPIO_EC_BATT_PRES_ODL /* System has back-lit keyboard */ #define CONFIG_PWM_KBLIGHT @@ -133,35 +133,35 @@ /* I2C Bus Configuration */ -#define I2C_PORT_SENSOR NPCX_I2C_PORT0_0 +#define I2C_PORT_SENSOR NPCX_I2C_PORT0_0 -#define I2C_PORT_USB_C0_C1_TCPC NPCX_I2C_PORT1_0 -#define I2C_PORT_USB_C1_TCPC NPCX_I2C_PORT4_1 +#define I2C_PORT_USB_C0_C1_TCPC NPCX_I2C_PORT1_0 +#define I2C_PORT_USB_C1_TCPC NPCX_I2C_PORT4_1 -#define I2C_PORT_USB_C0_C1_PPC NPCX_I2C_PORT2_0 -#define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT6_1 +#define I2C_PORT_USB_C0_C1_PPC NPCX_I2C_PORT2_0 +#define I2C_PORT_USB_C1_PPC NPCX_I2C_PORT6_1 -#define I2C_PORT_USB_C0_C1_BC12 NPCX_I2C_PORT2_0 -#define I2C_PORT_USB_C1_BC12 NPCX_I2C_PORT6_1 +#define I2C_PORT_USB_C0_C1_BC12 NPCX_I2C_PORT2_0 +#define I2C_PORT_USB_C1_BC12 NPCX_I2C_PORT6_1 -#define I2C_PORT_USB_C0_C1_MUX NPCX_I2C_PORT3_0 -#define I2C_PORT_USB_C1_MUX NPCX_I2C_PORT6_1 +#define I2C_PORT_USB_C0_C1_MUX NPCX_I2C_PORT3_0 +#define I2C_PORT_USB_C1_MUX NPCX_I2C_PORT6_1 -#define I2C_PORT_BATTERY NPCX_I2C_PORT5_0 -#define I2C_PORT_CHARGER NPCX_I2C_PORT7_0 -#define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 -#define I2C_PORT_MP2964 NPCX_I2C_PORT7_0 +#define I2C_PORT_BATTERY NPCX_I2C_PORT5_0 +#define I2C_PORT_CHARGER NPCX_I2C_PORT7_0 +#define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 +#define I2C_PORT_MP2964 NPCX_I2C_PORT7_0 -#define I2C_ADDR_EEPROM_FLAGS 0x50 +#define I2C_ADDR_EEPROM_FLAGS 0x50 -#define I2C_ADDR_MP2964_FLAGS 0x20 +#define I2C_ADDR_MP2964_FLAGS 0x20 /* * see b/174768555#comment22 */ -#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x58 -#define USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR 0x54 +#define USBC_PORT_C0_BB_RETIMER_I2C_ADDR 0x58 +#define USBC_PORT_C1_SOC_BB_RETIMER_I2C_ADDR 0x54 /* Type-C connector facing Burnside Bridge retimer */ -#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x56 +#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR 0x56 /* Enabling Thunderbolt-compatible mode */ #define CONFIG_USB_PD_TBT_COMPAT_MODE @@ -181,7 +181,7 @@ #define CONFIG_TEMP_SENSOR_POWER #define CONFIG_STEINHART_HART_3V3_30K9_47K_4050B -#define CONFIG_FANS FAN_CH_COUNT +#define CONFIG_FANS FAN_CH_COUNT /* LED defines */ #define CONFIG_LED_ONOFF_STATES @@ -194,15 +194,15 @@ /* Charger defines */ #define CONFIG_CHARGER_BQ25720 #define CONFIG_CHARGER_BQ25720_VSYS_TH2_CUSTOM -#define CONFIG_CHARGER_BQ25720_VSYS_TH2_DV 70 +#define CONFIG_CHARGER_BQ25720_VSYS_TH2_DV 70 #define CONFIG_CHARGE_RAMP_SW -#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC 10 +#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR 10 +#define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC 10 #define CONFIG_CHARGER_BQ25710_PSYS_SENSING #ifndef __ASSEMBLER__ -#include "gpio_signal.h" /* needed by registers.h */ +#include "gpio_signal.h" /* needed by registers.h */ #include "registers.h" #include "usbc_config.h" @@ -222,18 +222,9 @@ enum temp_sensor_id { TEMP_SENSOR_COUNT }; -enum sensor_id { - LID_ACCEL = 0, - BASE_ACCEL, - BASE_GYRO, - SENSOR_COUNT -}; +enum sensor_id { LID_ACCEL = 0, BASE_ACCEL, BASE_GYRO, SENSOR_COUNT }; -enum ioex_port { - IOEX_C0_NCT38XX = 0, - IOEX_C1_NCT38XX, - IOEX_PORT_COUNT -}; +enum ioex_port { IOEX_C0_NCT38XX = 0, IOEX_C1_NCT38XX, IOEX_PORT_COUNT }; enum battery_type { BATTERY_ATL, @@ -253,22 +244,16 @@ enum battery_type { }; enum pwm_channel { - PWM_CH_LED2 = 0, /* PWM0 (white charger) */ - PWM_CH_LED1, /* PWM2 (orange charger) */ - PWM_CH_KBLIGHT, /* PWM3 */ - PWM_CH_FAN, /* PWM5 */ + PWM_CH_LED2 = 0, /* PWM0 (white charger) */ + PWM_CH_LED1, /* PWM2 (orange charger) */ + PWM_CH_KBLIGHT, /* PWM3 */ + PWM_CH_FAN, /* PWM5 */ PWM_CH_COUNT }; -enum fan_channel { - FAN_CH_0 = 0, - FAN_CH_COUNT -}; +enum fan_channel { FAN_CH_0 = 0, FAN_CH_COUNT }; -enum mft_channel { - MFT_CH_0 = 0, - MFT_CH_COUNT -}; +enum mft_channel { MFT_CH_0 = 0, MFT_CH_COUNT }; #endif /* !__ASSEMBLER__ */ -- cgit v1.2.1 From b958d4835cbc4aa6cc7ed357fe895c546dc354ed Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Tue, 26 Jul 2022 18:41:35 +0800 Subject: crota: enable BBR firmware update BUG=b:240242331 BRANCH=none TEST=make -j BOARD=crota TEST=boot into OS and no type-c function lost Signed-off-by: Peter Chi Change-Id: I2c08370a86801313c26f3613e7d5b541746d2959 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3787372 Reviewed-by: Boris Mittelberg Commit-Queue: Boris Mittelberg --- board/crota/board.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 5cd94147fd..5ab17f70b3 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -169,11 +169,8 @@ /* Enabling USB4 mode */ #define CONFIG_USB_PD_USB4 -/* - * TODO: b/229934138, Disable BBR firmware update temporarily. - */ /* Retimer */ -#undef CONFIG_USBC_RETIMER_FW_UPDATE +#define CONFIG_USBC_RETIMER_FW_UPDATE /* Thermal features */ #define CONFIG_THERMISTOR -- cgit v1.2.1 From 18e2818a999503c3f130fc71379488047b4cef89 Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Fri, 22 Jul 2022 14:41:42 +0800 Subject: crota: modify fan rpm range and rpm deviation Crota's fan speed is control by four sensors, and sensor SOC has two slopes for fan speed, so we have five tables. Priority is: Charger > SOC > DDR > Ambient, and the sensor table decided on priorty sensor. Currently rpm deviation is 7%, It will cause [ectool pwmsetfanrpm 4000] and [ectool pwmgetfanrpm] not accurate. BUG=b:241191468 BRANCH=none TEST=make -j BOARD=crota Signed-off-by: Peter Chi Change-Id: I7ea9c53f168b2ab3f050b87006adb772c9f08ba4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3782467 Reviewed-by: Boris Mittelberg --- board/crota/board.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 5ab17f70b3..bd9d4dc3d4 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -178,15 +178,15 @@ #define CONFIG_TEMP_SENSOR_POWER #define CONFIG_STEINHART_HART_3V3_30K9_47K_4050B -#define CONFIG_FANS FAN_CH_COUNT - /* LED defines */ #define CONFIG_LED_ONOFF_STATES #define CONFIG_LED_ONOFF_STATES_BAT_LOW 10 /* Fan features */ #define CONFIG_CUSTOM_FAN_CONTROL +#define CONFIG_FANS FAN_CH_COUNT #define CONFIG_FAN_DYNAMIC +#define RPM_DEVIATION 1 /* Charger defines */ #define CONFIG_CHARGER_BQ25720 @@ -250,6 +250,15 @@ enum pwm_channel { enum fan_channel { FAN_CH_0 = 0, FAN_CH_COUNT }; +enum fan_rpm_table { + RPM_TABLE_CPU0, + RPM_TABLE_CPU1, + RPM_TABLE_DDR, + RPM_TABLE_CHARGER, + RPM_TABLE_AMBIENT, + FAN_RPM_TABLE_COUNT +}; + enum mft_channel { MFT_CH_0 = 0, MFT_CH_COUNT }; #endif /* !__ASSEMBLER__ */ -- cgit v1.2.1 From e59daf9807124fb5752781e2e51caa3fe1fe7e89 Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Tue, 2 Aug 2022 13:30:10 +0800 Subject: crota: determine motion sensors by board id and GPIO BUG=b:241202017 BRANCH=none TEST=make -j BOARD=crota Signed-off-by: Peter Chi Change-Id: I3821c9d4df91ee63bb5d7184b2613ed623cc32c4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3802290 Commit-Queue: Boris Mittelberg Reviewed-by: Boris Mittelberg Reviewed-by: caveh jalali --- board/crota/board.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index bd9d4dc3d4..779a170b9a 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -22,7 +22,11 @@ #define CONFIG_MP2964 /* Sensors */ -#define CONFIG_ACCELGYRO_LSM6DSO /* Base accel */ +#define CONFIG_ACCELGYRO_BMI260 /* Base accel/gyro */ +#define CONFIG_ACCELGYRO_BMI260_INT_EVENT \ + TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) + +#define CONFIG_ACCELGYRO_LSM6DSO /* Base accel/gyro */ #define CONFIG_ACCEL_LSM6DSO_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) @@ -152,6 +156,9 @@ #define I2C_PORT_EEPROM NPCX_I2C_PORT7_0 #define I2C_PORT_MP2964 NPCX_I2C_PORT7_0 +/* define this to avoid error on CONFIG_ACCELGYRO_BMI_COMM_I2C */ +#define I2C_PORT_ACCEL I2C_PORT_SENSOR + #define I2C_ADDR_EEPROM_FLAGS 0x50 #define I2C_ADDR_MP2964_FLAGS 0x20 @@ -261,6 +268,8 @@ enum fan_rpm_table { enum mft_channel { MFT_CH_0 = 0, MFT_CH_COUNT }; +void motion_interrupt(enum gpio_signal signal); + #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ -- cgit v1.2.1 From 562d70b42e06cd1b1055691cbe9fae686c417add Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Wed, 17 Aug 2022 14:31:52 -0600 Subject: brya: Enable Data Reset Enable Data Reset on brya variants for testing. BUG=b:209633789 TEST=make buildall; observe repeated DP/TBT/USB4 entry/exit BRANCH=none Signed-off-by: Abe Levkoy Change-Id: Ic43ae98c1b5407d93f7224c8ba4f40ccb287e408 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3840665 Reviewed-by: Boris Mittelberg --- board/crota/board.h | 1 + 1 file changed, 1 insertion(+) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 779a170b9a..a2a6bfa896 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -175,6 +175,7 @@ /* Enabling USB4 mode */ #define CONFIG_USB_PD_USB4 +#define CONFIG_USB_PD_DATA_RESET_MSG /* Retimer */ #define CONFIG_USBC_RETIMER_FW_UPDATE -- cgit v1.2.1 From 38051cd038d53623ab2345317bc4cb7513c5a02f Mon Sep 17 00:00:00 2001 From: Peter Chi Date: Fri, 19 Aug 2022 16:33:28 +0800 Subject: crota: allow PROCHOT when unplugging AC adapter BUG=b:243609867 BRANCH=none TEST=make -j BOARD=crota Signed-off-by: Peter Chi Change-Id: I645b5ec72b2ede9c57696be2c19c1354aac3baea Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3841542 Reviewed-by: caveh jalali Commit-Queue: caveh jalali --- board/crota/board.h | 1 + 1 file changed, 1 insertion(+) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index a2a6bfa896..1b72eae84d 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -204,6 +204,7 @@ #define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR 10 #define CONFIG_CHARGER_BQ25710_SENSE_RESISTOR_AC 10 #define CONFIG_CHARGER_BQ25710_PSYS_SENSING +#define CONFIG_CHARGER_BQ25710_PP_ACOK #ifndef __ASSEMBLER__ -- cgit v1.2.1 From 71b2ef709dcb14260f5fdaa3ab4ced005a29fb46 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 12 Sep 2022 14:54:36 -0400 Subject: Update license boilerplate text in source code files Normally we don't do this, but enough changes have accumulated that we're doing a tree-wide one-off update of the name & style. BRANCH=none BUG=chromium:1098010 TEST=`repo upload` works Change-Id: Icd3a1723c20595356af83d190b2c6a9078b3013b Signed-off-by: Mike Frysinger Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3891203 Reviewed-by: Jeremy Bettis Reviewed-by: Jack Rosenthal --- board/crota/board.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/crota/board.h') diff --git a/board/crota/board.h b/board/crota/board.h index 1b72eae84d..0271a369bc 100644 --- a/board/crota/board.h +++ b/board/crota/board.h @@ -1,4 +1,4 @@ -/* Copyright 2022 The Chromium OS Authors. All rights reserved. +/* Copyright 2022 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -- cgit v1.2.1