| Message ID | 20180504025319.28953-10-masneyb@onstation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 3 May 2018 22:53:17 -0400 Brian Masney <masneyb@onstation.org> wrote: > The thresh periods assumed an integration time of 3ms. This patch adds > support for the correct integration time (2.72ms or 2.73ms). The code > had the ALS filter values as going up to 15, however the values actually > went up to 60 since the values scaled in increments of 5 once the > persistence value went above 3. > > Signed-off-by: Brian Masney <masneyb@onstation.org> Looks fine, but dependent on earlier patch so I can't take it yet. Thanks, Jonathan > --- > drivers/staging/iio/light/tsl2x7x.c | 44 +++++++++++++++++++++---------------- > drivers/staging/iio/light/tsl2x7x.h | 1 - > 2 files changed, 25 insertions(+), 20 deletions(-) > > diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c > index 39de5e60fd33..f912f4bc61c4 100644 > --- a/drivers/staging/iio/light/tsl2x7x.c > +++ b/drivers/staging/iio/light/tsl2x7x.c > @@ -103,8 +103,6 @@ > #define TSL2X7X_CNTL_PROXPON_ENBL 0x0F > #define TSL2X7X_CNTL_INTPROXPON_ENBL 0x2F > > -#define TSL2X7X_MIN_ITIME 3 > - > /* TAOS txx2x7x Device family members */ > enum { > tsl2571, > @@ -972,7 +970,7 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev, > int val, int val2) > { > struct tsl2X7X_chip *chip = iio_priv(indio_dev); > - int ret = -EINVAL, y, z, filter_delay; > + int ret = -EINVAL, count, persistence; > u8 time; > > switch (info) { > @@ -1011,15 +1009,20 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev, > else > time = chip->settings.prox_time; > > - y = (TSL2X7X_MAX_TIMER_CNT - time) + 1; > - z = y * TSL2X7X_MIN_ITIME; > + count = 256 - time; > + persistence = ((val * 1000000) + val2) / > + (count * tsl2x7x_int_time[chip->id].increment_us); > > - filter_delay = DIV_ROUND_UP((val * 1000) + val2, z); > + if (chan->type == IIO_INTENSITY) { > + /* ALS filter values are 1, 2, 3, 5, 10, 15, ..., 60 */ > + if (persistence > 3) > + persistence = (persistence / 5) + 3; > + > + chip->settings.als_persistence = persistence; > + } else { > + chip->settings.prox_persistence = persistence; > + } > > - if (chan->type == IIO_INTENSITY) > - chip->settings.als_persistence = filter_delay; > - else > - chip->settings.prox_persistence = filter_delay; > ret = 0; > break; > default: > @@ -1040,7 +1043,7 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev, > int *val, int *val2) > { > struct tsl2X7X_chip *chip = iio_priv(indio_dev); > - int ret = -EINVAL, filter_delay, mult; > + int ret = -EINVAL, filter_delay, persistence; > u8 time; > > switch (info) { > @@ -1076,18 +1079,21 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev, > case IIO_EV_INFO_PERIOD: > if (chan->type == IIO_INTENSITY) { > time = chip->settings.als_time; > - mult = chip->settings.als_persistence; > + persistence = chip->settings.als_persistence; > + > + /* ALS filter values are 1, 2, 3, 5, 10, 15, ..., 60 */ > + if (persistence > 3) > + persistence = (persistence - 3) * 5; > } else { > time = chip->settings.prox_time; > - mult = chip->settings.prox_persistence; > + persistence = chip->settings.prox_persistence; > } > > - /* Determine integration time */ > - *val = (TSL2X7X_MAX_TIMER_CNT - time) + 1; > - *val2 = *val * TSL2X7X_MIN_ITIME; > - filter_delay = *val2 * mult; > - *val = filter_delay / 1000; > - *val2 = filter_delay % 1000; > + filter_delay = persistence * (256 - time) * > + tsl2x7x_int_time[chip->id].increment_us; > + > + *val = filter_delay / 1000000; > + *val2 = filter_delay % 1000000; > ret = IIO_VAL_INT_PLUS_MICRO; > break; > default: > diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h > index 1097ee890ce2..f74427f4ab6e 100644 > --- a/drivers/staging/iio/light/tsl2x7x.h > +++ b/drivers/staging/iio/light/tsl2x7x.h > @@ -31,7 +31,6 @@ struct tsl2x7x_lux { > #define TSL2X7X_50_mA 0x01 > #define TSL2X7X_25_mA 0x02 > #define TSL2X7X_13_mA 0x03 > -#define TSL2X7X_MAX_TIMER_CNT 0xFF > > /** > * struct tsl2x7x_settings - Settings for the tsl2x7x driver -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 39de5e60fd33..f912f4bc61c4 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -103,8 +103,6 @@ #define TSL2X7X_CNTL_PROXPON_ENBL 0x0F #define TSL2X7X_CNTL_INTPROXPON_ENBL 0x2F -#define TSL2X7X_MIN_ITIME 3 - /* TAOS txx2x7x Device family members */ enum { tsl2571, @@ -972,7 +970,7 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev, int val, int val2) { struct tsl2X7X_chip *chip = iio_priv(indio_dev); - int ret = -EINVAL, y, z, filter_delay; + int ret = -EINVAL, count, persistence; u8 time; switch (info) { @@ -1011,15 +1009,20 @@ static int tsl2x7x_write_event_value(struct iio_dev *indio_dev, else time = chip->settings.prox_time; - y = (TSL2X7X_MAX_TIMER_CNT - time) + 1; - z = y * TSL2X7X_MIN_ITIME; + count = 256 - time; + persistence = ((val * 1000000) + val2) / + (count * tsl2x7x_int_time[chip->id].increment_us); - filter_delay = DIV_ROUND_UP((val * 1000) + val2, z); + if (chan->type == IIO_INTENSITY) { + /* ALS filter values are 1, 2, 3, 5, 10, 15, ..., 60 */ + if (persistence > 3) + persistence = (persistence / 5) + 3; + + chip->settings.als_persistence = persistence; + } else { + chip->settings.prox_persistence = persistence; + } - if (chan->type == IIO_INTENSITY) - chip->settings.als_persistence = filter_delay; - else - chip->settings.prox_persistence = filter_delay; ret = 0; break; default: @@ -1040,7 +1043,7 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev, int *val, int *val2) { struct tsl2X7X_chip *chip = iio_priv(indio_dev); - int ret = -EINVAL, filter_delay, mult; + int ret = -EINVAL, filter_delay, persistence; u8 time; switch (info) { @@ -1076,18 +1079,21 @@ static int tsl2x7x_read_event_value(struct iio_dev *indio_dev, case IIO_EV_INFO_PERIOD: if (chan->type == IIO_INTENSITY) { time = chip->settings.als_time; - mult = chip->settings.als_persistence; + persistence = chip->settings.als_persistence; + + /* ALS filter values are 1, 2, 3, 5, 10, 15, ..., 60 */ + if (persistence > 3) + persistence = (persistence - 3) * 5; } else { time = chip->settings.prox_time; - mult = chip->settings.prox_persistence; + persistence = chip->settings.prox_persistence; } - /* Determine integration time */ - *val = (TSL2X7X_MAX_TIMER_CNT - time) + 1; - *val2 = *val * TSL2X7X_MIN_ITIME; - filter_delay = *val2 * mult; - *val = filter_delay / 1000; - *val2 = filter_delay % 1000; + filter_delay = persistence * (256 - time) * + tsl2x7x_int_time[chip->id].increment_us; + + *val = filter_delay / 1000000; + *val2 = filter_delay % 1000000; ret = IIO_VAL_INT_PLUS_MICRO; break; default: diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h index 1097ee890ce2..f74427f4ab6e 100644 --- a/drivers/staging/iio/light/tsl2x7x.h +++ b/drivers/staging/iio/light/tsl2x7x.h @@ -31,7 +31,6 @@ struct tsl2x7x_lux { #define TSL2X7X_50_mA 0x01 #define TSL2X7X_25_mA 0x02 #define TSL2X7X_13_mA 0x03 -#define TSL2X7X_MAX_TIMER_CNT 0xFF /** * struct tsl2x7x_settings - Settings for the tsl2x7x driver
The thresh periods assumed an integration time of 3ms. This patch adds support for the correct integration time (2.72ms or 2.73ms). The code had the ALS filter values as going up to 15, however the values actually went up to 60 since the values scaled in increments of 5 once the persistence value went above 3. Signed-off-by: Brian Masney <masneyb@onstation.org> --- drivers/staging/iio/light/tsl2x7x.c | 44 +++++++++++++++++++++---------------- drivers/staging/iio/light/tsl2x7x.h | 1 - 2 files changed, 25 insertions(+), 20 deletions(-)