diff options
author | Jon Brenner <jbrenner@taosinc.com> | 2012-04-24 22:59:10 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-24 23:13:10 (GMT) |
commit | 0f3bcfe67f175d4edf0c6ab5487fbe23b6533d4a (patch) | |
tree | b89ff1406e0eeaa2ff4ac6e9990a853d8ddb1424 /drivers/staging/iio/light | |
parent | 3c97c08b5735ac05ebc0cbd0aa7722393f50b846 (diff) | |
download | linux-0f3bcfe67f175d4edf0c6ab5487fbe23b6533d4a.tar.xz |
staging: iio: tsl2x7x: bugfixes
TAOS (version 9a) tsl2x7x driver change / bug fix.
Fixed - removed decimal multiplications.
Added missing 'static' declarations
Fixed _read_raw case logic to allow reading of _PROCESSED IIO_LIGHT
Replaced udelay with mdelay to accomodate eabi.
Signed-off-by: Jon Brenner <jbrenner@taosinc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/iio/light')
-rwxr-xr-x | drivers/staging/iio/light/tsl2x7x_core.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c index ff44989..f3fc85a 100755 --- a/drivers/staging/iio/light/tsl2x7x_core.c +++ b/drivers/staging/iio/light/tsl2x7x_core.c @@ -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, @@ -277,7 +279,7 @@ enum { ALSPRX2, }; -const u8 device_channel_config[] = { +static const u8 device_channel_config[] = { ALS, PRX, PRX, @@ -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 */ @@ -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); @@ -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; @@ -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); @@ -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); @@ -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); @@ -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); @@ -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) |