From 69c46d9377a09b8ddad9e350d39329dd966c0f83 Mon Sep 17 00:00:00 2001 From: Gwendal Grignou Date: Wed, 17 Mar 2021 17:07:20 -0700 Subject: kappa: Remove motion_sense task Kappa does not have any sensors, no need to have motion_sense task. BUG=none BRANCH=kukui TEST=compile Signed-off-by: Gwendal Grignou Change-Id: Icda2beec15278b25d7c9da1413152ba1e3ad608a Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2791770 Reviewed-by: Ting Shen Tested-by: Devin Lu --- board/kappa/board.c | 15 --------------- board/kappa/board.h | 24 ------------------------ board/kappa/ec.tasklist | 1 - board/kappa/gpio.inc | 2 -- 4 files changed, 42 deletions(-) (limited to 'board/kappa') diff --git a/board/kappa/board.c b/board/kappa/board.c index 5a174a7299..7030c71c72 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -251,11 +251,6 @@ static void board_init(void) /* Enable TCPC alert interrupts */ gpio_enable_interrupt(GPIO_USB_C0_PD_INT_ODL); -#ifdef SECTION_IS_RW - /* Enable interrupts from BMI160 sensor. */ - gpio_enable_interrupt(GPIO_ACCEL_INT_ODL); -#endif /* SECTION_IS_RW */ - /* Enable interrupt from PMIC. */ gpio_enable_interrupt(GPIO_PMIC_EC_RESETB); @@ -264,16 +259,6 @@ static void board_init(void) } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -/* Motion sensors */ -/* Mutexes */ -#ifdef SECTION_IS_RW -/* TODO: to be added once sensors land via CL:1714436 */ -struct motion_sensor_t motion_sensors[] = { -}; -const unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); - -#endif /* SECTION_IS_RW */ - /* Called on AP S5 -> S3 transition */ static void board_chipset_startup(void) { diff --git a/board/kappa/board.h b/board/kappa/board.h index 354692d0f8..d0ef7b623b 100644 --- a/board/kappa/board.h +++ b/board/kappa/board.h @@ -13,9 +13,7 @@ #define VARIANT_KUKUI_CHARGER_ISL9238 #define VARIANT_KUKUI_EC_STM32F098 -#ifndef SECTION_IS_RW #define VARIANT_KUKUI_NO_SENSORS -#endif /* SECTION_IS_RW */ #include "baseboard.h" @@ -45,25 +43,6 @@ #define CONFIG_USB_MUX_IT5205 -/* Motion Sensors */ -#ifdef SECTION_IS_RW -#define CONFIG_MAG_BMI_BMM150 -#define CONFIG_ACCELGYRO_SEC_ADDR_FLAGS BMM150_ADDR0_FLAGS -#define CONFIG_MAG_CALIBRATE -#define CONFIG_ACCELGYRO_BMI160 -#define CONFIG_ACCEL_INTERRUPTS -#define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL) -#define CONFIG_ALS - -#define ALS_COUNT 1 -#define CONFIG_ALS_TCS3400 -#define CONFIG_ALS_TCS3400_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(CLEAR_ALS) -#define CONFIG_ALS_TCS3400_EMULATED_IRQ_EVENT -#define CONFIG_ACCEL_FORCE_MODE_MASK BIT(CLEAR_ALS) - -#endif /* SECTION_IS_RW */ /* I2C ports */ #define I2C_PORT_BC12 0 @@ -74,9 +53,6 @@ #define I2C_PORT_IO_EXPANDER_IT8801 1 #define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY -/* Enable Accel over SPI */ -#define CONFIG_SPI_ACCEL_PORT 0 /* The first SPI master port (SPI2) */ - #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_EVENT #define CONFIG_MKBP_USE_GPIO diff --git a/board/kappa/ec.tasklist b/board/kappa/ec.tasklist index b695d05a71..c41e203780 100644 --- a/board/kappa/ec.tasklist +++ b/board/kappa/ec.tasklist @@ -11,7 +11,6 @@ TASK_ALWAYS(CHARGER, charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \ - TASK_ALWAYS_RW(MOTIONSENSE, motion_sense_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_ALWAYS(HOSTCMD, host_command_task, NULL, 1024) \ TASK_ALWAYS(CONSOLE, console_task, NULL, VENTI_TASK_STACK_SIZE) \ TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, LARGER_TASK_STACK_SIZE) \ diff --git a/board/kappa/gpio.inc b/board/kappa/gpio.inc index 1f3bd6cd9d..22f5feb751 100644 --- a/board/kappa/gpio.inc +++ b/board/kappa/gpio.inc @@ -21,8 +21,6 @@ GPIO_INT(PMIC_EC_RESETB, PIN(B, 7), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) GPIO_INT(WARM_RESET_REQ, PIN(A, 3), GPIO_INT_RISING | GPIO_PULL_DOWN, chipset_reset_request_interrupt) -GPIO_INT_RW(ACCEL_INT_ODL, PIN(A, 4), GPIO_INT_FALLING | GPIO_SEL_1P8V | GPIO_PULL_UP, - bmi160_interrupt) GPIO_INT_RO(EMMC_CMD, PIN(B, 15), GPIO_INT_FALLING, emmc_cmd_interrupt) GPIO_INT(SPI1_NSS, PIN(A, 15), GPIO_INT_BOTH | GPIO_PULL_UP, -- cgit v1.2.1