diff options
| author | Bob Moragues <moragues@chromium.org> | 2020-03-31 02:28:56 +0000 |
|---|---|---|
| committer | Bob Moragues <moragues@chromium.org> | 2020-03-31 02:30:01 +0000 |
| commit | df477b8d075bd191fe4268102fd8047677186bf3 (patch) | |
| tree | f78113af1dda96ae22314966dda780d7cfcafad8 | |
| parent | 992eb796134c0f9d76ad4fab092bc5647d36b22c (diff) | |
| download | chrome-ec-df477b8d075bd191fe4268102fd8047677186bf3.tar.gz | |
Revert "nightfury: enable lid accelerometer lis2ds12"
This reverts commit 992eb796134c0f9d76ad4fab092bc5647d36b22c.
Reason for revert: Bad Cherry Pick
Original change's description:
> nightfury: enable lid accelerometer lis2ds12
>
> BUG=b:149226871
> BRANCH=none
> TEST=make -j BOARD=nightfury
> flash ec and run 'ectool motionsense'
>
> Signed-off-by: Inno.Park <ih.yoo.park@samsung.corp-partner.google.com>
> Change-Id: I698f8990b3da0970273da59ca95fd4d363723a1a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2123622
> Reviewed-by: Bob Moragues <moragues@chromium.org>
> Reviewed-by: Scott Collyer <scollyer@chromium.org>
> Tested-by: Bob Moragues <moragues@chromium.org>
> Commit-Queue: Bob Moragues <moragues@chromium.org>
> (cherry picked from commit e3c9d2ab77571008734279986aa9a12b1450e5ab)
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2124435
Bug: b:149226871
Change-Id: I28a40e8b6c26956976e0ea647f45631927f35920
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2128902
Reviewed-by: Bob Moragues <moragues@chromium.org>
Commit-Queue: Bob Moragues <moragues@chromium.org>
Tested-by: Bob Moragues <moragues@chromium.org>
Auto-Submit: Bob Moragues <moragues@chromium.org>
| -rw-r--r-- | board/nightfury/board.c | 26 | ||||
| -rw-r--r-- | board/nightfury/board.h | 6 |
2 files changed, 9 insertions, 23 deletions
diff --git a/board/nightfury/board.c b/board/nightfury/board.c index 18218c7ecd..816623a1b2 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -10,7 +10,7 @@ #include "button.h" #include "common.h" #include "cros_board_info.h" -#include "driver/accel_lis2ds.h" +#include "driver/accel_bma2x2.h" #include "driver/accelgyro_bmi160.h" #include "driver/als_bh1730.h" #include "driver/als_tcs3400.h" @@ -165,20 +165,8 @@ static struct mutex g_lid_mutex; /* Base accel private data */ static struct bmi160_drv_data_t g_bmi160_data; -<<<<<<< HEAD (92b319 nightfury: remove lid als/rgb sensor and camera sync) /* BMA255 private data */ static struct accelgyro_saved_data_t g_bma255_data; -======= -/* Base light sensor private data */ -static struct opt3001_drv_data_t g_opt3001_data = { - .scale = 1, - .uscale = 0, - .offset = 0, -}; - -/* LIS2DS private data */ -static struct stprivate_data g_lis2ds_data; ->>>>>>> CHANGE (e3c9d2 nightfury: enable lid accelerometer lis2ds12) /* BH1730 private data */ struct bh1730_drv_data_t g_bh1730_data; @@ -205,17 +193,17 @@ struct motion_sensor_t motion_sensors[] = { [LID_ACCEL] = { .name = "Lid Accel", .active_mask = SENSOR_ACTIVE_S0_S3, - .chip = MOTIONSENSE_CHIP_LIS2DS, + .chip = MOTIONSENSE_CHIP_BMA255, .type = MOTIONSENSE_TYPE_ACCEL, .location = MOTIONSENSE_LOC_LID, - .drv = &lis2ds_drv, + .drv = &bma2x2_accel_drv, .mutex = &g_lid_mutex, - .drv_data = &g_lis2ds_data, + .drv_data = &g_bma255_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = LIS2DS_ADDR1_FLAGS, + .i2c_spi_addr_flags = BMA2x2_I2C_ADDR1_FLAGS, .rot_standard_ref = &lid_standard_ref, - .min_frequency = LIS2DS_ODR_MIN_VAL, - .max_frequency = LIS2DS_ODR_MAX_VAL, + .min_frequency = BMA255_ACCEL_MIN_FREQ, + .max_frequency = BMA255_ACCEL_MAX_FREQ, .default_range = 2, /* g, to support lid angle calculation. */ .config = { /* EC use accel for angle detection */ diff --git a/board/nightfury/board.h b/board/nightfury/board.h index 28f7bafc30..9a0a8e6d6e 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -36,10 +36,8 @@ #define CONFIG_ACCELGYRO_BMI160_INT_EVENT \ TASK_EVENT_MOTION_SENSOR_INTERRUPT(BASE_ACCEL) #define CONFIG_ACCELGYRO_BMI160_INT2_OUTPUT -/* LIS2DS Lid accel */ -#define CONFIG_ACCEL_LIS2DS -#define CONFIG_ACCEL_LIS2DS_INT_EVENT \ - TASK_EVENT_MOTION_SENSOR_INTERRUPT(LID_ACCEL) +/* BMA253 Lid accel */ +#define CONFIG_ACCEL_BMA255 #define CONFIG_LID_ANGLE #define CONFIG_LID_ANGLE_SENSOR_BASE BASE_ACCEL #define CONFIG_LID_ANGLE_SENSOR_LID LID_ACCEL |