Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304463
b: refs/heads/master
c: 0f3bcfe
h: refs/heads/master
i:
  304461: 36ac460
  304459: 8eedff7
  304455: a5c7c87
  304447: f489f02
v: v3
  • Loading branch information
Jon Brenner authored and Greg Kroah-Hartman committed Apr 24, 2012
1 parent 817645f commit dc181f0
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3c97c08b5735ac05ebc0cbd0aa7722393f50b846
refs/heads/master: 0f3bcfe67f175d4edf0c6ab5487fbe23b6533d4a
26 changes: 18 additions & 8 deletions trunk/drivers/staging/iio/light/tsl2x7x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
(IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) | \
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)),

#define TSL2X7X_MIN_ITIME 3

/* TAOS txx2x7x Device family members */
enum {
tsl2571,
Expand Down Expand Up @@ -277,7 +279,7 @@ enum {
ALSPRX2,
};

const u8 device_channel_config[] = {
static const u8 device_channel_config[] = {
ALS,
PRX,
PRX,
Expand Down Expand Up @@ -778,7 +780,7 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
}
}

udelay(3000); /* Power-on settling time */
mdelay(3); /* Power-on settling time */

/* NOW enable the ADC
* initialize the desired mode of operation */
Expand Down Expand Up @@ -853,6 +855,7 @@ static int tsl2x7x_chip_off(struct iio_dev *indio_dev)
* put device back into proper state, and unlock
* resource.
*/
static
int tsl2x7x_invoke_change(struct iio_dev *indio_dev)
{
struct tsl2X7X_chip *chip = iio_priv(indio_dev);
Expand Down Expand Up @@ -1021,7 +1024,7 @@ static ssize_t tsl2x7x_als_time_show(struct device *dev,
int y, z;

y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
z = y * 2.72;
z = y * TSL2X7X_MIN_ITIME;
y /= 1000;
z %= 1000;

Expand Down Expand Up @@ -1092,7 +1095,7 @@ static ssize_t tsl2x7x_als_persistence_show(struct device *dev,

/* Determine integration time */
y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
z = y * 2.72;
z = y * TSL2X7X_MIN_ITIME;
filter_delay = z * (chip->tsl2x7x_settings.persistence & 0x0F);
y = (filter_delay / 1000);
z = (filter_delay % 1000);
Expand All @@ -1114,7 +1117,7 @@ static ssize_t tsl2x7x_als_persistence_store(struct device *dev,

result.fract /= 1000;
y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
z = y * 2.72;
z = y * TSL2X7X_MIN_ITIME;

filter_delay =
DIV_ROUND_UP(((result.integer * 1000) + result.fract), z);
Expand All @@ -1138,7 +1141,7 @@ static ssize_t tsl2x7x_prox_persistence_show(struct device *dev,

/* Determine integration time */
y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.prx_time) + 1;
z = y * 2.72;
z = y * TSL2X7X_MIN_ITIME;
filter_delay = z * ((chip->tsl2x7x_settings.persistence & 0xF0) >> 4);
y = (filter_delay / 1000);
z = (filter_delay % 1000);
Expand All @@ -1160,7 +1163,7 @@ static ssize_t tsl2x7x_prox_persistence_store(struct device *dev,

result.fract /= 1000;
y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.prx_time) + 1;
z = y * 2.72;
z = y * TSL2X7X_MIN_ITIME;

filter_delay =
DIV_ROUND_UP(((result.integer * 1000) + result.fract), z);
Expand Down Expand Up @@ -1389,13 +1392,20 @@ static int tsl2x7x_read_raw(struct iio_dev *indio_dev,
struct tsl2X7X_chip *chip = iio_priv(indio_dev);

switch (mask) {
case IIO_CHAN_INFO_RAW:
case IIO_CHAN_INFO_PROCESSED:
switch (chan->type) {
case IIO_LIGHT:
tsl2x7x_get_lux(indio_dev);
*val = chip->als_cur_info.lux;
ret = IIO_VAL_INT;
break;
default:
return -EINVAL;
break;
}
break;
case IIO_CHAN_INFO_RAW:
switch (chan->type) {
case IIO_INTENSITY:
tsl2x7x_get_lux(indio_dev);
if (chan->channel == 0)
Expand Down

0 comments on commit dc181f0

Please sign in to comment.