This is the same tuning file used in tsl2583.c.
Add documentation for it to sysfs-bus-iio-light.
Normalize it at 1024 instead of 1000 so we can avoid 64bit division (div_u64).
Use u64 so we can do all multiplication before division to avoid loss of
granularity on amplified values.
Signed-off-by: Bryan Freed <[email protected]>
---
.../staging/iio/Documentation/sysfs-bus-iio-light | 10 +++++
drivers/staging/iio/light/isl29018.c | 36 +++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-light b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
index 21d2774..704b6c9 100644
--- a/drivers/staging/iio/Documentation/sysfs-bus-iio-light
+++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
@@ -75,3 +75,13 @@ KernelVersion: 2.6.37
Contact: [email protected]
Description:
This property gets/sets the sensors ADC analog integration time.
+
+What: /sys/bus/iio/devices/device[n]/illuminance0_calibbias
+KernelVersion: 2.6.38
+Contact: [email protected]
+Description:
+ This property gets/sets the illuminance0_input amplification
+ value. The calculated lux reading is multiplied by this value
+ and divided by 1024. Default of 1024 gives no amplification.
+ This provides compensation for glass or bezel that can
+ attenuate the ambient light.
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 4794ffd..a106f16 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -57,6 +57,7 @@ struct isl29018_chip {
struct iio_dev *indio_dev;
struct i2c_client *client;
struct mutex lock;
+ unsigned int calibbias;
unsigned int range;
unsigned int adc_bit;
int prox_scheme;
@@ -157,6 +158,7 @@ static int isl29018_read_sensor_input(struct i2c_client *client, int mode)
static int isl29018_read_lux(struct i2c_client *client, int *lux)
{
+ u64 lux64;
int lux_data;
struct isl29018_chip *chip = i2c_get_clientdata(client);
@@ -166,7 +168,8 @@ static int isl29018_read_lux(struct i2c_client *client, int *lux)
if (lux_data < 0)
return lux_data;
- *lux = (lux_data * chip->range) >> chip->adc_bit;
+ lux64 = lux_data * chip->range;
+ *lux = (lux64 * chip->calibbias) >> (10 + chip->adc_bit);
return 0;
}
@@ -264,6 +267,33 @@ static ssize_t get_sensor_data(struct device *dev, char *buf, int mode)
}
/* Sysfs interface */
+/* calibbias */
+static ssize_t show_calibbias(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct isl29018_chip *chip = indio_dev->dev_data;
+
+ return sprintf(buf, "%u\n", chip->calibbias);
+}
+
+static ssize_t store_calibbias(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ struct isl29018_chip *chip = indio_dev->dev_data;
+ unsigned long lval;
+
+ if (strict_strtoul(buf, 10, &lval))
+ return -EINVAL;
+
+ mutex_lock(&chip->lock);
+ chip->calibbias = lval;
+ mutex_unlock(&chip->lock);
+
+ return count;
+}
+
/* range */
static ssize_t show_range(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -412,6 +442,8 @@ static IIO_DEVICE_ATTR(proximity_on_chip_ambient_infrared_supression,
show_prox_infrared_supression,
store_prox_infrared_supression, 0);
static IIO_DEVICE_ATTR(illuminance0_input, S_IRUGO, show_lux, NULL, 0);
+static IIO_DEVICE_ATTR(illuminance0_calibbias, S_IRUGO | S_IWUSR,
+ show_calibbias, store_calibbias, 0);
static IIO_DEVICE_ATTR(intensity_infrared_raw, S_IRUGO, show_ir, NULL, 0);
static IIO_DEVICE_ATTR(proximity_raw, S_IRUGO, show_proxim_ir, NULL, 0);
@@ -424,6 +456,7 @@ static struct attribute *isl29018_attributes[] = {
ISL29018_CONST_ATTR(adc_resolution_available),
ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_supression),
ISL29018_DEV_ATTR(illuminance0_input),
+ ISL29018_DEV_ATTR(illuminance0_calibbias),
ISL29018_DEV_ATTR(intensity_infrared_raw),
ISL29018_DEV_ATTR(proximity_raw),
NULL
@@ -478,6 +511,7 @@ static int __devinit isl29018_probe(struct i2c_client *client,
mutex_init(&chip->lock);
+ chip->calibbias = 1024;
chip->range = 1000;
chip->adc_bit = 16;
--
1.7.3.1
Use 64bit lux64 to amplify lux values while preserving granularity.
Normalize illuminance_calibbias amplification value at 1024 instead of 1000
so we can avoid 64bit division (div_u64).
Signed-off-by: Bryan Freed <[email protected]>
---
drivers/staging/iio/light/tsl2583.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 5694610..0324ac1 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -146,7 +146,7 @@ static void taos_defaults(struct tsl2583_chip *chip)
chip->taos_settings.als_gain = 0;
/* this is actually an index into the gain table */
/* assume clear glass as default */
- chip->taos_settings.als_gain_trim = 1000;
+ chip->taos_settings.als_gain_trim = 1024;
/* default gain trim to account for aperture effects */
chip->taos_settings.als_cal_target = 130;
/* Known external ALS reading used for calibration */
@@ -195,6 +195,7 @@ static int taos_get_lux(struct i2c_client *client)
{
u16 ch0, ch1; /* separated ch0/ch1 data from device */
u32 lux; /* raw lux calculated from device data */
+ u64 lux64;
u32 ratio;
u8 buf[5];
struct taos_lux *p;
@@ -298,8 +299,10 @@ static int taos_get_lux(struct i2c_client *client)
chip->als_time_scale;
/* adjust for active gain scale */
- lux >>= 13; /* tables have factor of 8192 builtin for accuracy */
- lux = (lux * chip->taos_settings.als_gain_trim + 500) / 1000;
+ lux64 = lux;
+ lux64 = (lux64 * chip->taos_settings.als_gain_trim + 512) >> 10;
+ lux64 >>= 13; /* tables have factor of 8192 builtin for accuracy */
+ lux = lux64;
if (lux > TSL258X_LUX_CALC_OVER_FLOW) { /* check for overflow */
return_max:
lux = TSL258X_LUX_CALC_OVER_FLOW;
--
1.7.3.1
cc'd linux-iio
On 06/10/11 21:26, Bryan Freed wrote:
> This is the same tuning file used in tsl2583.c.
> Add documentation for it to sysfs-bus-iio-light.
> Normalize it at 1024 instead of 1000 so we can avoid 64bit division (div_u64).
> Use u64 so we can do all multiplication before division to avoid loss of
> granularity on amplified values.
Hi Brian.
This attribute is a general IIO one rather than a light specific one so is
already documented in sysfs-bus-iio.
Now it is supposed to be an offset rather than a gain. The current docs say:
"Hardware applied calibration offset. (assumed to fix production
inaccuracies). If shared across all channels, <type>_calibbias
is used."
I do note that the illuminance variant isn't actually listed and would be
happy to have a patch adding it alongside the gyro and accel ones already there.
My first issue here is that it supposed to be an offset not a gain. Secondly that
description could clearly do with amending to make it clear that this can be used
for devices with complex non linear transformations to SI units which is what it
is supposed to be doing here. In cases where there is no '_raw' output we can assume
something complex may be happening, so changing this value won't result in a additive
change the output.
If we are playing with a gain, then calibscale is the parameter name that should be used
(also a core attribute definition, not a light specific one).
"Hardware applied calibration scale factor. (assumed to fix
production inaccuracies). If shared across all channels,
<type>_calibscale is used."
Note all these attributes are defined to be pseudo floating point. The chan_spec approach
to registration handles this cleanly (particularly with Michael Hennerich's additional
callbacks added last week). It's a gain, so 1 is the no change value. Sorry, but anything
that assumes 1024 is the no effect value is never going to generalize well
so is a non starter.
Sorry, I'll be happy to see a patch adding the support you want to the isl29018 driver
but it must conform to the existing abi. It looks like you may have found a discrepancy
between a driver and the spec, but I'll leave Jon to comment on that.
Jonathan
>
> Signed-off-by: Bryan Freed <[email protected]>
> ---
> .../staging/iio/Documentation/sysfs-bus-iio-light | 10 +++++
> drivers/staging/iio/light/isl29018.c | 36 +++++++++++++++++++-
> 2 files changed, 45 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-light b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> index 21d2774..704b6c9 100644
> --- a/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> +++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> @@ -75,3 +75,13 @@ KernelVersion: 2.6.37
> Contact: [email protected]
> Description:
> This property gets/sets the sensors ADC analog integration time.
> +
> +What: /sys/bus/iio/devices/device[n]/illuminance0_calibbias
> +KernelVersion: 2.6.38
> +Contact: [email protected]
> +Description:
> + This property gets/sets the illuminance0_input amplification
> + value. The calculated lux reading is multiplied by this value
> + and divided by 1024. Default of 1024 gives no amplification.
> + This provides compensation for glass or bezel that can
> + attenuate the ambient light.
> diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
> index 4794ffd..a106f16 100644
> --- a/drivers/staging/iio/light/isl29018.c
> +++ b/drivers/staging/iio/light/isl29018.c
> @@ -57,6 +57,7 @@ struct isl29018_chip {
> struct iio_dev *indio_dev;
> struct i2c_client *client;
> struct mutex lock;
> + unsigned int calibbias;
> unsigned int range;
> unsigned int adc_bit;
> int prox_scheme;
> @@ -157,6 +158,7 @@ static int isl29018_read_sensor_input(struct i2c_client *client, int mode)
>
> static int isl29018_read_lux(struct i2c_client *client, int *lux)
> {
> + u64 lux64;
> int lux_data;
> struct isl29018_chip *chip = i2c_get_clientdata(client);
>
> @@ -166,7 +168,8 @@ static int isl29018_read_lux(struct i2c_client *client, int *lux)
> if (lux_data < 0)
> return lux_data;
>
> - *lux = (lux_data * chip->range) >> chip->adc_bit;
> + lux64 = lux_data * chip->range;
> + *lux = (lux64 * chip->calibbias) >> (10 + chip->adc_bit);
>
> return 0;
> }
> @@ -264,6 +267,33 @@ static ssize_t get_sensor_data(struct device *dev, char *buf, int mode)
> }
>
> /* Sysfs interface */
> +/* calibbias */
> +static ssize_t show_calibbias(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct isl29018_chip *chip = indio_dev->dev_data;
> +
> + return sprintf(buf, "%u\n", chip->calibbias);
> +}
> +
> +static ssize_t store_calibbias(struct device *dev,
> + struct device_attribute *attr, const char *buf, size_t count)
> +{
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> + struct isl29018_chip *chip = indio_dev->dev_data;
> + unsigned long lval;
> +
> + if (strict_strtoul(buf, 10, &lval))
> + return -EINVAL;
> +
> + mutex_lock(&chip->lock);
> + chip->calibbias = lval;
> + mutex_unlock(&chip->lock);
> +
> + return count;
> +}
> +
> /* range */
> static ssize_t show_range(struct device *dev,
> struct device_attribute *attr, char *buf)
> @@ -412,6 +442,8 @@ static IIO_DEVICE_ATTR(proximity_on_chip_ambient_infrared_supression,
> show_prox_infrared_supression,
> store_prox_infrared_supression, 0);
> static IIO_DEVICE_ATTR(illuminance0_input, S_IRUGO, show_lux, NULL, 0);
> +static IIO_DEVICE_ATTR(illuminance0_calibbias, S_IRUGO | S_IWUSR,
> + show_calibbias, store_calibbias, 0);
> static IIO_DEVICE_ATTR(intensity_infrared_raw, S_IRUGO, show_ir, NULL, 0);
> static IIO_DEVICE_ATTR(proximity_raw, S_IRUGO, show_proxim_ir, NULL, 0);
>
> @@ -424,6 +456,7 @@ static struct attribute *isl29018_attributes[] = {
> ISL29018_CONST_ATTR(adc_resolution_available),
> ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_supression),
> ISL29018_DEV_ATTR(illuminance0_input),
> + ISL29018_DEV_ATTR(illuminance0_calibbias),
> ISL29018_DEV_ATTR(intensity_infrared_raw),
> ISL29018_DEV_ATTR(proximity_raw),
> NULL
> @@ -478,6 +511,7 @@ static int __devinit isl29018_probe(struct i2c_client *client,
>
> mutex_init(&chip->lock);
>
> + chip->calibbias = 1024;
> chip->range = 1000;
> chip->adc_bit = 16;
>
On 06/16/11 00:49, Bryan Freed wrote:
> Hi Jon. Thanks for the feedback.
>
> So I took a look at sysfs-bus-iio documentation.
> *_calibscale is supposed to be "Hardware applied calibration scale factor."
> But what I want is software applied calibration scaling.
Yes an no. That description could do with expanding. What it really means is
a factor applied somewhere before the reading being available to userspace.
On most devices this indeed in hardware. With the light sensors as you have
observed it serves much the same role but is applied in software. Still
userspace doesn't care where it occurs, just that it can in theory fiddle
with it.
>
> tsl2563 provides this with (apparently undocumented) intensity0_both_calibgain,
oops. That was an ancient form of naming. Needs updating to current abi.
> and tsl2583 provides this (incorrectly, according to documentation) with illuminance0_calibbias.
Indeed. I'm waiting for Jon to have time to take a look at that (and fix it ;) Sorry, that one
slipped past me when I reviewed the driver.
>
> As for the iio_chan_spec interface, we are a bit behind you guys in
> source drops. We are at 2.6.38, and that appears to be added in
> 2.6.39 just before the switch to 3.0.
Yup, it went in during the most recent merge window. If you have to work with
2.6.38 I suggest lifting some of the code form the core and putting it in the
driver to interpret a fixed point decimal input for calibscale. It'll need
a few minor changes as you move forward (and there will be major code reductions
if you do move to newer interfaces, but there is no requirement to do so).
> I have not found what you mean by pseudo floating point. Still working on it.
For reading and writing values are passed in two ints. val and val2 (iirc).
There is also a type specification. For reading from devices this is returned by
read_raw callback, for writing it can be queried (if no callback is supplied then
it assumed to be int for _raw attributes and int + micro for everything else.
Michael added a IIO_VAL_INT_PLUS_NANO version as he had a 24bit adc that required a
very small value for in_scale.
We have had some discussions about extending this further, but have left that for
when we actually have a user. Right now you can have:
IIO_VAL_INT, IIO_VAL_INT_PLUS_MICRO and IIO_VAL_INT_PLUS_NANO.
> For Mike's changes, are you referring to 8a27a023f8f66a8361c5e3d8160a690f480479ec in particular? He has quite a few in there.
Greg KH hasn't picked it up yet (I think Michael has sent it on).
On mailing list, patches in question are:
http://marc.info/?l=linux-iio&m=130734563905574&w=2 (for the read raw)
http://marc.info/?l=linux-iio&m=130754290631769&w=2 (for the write raw and fmt querying callback)
>
> I see tsl2563 has been updated to use iio_chan_spec. But the software gain is still provided by the old intensity0_both_calibgain file.
Really? Chanspec is:
static const struct iio_chan_spec tsl2563_channels[] = {
IIO_CHAN(IIO_LIGHT, 0, 1, 1, NULL, 0, 0, 0, 0, 0, {}, 0),
IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "both", 0,
(1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)),
IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "ir", 1,
(1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
0)
};
The both bit is referring to the light spectrum (that sensor has a ir + visible sensor and an ir only one).
ir should indeed be infrared. Don't think this driver has a huge number of users so probably
can fix that up quickly (Jon, Amit, do you guys know anyone who would be effected by that?)
We changed the threshold control naming recently anyway and no one has shouted about it yet!
We don't actually have the equivalent of 'both' in the documentation. The only reason
we have this readable form userspace is that thresholding on that part is done on the
underlying value of this adc. If someone cares to move the gain control into the driver
then I'd be happy to see this go (as long as no one is using the threshold events for anything
else.) We could probably come up with a better naming convention it not.
> Should we be moving away from this interface?
Yes to calibgain. That should be long gone. For a while we accidentally had both calibscale
and calibgain in the tree so we eventually went with one and in theory standardized on it.
Just took a while to propagate through (grep tells me there are no users left now).
>
> bryan.
>
>
> On Mon, Jun 13, 2011 at 1:57 AM, Jonathan Cameron <[email protected] <mailto:[email protected]>> wrote:
>
> cc'd linux-iio
> On 06/10/11 21:26, Bryan Freed wrote:
> > This is the same tuning file used in tsl2583.c.
> > Add documentation for it to sysfs-bus-iio-light.
> > Normalize it at 1024 instead of 1000 so we can avoid 64bit division (div_u64).
> > Use u64 so we can do all multiplication before division to avoid loss of
> > granularity on amplified values.
> Hi Brian.
>
> This attribute is a general IIO one rather than a light specific one so is
> already documented in sysfs-bus-iio.
>
> Now it is supposed to be an offset rather than a gain. The current docs say:
>
> "Hardware applied calibration offset. (assumed to fix production
> inaccuracies). If shared across all channels, <type>_calibbias
> is used."
>
> I do note that the illuminance variant isn't actually listed and would be
> happy to have a patch adding it alongside the gyro and accel ones already there.
>
> My first issue here is that it supposed to be an offset not a gain. Secondly that
> description could clearly do with amending to make it clear that this can be used
> for devices with complex non linear transformations to SI units which is what it
> is supposed to be doing here. In cases where there is no '_raw' output we can assume
> something complex may be happening, so changing this value won't result in a additive
> change the output.
>
> If we are playing with a gain, then calibscale is the parameter name that should be used
> (also a core attribute definition, not a light specific one).
>
> "Hardware applied calibration scale factor. (assumed to fix
> production inaccuracies). If shared across all channels,
> <type>_calibscale is used."
>
> Note all these attributes are defined to be pseudo floating point. The chan_spec approach
> to registration handles this cleanly (particularly with Michael Hennerich's additional
> callbacks added last week). It's a gain, so 1 is the no change value. Sorry, but anything
> that assumes 1024 is the no effect value is never going to generalize well
> so is a non starter.
>
> Sorry, I'll be happy to see a patch adding the support you want to the isl29018 driver
> but it must conform to the existing abi. It looks like you may have found a discrepancy
> between a driver and the spec, but I'll leave Jon to comment on that.
>
> Jonathan
> >
> > Signed-off-by: Bryan Freed <[email protected] <mailto:[email protected]>>
> > ---
> > .../staging/iio/Documentation/sysfs-bus-iio-light | 10 +++++
> > drivers/staging/iio/light/isl29018.c | 36 +++++++++++++++++++-
> > 2 files changed, 45 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/staging/iio/Documentation/sysfs-bus-iio-light b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> > index 21d2774..704b6c9 100644
> > --- a/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> > +++ b/drivers/staging/iio/Documentation/sysfs-bus-iio-light
> > @@ -75,3 +75,13 @@ KernelVersion: 2.6.37
> > Contact: [email protected] <mailto:[email protected]>
> > Description:
> > This property gets/sets the sensors ADC analog integration time.
> > +
> > +What: /sys/bus/iio/devices/device[n]/illuminance0_calibbias
> > +KernelVersion: 2.6.38
> > +Contact: [email protected] <mailto:[email protected]>
> > +Description:
> > + This property gets/sets the illuminance0_input amplification
> > + value. The calculated lux reading is multiplied by this value
> > + and divided by 1024. Default of 1024 gives no amplification.
> > + This provides compensation for glass or bezel that can
> > + attenuate the ambient light.
> > diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
> > index 4794ffd..a106f16 100644
> > --- a/drivers/staging/iio/light/isl29018.c
> > +++ b/drivers/staging/iio/light/isl29018.c
> > @@ -57,6 +57,7 @@ struct isl29018_chip {
> > struct iio_dev *indio_dev;
> > struct i2c_client *client;
> > struct mutex lock;
> > + unsigned int calibbias;
> > unsigned int range;
> > unsigned int adc_bit;
> > int prox_scheme;
> > @@ -157,6 +158,7 @@ static int isl29018_read_sensor_input(struct i2c_client *client, int mode)
> >
> > static int isl29018_read_lux(struct i2c_client *client, int *lux)
> > {
> > + u64 lux64;
> > int lux_data;
> > struct isl29018_chip *chip = i2c_get_clientdata(client);
> >
> > @@ -166,7 +168,8 @@ static int isl29018_read_lux(struct i2c_client *client, int *lux)
> > if (lux_data < 0)
> > return lux_data;
> >
> > - *lux = (lux_data * chip->range) >> chip->adc_bit;
> > + lux64 = lux_data * chip->range;
> > + *lux = (lux64 * chip->calibbias) >> (10 + chip->adc_bit);
> >
> > return 0;
> > }
> > @@ -264,6 +267,33 @@ static ssize_t get_sensor_data(struct device *dev, char *buf, int mode)
> > }
> >
> > /* Sysfs interface */
> > +/* calibbias */
> > +static ssize_t show_calibbias(struct device *dev,
> > + struct device_attribute *attr, char *buf)
> > +{
> > + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> > + struct isl29018_chip *chip = indio_dev->dev_data;
> > +
> > + return sprintf(buf, "%u\n", chip->calibbias);
> > +}
> > +
> > +static ssize_t store_calibbias(struct device *dev,
> > + struct device_attribute *attr, const char *buf, size_t count)
> > +{
> > + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> > + struct isl29018_chip *chip = indio_dev->dev_data;
> > + unsigned long lval;
> > +
> > + if (strict_strtoul(buf, 10, &lval))
> > + return -EINVAL;
> > +
> > + mutex_lock(&chip->lock);
> > + chip->calibbias = lval;
> > + mutex_unlock(&chip->lock);
> > +
> > + return count;
> > +}
> > +
> > /* range */
> > static ssize_t show_range(struct device *dev,
> > struct device_attribute *attr, char *buf)
> > @@ -412,6 +442,8 @@ static IIO_DEVICE_ATTR(proximity_on_chip_ambient_infrared_supression,
> > show_prox_infrared_supression,
> > store_prox_infrared_supression, 0);
> > static IIO_DEVICE_ATTR(illuminance0_input, S_IRUGO, show_lux, NULL, 0);
> > +static IIO_DEVICE_ATTR(illuminance0_calibbias, S_IRUGO | S_IWUSR,
> > + show_calibbias, store_calibbias, 0);
> > static IIO_DEVICE_ATTR(intensity_infrared_raw, S_IRUGO, show_ir, NULL, 0);
> > static IIO_DEVICE_ATTR(proximity_raw, S_IRUGO, show_proxim_ir, NULL, 0);
> >
> > @@ -424,6 +456,7 @@ static struct attribute *isl29018_attributes[] = {
> > ISL29018_CONST_ATTR(adc_resolution_available),
> > ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_supression),
> > ISL29018_DEV_ATTR(illuminance0_input),
> > + ISL29018_DEV_ATTR(illuminance0_calibbias),
> > ISL29018_DEV_ATTR(intensity_infrared_raw),
> > ISL29018_DEV_ATTR(proximity_raw),
> > NULL
> > @@ -478,6 +511,7 @@ static int __devinit isl29018_probe(struct i2c_client *client,
> >
> > mutex_init(&chip->lock);
> >
> > + chip->calibbias = 1024;
> > chip->range = 1000;
> > chip->adc_bit = 16;
> >
>
>
On 06/17/11 01:17, Bryan Freed wrote:
> Comments inline...
> Again, thanks for the response.
>
> On Thu, Jun 16, 2011 at 2:09 AM, Jonathan Cameron <[email protected] <mailto:[email protected]>> wrote:
>
> On 06/16/11 00:49, Bryan Freed wrote:
> > Hi Jon. Thanks for the feedback.
> >
> > So I took a look at sysfs-bus-iio documentation.
> > *_calibscale is supposed to be "Hardware applied calibration scale factor."
> > But what I want is software applied calibration scaling.
> Yes an no. That description could do with expanding. What it really means is
> a factor applied somewhere before the reading being available to userspace.
> On most devices this indeed in hardware. With the light sensors as you have
> observed it serves much the same role but is applied in software. Still
> userspace doesn't care where it occurs, just that it can in theory fiddle
> with it.
>
>
> Cool. I think I see that now.
>
>
> >
> > tsl2563 provides this with (apparently undocumented) intensity0_both_calibgain,
> oops. That was an ancient form of naming. Needs updating to current abi.
>
> > and tsl2583 provides this (incorrectly, according to documentation) with illuminance0_calibbias.
> Indeed. I'm waiting for Jon to have time to take a look at that (and fix it ;) Sorry, that one
> slipped past me when I reviewed the driver.
> >
> > As for the iio_chan_spec interface, we are a bit behind you guys in
> > source drops. We are at 2.6.38, and that appears to be added in
> > 2.6.39 just before the switch to 3.0.
> Yup, it went in during the most recent merge window. If you have to work with
> 2.6.38 I suggest lifting some of the code form the core and putting it in the
> driver to interpret a fixed point decimal input for calibscale. It'll need
> a few minor changes as you move forward (and there will be major code reductions
> if you do move to newer interfaces, but there is no requirement to do so).
>
>
> Ok, I see the effect of the interface change now. Sysfs filenames no
> longer come from the individual iio drivers with IIO_DEVICE_ATTR()
> and DEVICE_ATTR() calls that specify separate set and show functions.
> Now they come from the
> industrialio-core.c:iio_chan_type_name_spec_shared basic names as
> selected by the type field of each iio_chan_spec entry provided by a
> driver, and they are updated by the channel, modified, and channel2
> fields in __iio_build_postfix() and __iio_device_attr_init(). And the
> read/write call now goes through iio_read/write_channel_info() to the
> driver's combined read/write_raw() function instead of an attribute
> specific show/set function.
Yup.
> > I have not found what you mean by pseudo floating point. Still working on it.
> For reading and writing values are passed in two ints. val and val2 (iirc).
> There is also a type specification. For reading from devices this is returned by
> read_raw callback, for writing it can be queried (if no callback is supplied then
> it assumed to be int for _raw attributes and int + micro for everything else.
>
>
> Ok, I see the pseudo floating point stuff now. Thanks.
>
>
> Michael added a IIO_VAL_INT_PLUS_NANO version as he had a 24bit adc that required a
> very small value for in_scale.
>
>
> Uhh... I do not think I need that level of granularity.
>
>
>
> We have had some discussions about extending this further, but have left that for
> when we actually have a user. Right now you can have:
>
> IIO_VAL_INT, IIO_VAL_INT_PLUS_MICRO and IIO_VAL_INT_PLUS_NANO.
> > For Mike's changes, are you referring to 8a27a023f8f66a8361c5e3d8160a690f480479ec in particular? He has quite a few in there.
> Greg KH hasn't picked it up yet (I think Michael has sent it on).
> On mailing list, patches in question are:
>
> http://marc.info/?l=linux-iio&m=130734563905574&w=2 <http://marc.info/?l=linux-iio&m=130734563905574&w=2> (for the read raw)
> http://marc.info/?l=linux-iio&m=130754290631769&w=2 <http://marc.info/?l=linux-iio&m=130754290631769&w=2> (for the write raw and fmt querying callback)
>
>
> >
> > I see tsl2563 has been updated to use iio_chan_spec. But the software gain is still provided by the old intensity0_both_calibgain file.
> Really? Chanspec is:
>
>
> My mistake.
> The variables are all still there, and the math is the same.
> But the filename is no longer provided by the driver. It comes from iio.
Yup. Results in a substantial reduction in boilerplate code and in theory
enforces abi matching rather better.
> static const struct iio_chan_spec tsl2563_channels[] = {
> IIO_CHAN(IIO_LIGHT, 0, 1, 1, NULL, 0, 0, 0, 0, 0, {}, 0),
> IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "both", 0,
> (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
> IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
> IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)),
> IIO_CHAN(IIO_INTENSITY, 1, 1, 0, "ir", 1,
> (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE), 0, 0, 0, {},
> 0)
> };
>
> The both bit is referring to the light spectrum (that sensor has a ir + visible sensor and an ir only one).
> ir should indeed be infrared. Don't think this driver has a huge number of users so probably
> can fix that up quickly (Jon, Amit, do you guys know anyone who would be effected by that?)
> We changed the threshold control naming recently anyway and no one has shouted about it yet!
>
> We don't actually have the equivalent of 'both' in the documentation. The only reason
> we have this readable form userspace is that thresholding on that part is done on the
> underlying value of this adc. If someone cares to move the gain control into the driver
> then I'd be happy to see this go (as long as no one is using the threshold events for anything
> else.) We could probably come up with a better naming convention it not.
>
> > Should we be moving away from this interface?
> Yes to calibgain. That should be long gone. For a while we accidentally had both calibscale
> and calibgain in the tree so we eventually went with one and in theory standardized on it.
> Just took a while to propagate through (grep tells me there are no users left now).
>
>
> Ok, I have a good idea what to do.
> By the way, I am not a big fan of the IIO_CHAN() macros passing 12 parameters. It is hard to follow and prone to errors.
> In looking at the tsl2563 IIO_INTENSITY channels, it looks like the mask is passed incorrectly at parameter 7 (_chan2) instead of parameter 8 (_inf_mask).
> I will fix that if I can verify it, though I see the write_raw function does not check the mask. Hmm...
For once I actually have a part for this driver, so I'll test it if you want to make changes. write_raw
should indeed be in general checking the mask, but in this particularly case it doesn't actually matter
as all the information parameters have the same mask anyway. Better to clean this up now than have
it bite someone in the future though (particularly as this sort of code tends to get cut and pasted!)
On this note, it is perfectly acceptable to assign the elements of the chan_spec structure as:
static const struct iio_chan_spec tsl2563_channels[] = {
{
.type = IIO_LIGHT,
.indexed = 1,
.processed_val = 1,
.channel = 0,
}, {
.type = IIO_INTENSITY,
.modified = 1,
.indexed = 1,
.channel = 0,
.extend_name = "both",
.info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE),
.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)
}, {
.type = IIO_INTENSITY,
.modified = 1,
.indexed = 1,
.channel = 1,
.extend_name = "infrared",
.info_mask = (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE),
.event_mask = IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING) |
IIO_EV_BIT(IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING)
}
};
The macro is just a convenient shortcut...
>
> And the IIO_INTENSITY channels are still normalized at 1000 (the default calib0 value) instead of 1.000000. Do you think I should fix that, as well?
Hmm. This one is an odd one, because it really doesn't correspond to a true 'scaling'.
The value is only useful as part of the calculation to illuminance0_input.
Were this device to output illuminance0_raw then we would expect that scale to be such that
doubling it would result in the _raw output being double. In the case of light sensors, the
hideously non linear transform pretty much wrecks this. Hence, though the base of 1000 is
'unusual' it isn't really a problem.
(conceptually, if the conversion was linear and we were exporting the value via illuminance0_raw
then have illuminance0_scale applied in userspace and that can reverse the effect of any random
scaling occuring 'on chip' - anywhere before userspace sees it a value.
Thanks for looking at this stuff and good catch on that bug!
Jonathan