diff options
author | Sue Chen <sue.chen@quanta.corp-partner.google.com> | 2019-08-01 10:32:10 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-08-02 12:07:07 +0000 |
commit | d4ff5c13b13437e643d4f6642198ef214d71e5a0 (patch) | |
tree | 8a69467b874b09f64cf526637eb5b8f3ff3d349c /board | |
parent | dbe44d30babbd6f3856f379f3808603c2615afe9 (diff) | |
download | chrome-ec-d4ff5c13b13437e643d4f6642198ef214d71e5a0.tar.gz |
Kindred: remove OTP3001 ALS function for kindred/kled.
Clean up unused sensors for kindred/kled.
BUG=b:138262676
BRANCH=none
TEST=make buildall -j
Change-Id: I7b4f7693fc2c7f7ae72f20381a1ec8d1a71dbad7
Signed-off-by: Sue Chen <sue.chen@quanta.corp-partner.google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1730371
Reviewed-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Tested-by: David Huang <David.Huang@quantatw.com>
Diffstat (limited to 'board')
-rw-r--r-- | board/kindred/board.c | 35 | ||||
-rw-r--r-- | board/kindred/board.h | 7 |
2 files changed, 0 insertions, 42 deletions
diff --git a/board/kindred/board.c b/board/kindred/board.c index cedf1bb77c..6b5846df91 100644 --- a/board/kindred/board.c +++ b/board/kindred/board.c @@ -12,7 +12,6 @@ #include "cros_board_info.h" #include "driver/accel_bma2x2.h" #include "driver/accelgyro_bmi160.h" -#include "driver/als_opt3001.h" #include "driver/bc12/pi3usb9201.h" #include "driver/ppc/sn5s330.h" #include "driver/tcpm/anx7447.h" @@ -181,12 +180,6 @@ static struct bmi160_drv_data_t g_bmi160_data; /* BMA255 private data */ static struct accelgyro_saved_data_t g_bma255_data; -static struct opt3001_drv_data_t g_opt3001_data = { - .scale = 1, - .uscale = 0, - .offset = 0, -}; - /* Matrix to rotate accelrator into standard reference frame */ static const mat33_fp_t base_standard_ref = { { 0, FLOAT_TO_FP(1), 0}, @@ -275,37 +268,9 @@ struct motion_sensor_t motion_sensors[] = { .min_frequency = BMI160_GYRO_MIN_FREQ, .max_frequency = BMI160_GYRO_MAX_FREQ, }, - - [LID_ALS] = { - .name = "Light", - .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_OPT3001, - .type = MOTIONSENSE_TYPE_LIGHT, - .location = MOTIONSENSE_LOC_LID, - .drv = &opt3001_drv, - .drv_data = &g_opt3001_data, - .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = OPT3001_I2C_ADDR_FLAGS, - .rot_standard_ref = NULL, - .default_range = 0x2b11a1, - .min_frequency = OPT3001_LIGHT_MIN_FREQ, - .max_frequency = OPT3001_LIGHT_MAX_FREQ, - .config = { - /* Run ALS sensor in S0 */ - [SENSOR_CONFIG_EC_S0] = { - .odr = 1000, - }, - }, - }, }; unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); -/* ALS instances when LPC mapping is needed. Each entry directs to a sensor. */ -const struct motion_sensor_t *motion_als_sensors[] = { - &motion_sensors[LID_ALS], -}; -BUILD_ASSERT(ARRAY_SIZE(motion_als_sensors) == ALS_COUNT); - /******************************************************************************/ /* Physical fans. These are logically separate from pwm_channels. */ diff --git a/board/kindred/board.h b/board/kindred/board.h index c11499e535..e83a556751 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -38,16 +38,10 @@ #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT /* BMA253 Lid accel */ #define CONFIG_ACCEL_BMA255 -#define CONFIG_ACCEL_FORCE_MODE_MASK (BIT(LID_ACCEL) | BIT(LID_ALS)) #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL #define CONFIG_LID_ANGLE_UPDATE -/* OPT3001 ALS */ -#define CONFIG_ALS -#define ALS_COUNT 1 -#define CONFIG_ALS_OPT3001 -#define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS /* USB Type C and USB PD defines */ #define CONFIG_USB_PD_TCPM_ANX7447 @@ -136,7 +130,6 @@ enum sensor_id { LID_ACCEL = 0, BASE_ACCEL, BASE_GYRO, - LID_ALS, SENSOR_COUNT, }; |