From a8ea3bfdbe928b9bcf2d3756a2fae16fe40132ae Mon Sep 17 00:00:00 2001 From: Gwendal Grignou Date: Wed, 8 Jan 2020 11:00:45 -0800 Subject: driver/opt3100: Set min/max frequency that match the driver Given we set integration time at 800ms, the host must be aware to not set an ODR over 1Hz. BUG=chromium:615059 BRANCH=nocturne TEST=Check new max_frequency is indeed 1Hz on nocturne. Change-Id: I44252073f59e00cdf4d13b4fa6d88448537c168e Signed-off-by: Gwendal Grignou Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1991857 Reviewed-by: Nick Vaccaro --- driver/als_opt3001.c | 4 ++-- driver/als_opt3001.h | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/driver/als_opt3001.c b/driver/als_opt3001.c index e6332184c0..8f1e2bc775 100644 --- a/driver/als_opt3001.c +++ b/driver/als_opt3001.c @@ -214,8 +214,8 @@ static int opt3001_set_data_rate(const struct motion_sensor_t *s, * integrating over 800ms. * Do not allow range higher than 1Hz. */ - if (rate > 1000) - rate = 1000; + if (rate > OPT3001_LIGHT_MAX_FREQ) + rate = OPT3001_LIGHT_MAX_FREQ; } rv = opt3001_i2c_read(s->port, s->i2c_spi_addr_flags, OPT3001_REG_CONFIGURE, ®); diff --git a/driver/als_opt3001.h b/driver/als_opt3001.h index 6706734870..96b47232d1 100644 --- a/driver/als_opt3001.h +++ b/driver/als_opt3001.h @@ -36,9 +36,12 @@ enum opt3001_mode { #define OPT3001_MANUFACTURER_ID 0x5449 #define OPT3001_DEVICE_ID 0x3001 -/* Min and Max sampling frequency in mHz */ -#define OPT3001_LIGHT_MIN_FREQ 1250 -#define OPT3001_LIGHT_MAX_FREQ 10000 +/* + * Min and Max sampling frequency in mHz. + * Due to integration set at 800ms, we limit max frequency to 1Hz. + */ +#define OPT3001_LIGHT_MIN_FREQ 100 +#define OPT3001_LIGHT_MAX_FREQ 1000 #if (CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ <= OPT3001_LIGHT_MAX_FREQ) #error "EC too slow for light sensor" #endif -- cgit v1.2.1