[PATCH v2 0/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[PATCH v2 0/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Matt Ranostay]

Add support for Alas EZO O2 sensor, rework driver to allow this to be done, and
added IIO_MOD_O2 modifier.

Changes from v1:
* rebased on modifier changes for IIO_MOD_H2/ETHANOL string identifiers

Matt Ranostay (3):
  iio: add IIO_MOD_O2 modifier
  dt-bindings: iio: chemical: add O2 EZO module documentation
  iio: chemical: atlas-ezo-sensor: add support for O2 sensor

 Documentation/ABI/testing/sysfs-bus-iio       |  2 +
 .../bindings/iio/chemical/atlas,sensor.yaml   |  2 +
 drivers/iio/chemical/atlas-ezo-sensor.c       | 74 ++++++++++++++-----
 drivers/iio/industrialio-core.c               |  1 +
 include/uapi/linux/iio/types.h                |  1 +
 tools/iio/iio_event_monitor.c                 |  2 +
 6 files changed, 63 insertions(+), 19 deletions(-)

-- 
2.27.0

[PATCH v2 1/3] iio: add IIO_MOD_O2 modifier

[Matt Ranostay]

Add modifier IIO_MOD_O2 for O2 concentration reporting

Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 Documentation/ABI/testing/sysfs-bus-iio | 2 ++
 drivers/iio/industrialio-core.c         | 1 +
 include/uapi/linux/iio/types.h          | 1 +
 tools/iio/iio_event_monitor.c           | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index d3e53a6d8331..5166d905a830 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1564,6 +1564,8 @@ What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
 What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
 What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
 What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
+What:		/sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
+What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_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
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 352533342702..b25c5af148de 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -132,6 +132,7 @@ static const char * const iio_modifier_names[] = {
 	[IIO_MOD_PM10] = "pm10",
 	[IIO_MOD_ETHANOL] = "ethanol",
 	[IIO_MOD_H2] = "h2",
+	[IIO_MOD_O2] = "o2",
 };
 
 /* relies on pairs of these shared then separate */
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index fdd81affca4b..48c13147c0a8 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -94,6 +94,7 @@ enum iio_modifier {
 	IIO_MOD_PM10,
 	IIO_MOD_ETHANOL,
 	IIO_MOD_H2,
+	IIO_MOD_O2,
 };
 
 enum iio_event_type {
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
index f115d166c985..bb03859db89d 100644
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@ -119,6 +119,7 @@ static const char * const iio_modifier_names[] = {
 	[IIO_MOD_PM2P5] = "pm2p5",
 	[IIO_MOD_PM4] = "pm4",
 	[IIO_MOD_PM10] = "pm10",
+	[IIO_MOD_O2] = "o2",
 };
 
 static bool event_is_known(struct iio_event_data *event)
@@ -211,6 +212,7 @@ static bool event_is_known(struct iio_event_data *event)
 	case IIO_MOD_PM2P5:
 	case IIO_MOD_PM4:
 	case IIO_MOD_PM10:
+	case IIO_MOD_O2:
 		break;
 	default:
 		return false;
-- 
2.27.0

[PATCH v2 2/3] dt-bindings: iio: chemical: add O2 EZO module documentation

[Matt Ranostay]

Cc: devicetree@vger.kernel.org
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 .../devicetree/bindings/iio/chemical/atlas,sensor.yaml          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml
index 69e8931e0ae8..46496dc250f2 100644
--- a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml
+++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml
@@ -19,6 +19,7 @@ description: |
     http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf
     http://www.atlas-scientific.com/_files/_datasheets/_oem/RTD_oem_datasheet.pdf
     http://www.atlas-scientific.com/_files/_datasheets/_probe/EZO_CO2_Datasheet.pdf
+    https://www.atlas-scientific.com/files/EZO_O2_datasheet.pdf
 
 properties:
   compatible:
@@ -29,6 +30,7 @@ properties:
       - atlas,ph-sm
       - atlas,rtd-sm
       - atlas,co2-ezo
+      - atlas,o2-ezo
 
   reg:
      maxItems: 1
-- 
2.27.0

[PATCH v2 3/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Matt Ranostay]

Add support for the Atlas EZO O2 chemical sensor which required
some refactoring of the driver and parsing of i2c transfer.

Sensor data is converted by the scaling value from percent to
IIO_CONCENTRATION.

Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 drivers/iio/chemical/atlas-ezo-sensor.c | 74 ++++++++++++++++++-------
 1 file changed, 55 insertions(+), 19 deletions(-)

diff --git a/drivers/iio/chemical/atlas-ezo-sensor.c b/drivers/iio/chemical/atlas-ezo-sensor.c
index a94eb8a6bf32..94188c84e65f 100644
--- a/drivers/iio/chemical/atlas-ezo-sensor.c
+++ b/drivers/iio/chemical/atlas-ezo-sensor.c
@@ -16,10 +16,11 @@
 #include <linux/iio/iio.h>
 
 #define ATLAS_EZO_DRV_NAME		"atlas-ezo-sensor"
-#define ATLAS_CO2_INT_TIME_IN_MS	950
+#define ATLAS_INT_TIME_IN_MS		950
 
 enum {
 	ATLAS_CO2_EZO,
+	ATLAS_O2_EZO,
 };
 
 struct atlas_ezo_device {
@@ -38,31 +39,54 @@ struct atlas_ezo_data {
 	u8 buffer[8];
 };
 
+#define ATLAS_CONCENTRATION_CHANNEL(_modifier) \
+	{ \
+		.type = IIO_CONCENTRATION, \
+		.modified = 1,\
+		.channel2 = _modifier, \
+		.info_mask_separate = \
+			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), \
+		.scan_index = 0, \
+		.scan_type =  { \
+			.sign = 'u', \
+			.realbits = 32, \
+			.storagebits = 32, \
+			.endianness = IIO_CPU, \
+		}, \
+	}
+
 static const struct iio_chan_spec atlas_co2_ezo_channels[] = {
-	{
-		.type = IIO_CONCENTRATION,
-		.modified = 1,
-		.channel2 = IIO_MOD_CO2,
-		.info_mask_separate =
-			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-		.scan_index = 0,
-		.scan_type = {
-			.sign = 'u',
-			.realbits = 32,
-			.storagebits = 32,
-			.endianness = IIO_CPU,
-		},
-	},
+	ATLAS_CONCENTRATION_CHANNEL(IIO_MOD_CO2),
+};
+
+static const struct iio_chan_spec atlas_o2_ezo_channels[] = {
+	ATLAS_CONCENTRATION_CHANNEL(IIO_MOD_O2),
 };
 
 static struct atlas_ezo_device atlas_ezo_devices[] = {
 	[ATLAS_CO2_EZO] = {
 		.channels = atlas_co2_ezo_channels,
 		.num_channels = 1,
-		.delay = ATLAS_CO2_INT_TIME_IN_MS,
+		.delay = ATLAS_INT_TIME_IN_MS,
 	},
+	[ATLAS_O2_EZO] = {
+		.channels = atlas_o2_ezo_channels,
+		.num_channels = 1,
+		.delay = ATLAS_INT_TIME_IN_MS,
+	}
 };
 
+static void atlas_ezo_sanitize(char *buf)
+{
+	char *ptr = strchr(buf, '.');
+
+	if (!ptr)
+		return;
+
+	for (; *ptr; ptr++)
+		*ptr = *(ptr + 1);
+}
+
 static int atlas_ezo_read_raw(struct iio_dev *indio_dev,
 			  struct iio_chan_spec const *chan,
 			  int *val, int *val2, long mask)
@@ -96,6 +120,9 @@ static int atlas_ezo_read_raw(struct iio_dev *indio_dev,
 			return -EBUSY;
 		}
 
+		/* removing floating point for fixed number representation */
+		atlas_ezo_sanitize(data->buffer + 2);
+
 		ret = kstrtol(data->buffer + 1, 10, &tmp);
 
 		*val = tmp;
@@ -105,9 +132,16 @@ static int atlas_ezo_read_raw(struct iio_dev *indio_dev,
 		return ret ? ret : IIO_VAL_INT;
 	}
 	case IIO_CHAN_INFO_SCALE:
-		*val = 0;
-		*val2 = 100; /* 0.0001 */
-		return IIO_VAL_INT_PLUS_MICRO;
+		switch (chan->channel2) {
+		case IIO_MOD_CO2:
+			*val = 0;
+			*val2 = 100; /* 0.0001 */
+			return IIO_VAL_INT_PLUS_MICRO;
+		case IIO_MOD_O2:
+			*val = 100;
+			return IIO_VAL_INT;
+		}
+		return -EINVAL;
 	}
 
 	return 0;
@@ -119,12 +153,14 @@ static const struct iio_info atlas_info = {
 
 static const struct i2c_device_id atlas_ezo_id[] = {
 	{ "atlas-co2-ezo", ATLAS_CO2_EZO },
+	{ "atlas-o2-ezo", ATLAS_O2_EZO },
 	{}
 };
 MODULE_DEVICE_TABLE(i2c, atlas_ezo_id);
 
 static const struct of_device_id atlas_ezo_dt_ids[] = {
 	{ .compatible = "atlas,co2-ezo", .data = (void *)ATLAS_CO2_EZO, },
+	{ .compatible = "atlas,o2-ezo", .data = (void *)ATLAS_O2_EZO, },
 	{}
 };
 MODULE_DEVICE_TABLE(of, atlas_ezo_dt_ids);
-- 
2.27.0

Re: [PATCH v2 0/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Jonathan Cameron]

On Mon, 20 Jul 2020 00:03:27 -0700
Matt Ranostay <matt.ranostay@konsulko.com> wrote:

> Add support for Alas EZO O2 sensor, rework driver to allow this to be done, and
> added IIO_MOD_O2 modifier.
> 
> Changes from v1:
> * rebased on modifier changes for IIO_MOD_H2/ETHANOL string identifiers
> 
Series applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan

> Matt Ranostay (3):
>   iio: add IIO_MOD_O2 modifier
>   dt-bindings: iio: chemical: add O2 EZO module documentation
>   iio: chemical: atlas-ezo-sensor: add support for O2 sensor
> 
>  Documentation/ABI/testing/sysfs-bus-iio       |  2 +
>  .../bindings/iio/chemical/atlas,sensor.yaml   |  2 +
>  drivers/iio/chemical/atlas-ezo-sensor.c       | 74 ++++++++++++++-----
>  drivers/iio/industrialio-core.c               |  1 +
>  include/uapi/linux/iio/types.h                |  1 +
>  tools/iio/iio_event_monitor.c                 |  2 +
>  6 files changed, 63 insertions(+), 19 deletions(-)
> 

Re: [PATCH v2 3/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Andy Shevchenko]

On Mon, Jul 20, 2020 at 10:05 AM Matt Ranostay
<matt.ranostay@konsulko.com> wrote:
>
> Add support for the Atlas EZO O2 chemical sensor which required
> some refactoring of the driver and parsing of i2c transfer.
>
> Sensor data is converted by the scaling value from percent to
> IIO_CONCENTRATION.

...

> +static void atlas_ezo_sanitize(char *buf)
> +{
> +       char *ptr = strchr(buf, '.');
> +
> +       if (!ptr)
> +               return;
> +
> +       for (; *ptr; ptr++)
> +               *ptr = *(ptr + 1);
> +}

NIH of memmove()? Why?

And actually to avoid strlen() you may do it other way around, i.e
shift integer part one character right and return new buffer pointer.


if (!ptr)
  return buf;

memmove(buf + 1, buf, ptr - buf);
return buf + 1;

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 3/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Andy Shevchenko]

On Tue, Jul 21, 2020 at 9:46 PM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Mon, Jul 20, 2020 at 10:05 AM Matt Ranostay
> <matt.ranostay@konsulko.com> wrote:

...

> memmove(buf + 1, buf, ptr - buf);

ptr - buf - 1 (off-by-one classic! But double check)

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v2 3/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Matt Ranostay]

On Tue, Jul 21, 2020 at 11:46 AM Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
>
> On Mon, Jul 20, 2020 at 10:05 AM Matt Ranostay
> <matt.ranostay@konsulko.com> wrote:
> >
> > Add support for the Atlas EZO O2 chemical sensor which required
> > some refactoring of the driver and parsing of i2c transfer.
> >
> > Sensor data is converted by the scaling value from percent to
> > IIO_CONCENTRATION.
>
> ...
>
> > +static void atlas_ezo_sanitize(char *buf)
> > +{
> > +       char *ptr = strchr(buf, '.');
> > +
> > +       if (!ptr)
> > +               return;
> > +
> > +       for (; *ptr; ptr++)
> > +               *ptr = *(ptr + 1);
> > +}
>
> NIH of memmove()? Why?

Mainly since I forgot that POSIX function. I'll fix it up when possible

- Matt

>
> And actually to avoid strlen() you may do it other way around, i.e
> shift integer part one character right and return new buffer pointer.
>
>
> if (!ptr)
>   return buf;
>
> memmove(buf + 1, buf, ptr - buf);
> return buf + 1;
>
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH v2 3/3] iio: chemical: atlas-ezo-sensor: add support for O2 sensor

[Jonathan Cameron]

On Tue, 21 Jul 2020 21:38:11 -0700
Matt Ranostay <matt.ranostay@konsulko.com> wrote:

> On Tue, Jul 21, 2020 at 11:46 AM Andy Shevchenko
> <andy.shevchenko@gmail.com> wrote:
> >
> > On Mon, Jul 20, 2020 at 10:05 AM Matt Ranostay
> > <matt.ranostay@konsulko.com> wrote:  
> > >
> > > Add support for the Atlas EZO O2 chemical sensor which required
> > > some refactoring of the driver and parsing of i2c transfer.
> > >
> > > Sensor data is converted by the scaling value from percent to
> > > IIO_CONCENTRATION.  
> >
> > ...
> >  
> > > +static void atlas_ezo_sanitize(char *buf)
> > > +{
> > > +       char *ptr = strchr(buf, '.');
> > > +
> > > +       if (!ptr)
> > > +               return;
> > > +
> > > +       for (; *ptr; ptr++)
> > > +               *ptr = *(ptr + 1);
> > > +}  
> >
> > NIH of memmove()? Why?  
> 
> Mainly since I forgot that POSIX function. I'll fix it up when possible
> 
> - Matt

I've dropped the series for now.  Lets just have a v3 with these
bits tidied up. It will have to wait for the next cycle however as I'll
be doing what is probably the last pull for this cycle in a few minutes.

Thanks,

Jonathan

> 
> >
> > And actually to avoid strlen() you may do it other way around, i.e
> > shift integer part one character right and return new buffer pointer.
> >
> >
> > if (!ptr)
> >   return buf;
> >
> > memmove(buf + 1, buf, ptr - buf);
> > return buf + 1;
> >
> > --
> > With Best Regards,
> > Andy Shevchenko  

Re: [PATCH v2 2/3] dt-bindings: iio: chemical: add O2 EZO module documentation

[Rob Herring]

On Mon, 20 Jul 2020 00:03:29 -0700, Matt Ranostay wrote:
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
> ---
>  .../devicetree/bindings/iio/chemical/atlas,sensor.yaml          | 2 ++
>  1 file changed, 2 insertions(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 2/3] dt-bindings: iio: chemical: add O2 EZO module documentation

[Jonathan Cameron]

On Thu, 23 Jul 2020 11:47:31 -0600
Rob Herring <robh@kernel.org> wrote:

> On Mon, 20 Jul 2020 00:03:29 -0700, Matt Ranostay wrote:
> > Cc: devicetree@vger.kernel.org
> > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
> > ---
> >  .../devicetree/bindings/iio/chemical/atlas,sensor.yaml          | 2 ++
> >  1 file changed, 2 insertions(+)
> >   
> 
> Acked-by: Rob Herring <robh@kernel.org>
Applied.

Thanks,