iio: new chemical sensor framework and channel types
Subsystems (3)
v5 cover iio: new chemical sensor framework and channel types
Changes from v4:
* Add IIO_MOD_CO2 and IIO_MOD_VOC modifiers
* Updated IIO_RESISTANCE and IIO_CONCENTRATION documentation
* Moved the decimal point shifting to the scale value versus the reading
Matt Ranostay (4):
iio: chemical: Add IIO_CONCENTRATION channel type
iio: resistance: add IIO_RESISTANCE channel type
devicetree: add SGX Sensortech vendor id
iio: chemical: add SGX VZ89x VOC sensor support
Documentation/ABI/testing/sysfs-bus-iio | 19 ++ .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + .../devicetree/bindings/vendor-prefixes.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ drivers/iio/industrialio-core.c | 4 + include/uapi/linux/iio/types.h | 4 + 11 files changed, 296 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.c
Signature · 1 line
1.9.1
PATCH v5 1/4 iio: chemical: Add IIO_CONCENTRATION channel type
There are air quality sensors that report data back in parts per million of VOC (Volatile Organic Compounds) which are usually indexed from CO2 or another common pollutant.
This patchset adds an IIO_CONCENTRATION type that returns a percentage of substance because no other channels types fit this use case. Modifiers for IIO_MOD_CO2 and IIO_MOD_VOC gas types are defined.
--- Documentation/ABI/testing/sysfs-bus-iio | 11 +++++++++++ drivers/iio/industrialio-core.c | 3 +++ include/uapi/linux/iio/types.h | 3 +++ 3 files changed, 17 insertions(+)
Documentation/ABI/testing/sysfs-bus-iio +11 -0
@@ -1459,3 +1459,14 @@ Description: measurements and return the average value as output data. Each value resulted from <type>[_name]_oversampling_ratio measurements is considered as one sample for <type>[_name]_sampling_frequency. + +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw +KernelVersion: 4.3 +Contact: [email protected] +Description: + Raw (unscaled no offset etc.) percentage reading of a substance.
drivers/iio/industrialio-core.c +3 -0
@@ -75,6 +75,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_ENERGY] = "energy", [IIO_DISTANCE] = "distance", [IIO_VELOCITY] = "velocity", + [IIO_CONCENTRATION] = "concentration", };static const char *const iio_modifier_names[] = {
@@ -111,6 +112,8 @@ static const char * const iio_modifier_names[] = { [IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z] = "sqrt(x^2+y^2+z^2)", [IIO_MOD_I] = "i", [IIO_MOD_Q] = "q", + [IIO_MOD_CO2] = "co2", + [IIO_MOD_VOC] = "voc", };/* relies on pairs of these shared then separate */
include/uapi/linux/iio/types.h +3 -0
@@ -35,6 +35,7 @@ enum iio_chan_type {IIO_ENERGY ,IIO_DISTANCE ,IIO_VELOCITY , + IIO_CONCENTRATION, }; enum iio_modifier {
@@ -72,6 +73,8 @@ enum iio_modifier {IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z ,IIO_MOD_I ,IIO_MOD_Q , +IIO_MOD_CO2 , + IIO_MOD_VOC, }; enum iio_event_type {
Signature · 1 line
1.9.1
Re: [PATCH v5 1/4] iio: chemical: Add IIO_CONCENTRATION channel type
Quoted 9 lines · Matt Ranostay
There are air quality sensors that report data back in parts per million of VOC (Volatile Organic Compounds) which are usually indexed from CO2 or another common pollutant.
This patchset adds an
IIO_CONCENTRATIONtype that returns a percentage of substance because no other channels types fit this use case. Modifiers forIIO_MOD_CO2andIIO_MOD_VOCgas types are defined.Signed-off-by Matt Ranostay <[email protected]>
Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 68 lines
--- Documentation/ABI/testing/sysfs-bus-iio | 11 +++++++++++ drivers/iio/industrialio-core.c | 3 +++ include/uapi/linux/iio/types.h | 3 +++ 3 files changed, 17 insertions(+)Documentation/ABI/testing/sysfs-bus-iio +11
-0@@ -1459,3 +1459,14 @@ Description: measurements and return the average value as output data. Each value resulted from <type>[_name]_oversampling_ratio measurements is considered as one sample for <type>[_name]_sampling_frequency. + +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw +What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw +KernelVersion: 4.3 +Contact: [email protected] +Description: + Raw (unscaled no offset etc.) percentage reading of a substance.drivers/iio/industrialio-core.c +3
-0@@ -75,6 +75,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_ENERGY] = "energy", [IIO_DISTANCE] = "distance", [IIO_VELOCITY] = "velocity", + [IIO_CONCENTRATION] = "concentration", };static const char *const iio_modifier_names[] = {@@ -111,6 +112,8 @@ static const char * const iio_modifier_names[] = { [IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z] = "sqrt(x^2+y^2+z^2)", [IIO_MOD_I] = "i", [IIO_MOD_Q] = "q", + [IIO_MOD_CO2] = "co2", + [IIO_MOD_VOC] = "voc", };/* relies on pairs of these shared then separate */ include/uapi/linux/iio/types.h +3
-0@@ -35,6 +35,7 @@ enum iio_chan_type {IIO_ENERGY ,IIO_DISTANCE ,IIO_VELOCITY , + IIO_CONCENTRATION, }; enum iio_modifier {@@ -72,6 +73,8 @@ enum iio_modifier {IIO_MOD_ROOT_SUM_SQUARED_X_Y_Z ,IIO_MOD_I ,IIO_MOD_Q , +IIO_MOD_CO2 , + IIO_MOD_VOC, }; enum iio_event_type {
PATCH v5 2/4 iio: resistance: add IIO_RESISTANCE channel type
In reply to Matt Ranostay--- Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++ drivers/iio/industrialio-core.c | 1 + include/uapi/linux/iio/types.h | 1 + 3 files changed, 10 insertions(+)
Documentation/ABI/testing/sysfs-bus-iio +8 -0
@@ -1470,3 +1470,11 @@ KernelVersion: 4.3 Contact: [email protected] Description: Raw (unscaled no offset etc.) percentage reading of a substance. + +What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw +What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw +KernelVersion: 4.3 +Contact: [email protected] +Description: + Raw (unscaled no offset etc.) resistance reading that can be processed + into an ohm value.
drivers/iio/industrialio-core.c +1 -0
@@ -76,6 +76,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_DISTANCE] = "distance", [IIO_VELOCITY] = "velocity", [IIO_CONCENTRATION] = "concentration", + [IIO_RESISTANCE] = "resistance", };static const char *const iio_modifier_names[] = {
include/uapi/linux/iio/types.h +1 -0
@@ -36,6 +36,7 @@ enum iio_chan_type {IIO_DISTANCE ,IIO_VELOCITY ,IIO_CONCENTRATION , + IIO_RESISTANCE, }; enum iio_modifier {
Signature · 1 line
1.9.1
Jonathan Cameron
maintainerRe: [PATCH v5 2/4] iio: resistance: add IIO_RESISTANCE channel type
Quoted 1 line · Matt Ranostay
Signed-off-by Matt Ranostay <[email protected]>
Applied to the togreg branch of iio.git - initially pushed out as testing for the autobuilders to play with it.
Thanks,
Jonathan
Quoted 40 lines
--- Documentation/ABI/testing/sysfs-bus-iio | 8 ++++++++ drivers/iio/industrialio-core.c | 1 + include/uapi/linux/iio/types.h | 1 + 3 files changed, 10 insertions(+)Documentation/ABI/testing/sysfs-bus-iio +8
-0@@ -1470,3 +1470,11 @@ KernelVersion: 4.3 Contact: [email protected] Description: Raw (unscaled no offset etc.) percentage reading of a substance. + +What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw +What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw +KernelVersion: 4.3 +Contact: [email protected] +Description: + Raw (unscaled no offset etc.) resistance reading that can be processed + into an ohm value.drivers/iio/industrialio-core.c +1
-0@@ -76,6 +76,7 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_DISTANCE] = "distance", [IIO_VELOCITY] = "velocity", [IIO_CONCENTRATION] = "concentration", + [IIO_RESISTANCE] = "resistance", };static const char *const iio_modifier_names[] = {include/uapi/linux/iio/types.h +0
-0
include/uapi/linux/iio/types.h enum iio_chan_type { · line 42
Quoted 7 lines
include/uapi/linux/iio/types.h +1
-0@@ -36,6 +36,7 @@ enum iio_chan_type {IIO_DISTANCE ,IIO_VELOCITY ,IIO_CONCENTRATION , + IIO_RESISTANCE, }; enum iio_modifier {
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 3/4 devicetree: add SGX Sensortech vendor id
In reply to Matt Ranostay--- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -191,6 +191,7 @@ sbs Smart Battery System schindler Schindler seagate Seagate Technology PLC semtech Semtech Corporation +sgx SGX Sensortech sharp Sharp Corporation sil Silicon Image silabs Silicon Laboratories
Signature · 1 line
1.9.1
Re: [PATCH v5 3/4] devicetree: add SGX Sensortech vendor id
Quoted 1 line · Matt Ranostay
Signed-off-by Matt Ranostay <[email protected]>
Applied. Note there was fuzz in my tree as I am lagging mainline somewhat. However it is pretty obvious how to fix up merge issues in this file so lets not worry about that ;)
Jonathan
Quoted 17 lines
--- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/vendor-prefixes.txt +1
-0@@ -191,6 +191,7 @@ sbs Smart Battery System schindler Schindler seagate Seagate Technology PLC semtech Semtech Corporation +sgx SGX Sensortech sharp Sharp Corporation sil Silicon Image silabs Silicon Laboratories
PATCH v5 4/4 iio: chemical: add SGX VZ89x VOC sensor support
In reply to Matt RanostayAdd support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.c
Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7 -0
@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.
Documentation/devicetree/bindings/i2c/trivial-devices.txt +1 -0
@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)
drivers/iio/Kconfig +1 -0
@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"
drivers/iio/Makefile +1 -0
@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/
drivers/iio/chemical/Kconfig new file +15 -0
@@ -0,0 +1,15 @@ +# +# Chemical sensors +# + +menu "Indoor Air Quality sensors" + +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenu
drivers/iio/chemical/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.o
drivers/iio/chemical/vz89x.c new file +237 -0
237 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
Quoted 3 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for _CONCENTRATION etc. also for tools/iio/iio_event_monitor.c?
and comment below
Quoted 70 lines
Signed-off-by Matt Ranostay <[email protected]>--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +1
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +1
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0
drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0@@ -0,0 +1,15 @@ +# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"
the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Quoted 266 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +237
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" , + .of_match_table =of_match_ptr (vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
Peter Meerwald +43-664-2444418 (mobile)
Re: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
Quoted 83 lines · Peter Meerwald
Quoted 4 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for
_CONCENTRATIONetc. also fortools/iio/iio_event_monitor.c?and comment below
Quoted 70 lines
Signed-off-by Matt Ranostay <[email protected]>---
.../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+)create mode 100644
Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89xcreate mode 100644drivers/iio/chemical/Kconfig
create mode 100644drivers/iio/chemical/Makefile
create mode 100644drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +0
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK ICricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
+sgx,vz89x SGX Sensortech VZ89X Sensors
sii,s35390a 2-wire CMOS real-time clock
skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +0
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGERsource "
drivers/iio/accel/Kconfig"
source "drivers/iio/adc/Kconfig"
source "drivers/iio/amplifiers/Kconfig"
+source "drivers/iio/chemical/Kconfig"
source "drivers/iio/common/Kconfig"
source "drivers/iio/dac/Kconfig"
source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +0
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.oobj-y += accel/
obj-y += adc/
obj-y += amplifiers/
+obj-y += chemical/
obj-y += common/
obj-y += dac/
obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0@@ -0,0 +1,15 @@
Quoted 8 lines
drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0+# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Yeah I don't really care what the menu item is named. Any thoughts on just Chemical Sensors ?
Quoted 271 lines
Quoted 266 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +237
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" , + .of_match_table =of_match_ptr (vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );Signature · 2 lines
Peter Meerwald +43-664-2444418 (mobile)
Re: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
In reply to Peter MeerwaldQuoted 6 lines · Peter Meerwald
Quoted 3 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for
_CONCENTRATIONetc. also fortools/iio/iio_event_monitor.c?
should this include modifiers?
Quoted 353 lines
and comment below
Quoted 70 lines
Signed-off-by Matt Ranostay <[email protected]>--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +1
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +1
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0@@ -0,0 +1,15 @@ +# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Quoted 256 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +227
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" ,drivers/iio/chemical/vz89x.c line 237
Quoted 10 lines
drivers/iio/chemical/vz89x.c new file +10
-0+ .of_match_table = of_match_ptr(vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );--
Peter Meerwald
+43-664-2444418 (mobile)
Jonathan Cameron
maintainerRe: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
In reply to Peter MeerwaldQuoted 6 lines · Peter Meerwald
Quoted 3 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for
_CONCENTRATIONetc. also fortools/iio/iio_event_monitor.c?
Rather than going through another complete version of this series, would you mind doing that as a follow up patch?
Quoted 2 lines
and comment below
I've fixed this up as chemical sensors when applying.
Quoted 71 lines
Quoted 71 lines
Signed-off-by Matt Ranostay <[email protected]>--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +1
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +1
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0@@ -0,0 +1,15 @@
Quoted 8 lines
drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0+# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Lets just go with Chemical sensors.
Quoted 268 lines
Quoted 267 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +237
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" , + .of_match_table =of_match_ptr (vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
Quoted 9 lines · Jonathan Cameron
Quoted 6 lines · Peter Meerwald
Quoted 3 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for
_CONCENTRATIONetc. also fortools/iio/iio_event_monitor.c?Rather than going through another complete version of this series, would you mind doing that as a follow up patch?
I'll do it as a follow on unless see below.... should IIO_RESISTANCE to iio_event_monitor.c be added as well?
Quoted 4 lines
Quoted 3 lines
and comment below
I've fixed this up as chemical sensors when applying.
Actually have found a HW bug that affects one in like 1000 reads. Need to submit one more series to workaround it.... so should I add the previous to the next version?
Quoted 352 lines
Quoted 71 lines
Quoted 71 lines
Signed-off-by Matt Ranostay <[email protected]>--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +1
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +1
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0@@ -0,0 +1,15 @@Quoted 8 lines
drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0+# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Lets just go with Chemical sensors.
Quoted 268 lines
Quoted 267 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +237
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" , + .of_match_table =of_match_ptr (vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );
Re: [PATCH v5 4/4] iio: chemical: add SGX VZ89x VOC sensor support
Heh didn't see the part of it getting applied. I can submit the HW workaround in the follow up along with the iio event changes :)
Quoted 375 lines · Matt Ranostay
Quoted 9 lines · Jonathan Cameron
Quoted 6 lines · Peter Meerwald
Quoted 3 lines
Add support for VZ89X sensors VOC and CO2 reporting channels in percentage which can be converted to part per million.
can you make the proper changes for
_CONCENTRATIONetc. also fortools/iio/iio_event_monitor.c?Rather than going through another complete version of this series, would you mind doing that as a follow up patch?
I'll do it as a follow on unless see below.... should
IIO_RESISTANCEtoiio_event_monitor.cbe added as well?Quoted 4 lines
Quoted 3 lines
and comment below
I've fixed this up as chemical sensors when applying.
Actually have found a HW bug that affects one in like 1000 reads. Need to submit one more series to workaround it.... so should I add the previous to the next version?
Quoted 352 lines
Quoted 71 lines
Quoted 71 lines
Signed-off-by Matt Ranostay <[email protected]>--- .../ABI/testing/sysfs-bus-iio-chemical-vz89x | 7 + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/chemical/Kconfig | 15 ++ drivers/iio/chemical/Makefile | 6 + drivers/iio/chemical/vz89x.c | 237 +++++++++++++++++++++ 7 files changed, 268 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x create mode 100644 drivers/iio/chemical/Kconfig create mode 100644 drivers/iio/chemical/Makefile create mode 100644 drivers/iio/chemical/vz89x.cDocumentation/ABI/testing/sysfs-bus-iio-chemical-vz89x new file +7
-0@@ -0,0 +1,7 @@ +What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw +Date: September 2015 +KernelVersion: 4.3 +Contact: Matt Ranostay <[email protected]> +Description: + Get the raw calibration VOC value from the sensor. + This value has little application outside of calibration.Documentation/devicetree/bindings/i2c/trivial-devices.txt +1
-0@@ -88,6 +88,7 @@ ricoh,rs5c372b I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c386 I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC samsung,24ad0xd1 S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power) +sgx,vz89x SGX Sensortech VZ89X Sensors sii,s35390a 2-wire CMOS real-time clock skyworks,sky81452 Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply st-micro,24c256 i2c serial eeprom (24cxx)drivers/iio/Kconfig +1
-0@@ -61,6 +61,7 @@ config IIO_CONSUMERS_PER_TRIGGER source "drivers/iio/accel/Kconfig" source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" +source "drivers/iio/chemical/Kconfig" source "drivers/iio/common/Kconfig" source "drivers/iio/dac/Kconfig" source "drivers/iio/frequency/Kconfig"drivers/iio/Makefile +1
-0@@ -14,6 +14,7 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o obj-y += accel/ obj-y += adc/ obj-y += amplifiers/ +obj-y += chemical/ obj-y += common/ obj-y += dac/ obj-y += gyro/drivers/iio/chemical/Kconfig new file +0
-0@@ -0,0 +1,15 @@Quoted 8 lines
drivers/iio/chemical/Kconfig line 5
Quoted 5 lines
drivers/iio/chemical/Kconfig new file +5
-0+# +# Chemical sensors +# + +menu "Indoor Air Quality sensors"the comment above says 'Chemical sensors', the menu item 'Indoor Air Quality sensors' -- I guess an outdoor sensor would fit here as well...
Lets just go with Chemical sensors.
Quoted 268 lines
Quoted 267 lines
drivers/iio/chemical/Kconfig new file +10
-0+ +config VZ89X + tristate "SGX Sensortech MiCS VZ89X VOC sensor" + depends on I2C + help + Say Y here to build I2C interface support for the SGX + Sensortech MiCS VZ89X VOC (Volatile Organic Compounds) + sensors + +endmenudrivers/iio/chemical/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# +# Makefile for IIO chemical sensors +# + +# When adding new entries keep the list in alphabetical order +obj-$(CONFIG_VZ89X) += vz89x.odrivers/iio/chemical/vz89x.c new file +237
-0@@ -0,0 +1,237 @@ +/* +* vz89x.c - Support for SGX Sensortech MiCS VZ89X VOC sensors +* +* Copyright (C) 2015 Matt Ranostay <[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/init.h> +#include <linux/i2c.h> + +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> + +#define VZ89X_REG_MEASUREMENT 0x09 +#define VZ89X_REG_MEASUREMENT_SIZE 6 + +#define VZ89X_VOC_CO2_IDX 0 +#define VZ89X_VOC_SHORT_IDX 1 +#define VZ89X_VOC_TVOC_IDX 2 +#define VZ89X_VOC_RESISTANCE_IDX 3 + +struct vz89x_data { +struct i2c_client *client; +struct mutex lock; +unsigned long last_update; + +u8 buffer[VZ89X_REG_MEASUREMENT_SIZE ]; +}; + +static const struct iio_chan_spec vz89x_channels[] = { + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_CO2 , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_CO2_IDX , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_SHORT_IDX , + .extend_name ="short" , + }, + { + .type =IIO_CONCENTRATION , + .channel2 =IIO_MOD_VOC , + .modified =1 , + .info_mask_separate = +BIT (IIO_CHAN_INFO_OFFSET ) |BIT (IIO_CHAN_INFO_RAW ), + .address =VZ89X_VOC_TVOC_IDX , + }, + { + .type =IIO_RESISTANCE , + .info_mask_separate = +BIT (IIO_CHAN_INFO_RAW ) |BIT (IIO_CHAN_INFO_SCALE ), + .address =VZ89X_VOC_RESISTANCE_IDX , + }, +}; + +static IIO_CONST_ATTR(in_concentration_co2_scale, "0.00000698689"); +static IIO_CONST_ATTR(in_concentration_voc_scale, "0.00000000436681223"); + +static struct attribute *vz89x_attributes[] = { + &iio_const_attr_in_concentration_co2_scale.dev_attr.attr, + &iio_const_attr_in_concentration_voc_scale.dev_attr.attr, +NULL , +}; + +static const struct attribute_group vz89x_attrs_group = { + .attrs = vz89x_attributes, +}; + +static int vz89x_get_measurement (struct vz89x_data *data) +{ +int ret; +int i; + +/* sensor can only be polled once a second max per datasheet */ +if (!time_after (jiffies, data->last_update +HZ )) +return 0 ; + + ret =i2c_smbus_write_word_data (data->client, +VZ89X_REG_MEASUREMENT ,0 ); +if (ret <0 ) +return ret; + +for (i =0 ; i <VZ89X_REG_MEASUREMENT_SIZE ; i++) { + ret =i2c_smbus_read_byte (data->client); +if (ret <0 ) +return ret; + data->buffer[i] = ret; + } + + data->last_update = jiffies; + +return 0 ; +} + +static int vz89x_get_resistance_reading (struct vz89x_data *data) +{ +u8 *buf = &data->buffer[VZ89X_VOC_TVOC_IDX ]; + +return buf[0 ] | (buf[1 ] <<8 ) | (buf[2 ] <<16 ); +} + +static int vz89x_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan,int *val, +int *val2,long mask) +{ +struct vz89x_data *data =iio_priv (indio_dev); +int ret = -EINVAL ; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&data->lock); + ret =vz89x_get_measurement (data); +mutex_unlock (&data->lock); + +if (ret) +return ret; + +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : +case VZ89X_VOC_SHORT_IDX : +case VZ89X_VOC_TVOC_IDX : + *val = data->buffer[chan->address]; +return IIO_VAL_INT ; +case VZ89X_VOC_RESISTANCE_IDX : + *val =vz89x_get_resistance_reading (data); +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_RESISTANCE : + *val =10 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +break ; +case IIO_CHAN_INFO_OFFSET : +switch (chan->address) { +case VZ89X_VOC_CO2_IDX : + *val =44 ; + *val2 =250000 ; +return IIO_VAL_INT_PLUS_MICRO ; +case VZ89X_VOC_TVOC_IDX : + *val =-13 ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } + } + +return ret; +} + +static const struct iio_info vz89x_info = { + .attrs = &vz89x_attrs_group, + .read_raw = vz89x_read_raw, + .driver_module =THIS_MODULE , +}; + +static int vz89x_probe (struct i2c_client *client, +const struct i2c_device_id *id) +{ +struct iio_dev *indio_dev; +struct vz89x_data *data; + +if (!i2c_check_functionality (client->adapter,I2C_FUNC_SMBUS_WORD_DATA | +I2C_FUNC_SMBUS_BYTE )) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +i2c_set_clientdata (client, indio_dev); + data->client = client; + data->last_update = jiffies -HZ ; +mutex_init (&data->lock); + + indio_dev->dev.parent = &client->dev; + indio_dev->info = &vz89x_info, + indio_dev->name =dev_name (&client->dev); + indio_dev->modes =INDIO_DIRECT_MODE ; + + indio_dev->channels = vz89x_channels; + indio_dev->num_channels =ARRAY_SIZE (vz89x_channels); + +return devm_iio_device_register (&client->dev, indio_dev); +} + +static const struct i2c_device_id vz89x_id[] = { + {"vz89x" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, vz89x_id); + +static const struct of_device_id vz89x_dt_ids[] = { + { .compatible ="sgx,vz89x" }, + { } +}; +MODULE_DEVICE_TABLE (of, vz89x_dt_ids); + +static struct i2c_driver vz89x_driver = { + .driver = { + .name ="vz89x" , + .of_match_table =of_match_ptr (vz89x_dt_ids), + }, + .probe = vz89x_probe, + .id_table = vz89x_id, +}; +module_i2c_driver (vz89x_driver); + +MODULE_AUTHOR ("Matt Ranostay <[email protected]>" ); +MODULE_DESCRIPTION ("SGX Sensortech MiCS VZ89X VOC sensors" ); +MODULE_LICENSE ("GPL v2" );