diff options
| author | Jongpil Jung <jongpil19.jung@samsung.com> | 2020-03-13 19:57:10 +0900 |
|---|---|---|
| committer | Bob Moragues <moragues@chromium.org> | 2020-03-31 03:42:28 +0000 |
| commit | 687a38a995a1b2071ca4cfad826495b7d301c177 (patch) | |
| tree | 41eeeb43c8fa1e7b213703d601915cc7a5b9d59b | |
| parent | 79c4fdbeac165a4f8a441af98dcf39da1e10e8e8 (diff) | |
| download | chrome-ec-687a38a995a1b2071ca4cfad826495b7d301c177.tar.gz | |
nightfury: Enable base light sensor
nightfury uses opt3001 for base ALS sensor.
So we need to update board files for nightfury.
BUG=b:149226871
BRANCH=firmware-hatch-12672.B
TEST=emerge-hatch chromeos-ec
flash ec and check ectool motionsense
Signed-off-by: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Change-Id: I86ee37140d1a74d85baec53e0dd8792bd6b77362
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2100563
Reviewed-by: Bob Moragues <moragues@chromium.org>
Reviewed-by: Scott Collyer <scollyer@chromium.org>
Commit-Queue: Bob Moragues <moragues@chromium.org>
(cherry picked from commit 26900d2e8c76f9b04d560def5aa459fd42742341)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2120754
Tested-by: Bob Moragues <moragues@chromium.org>
(cherry picked from commit 7821038e234786255a6316424bf0f6e7fccdf29d)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2128896
| -rw-r--r-- | board/nightfury/board.c | 28 | ||||
| -rw-r--r-- | board/nightfury/board.h | 3 |
2 files changed, 18 insertions, 13 deletions
diff --git a/board/nightfury/board.c b/board/nightfury/board.c index 049999d73c..841550330d 100644 --- a/board/nightfury/board.c +++ b/board/nightfury/board.c @@ -12,7 +12,7 @@ #include "cros_board_info.h" #include "driver/accel_lis2ds.h" #include "driver/accelgyro_bmi160.h" -#include "driver/als_bh1730.h" +#include "driver/als_opt3001.h" #include "driver/als_tcs3400.h" #include "driver/ppc/sn5s330.h" #include "driver/bc12/pi3usb9201.h" @@ -164,12 +164,16 @@ static struct mutex g_lid_mutex; /* Base accel private data */ static struct bmi160_drv_data_t g_bmi160_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; -/* BH1730 private data */ -struct bh1730_drv_data_t g_bh1730_data; - /* Matrix to rotate accelrator into standard reference frame */ static const mat33_fp_t base_standard_ref = { { 0, FLOAT_TO_FP(1), 0}, @@ -262,20 +266,20 @@ struct motion_sensor_t motion_sensors[] = { [BASE_ALS] = { .name = "Light", .active_mask = SENSOR_ACTIVE_S0, - .chip = MOTIONSENSE_CHIP_BH1730, + .chip = MOTIONSENSE_CHIP_OPT3001, .type = MOTIONSENSE_TYPE_LIGHT, .location = MOTIONSENSE_LOC_BASE, - .drv = &bh1730_drv, - .drv_data = &g_bh1730_data, + .drv = &opt3001_drv, + .drv_data = &g_opt3001_data, .port = I2C_PORT_ACCEL, - .i2c_spi_addr_flags = BH1730_I2C_ADDR_FLAGS, + .i2c_spi_addr_flags = OPT3001_I2C_ADDR_FLAGS, .rot_standard_ref = NULL, - .default_range = 65535, - .min_frequency = 10, - .max_frequency = 10, + .default_range = 0x10000, /* scale = 1; uscale = 0 */ + .min_frequency = OPT3001_LIGHT_MIN_FREQ, + .max_frequency = OPT3001_LIGHT_MAX_FREQ, .config = { [SENSOR_CONFIG_EC_S0] = { - .odr = 100000, + .odr = 1000, .ec_rate = 0, }, }, diff --git a/board/nightfury/board.h b/board/nightfury/board.h index 32bf9274a3..e0e0cd8d56 100644 --- a/board/nightfury/board.h +++ b/board/nightfury/board.h @@ -48,7 +48,8 @@ #define CONFIG_ALS #define ALS_COUNT 1 #define I2C_PORT_ALS I2C_PORT_SENSOR -#define CONFIG_ALS_BH1730 +#define CONFIG_ALS_OPT3001 +#define OPT3001_I2C_ADDR_FLAGS OPT3001_I2C_ADDR1_FLAGS /* Sensors without hardware FIFO are in forced mode */ #define CONFIG_ACCEL_FORCE_MODE_MASK \ |