* [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels
@ 2020-04-19 23:28 Matt Ranostay
2020-04-22 17:27 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Matt Ranostay @ 2020-04-19 23:28 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, Matt Ranostay
IIO_CONCENTRATION channel for the DO-SM shouldn't be indexed as
there isn't more than one, and also ATLAS_CONCENTRATION_CHANNEL
macro scan_index define steps on the IIO_TIMESTAMP channel.
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/chemical/atlas-sensor.c b/drivers/iio/chemical/atlas-sensor.c
index 82d470561ad3..7b199ce16ecf 100644
--- a/drivers/iio/chemical/atlas-sensor.c
+++ b/drivers/iio/chemical/atlas-sensor.c
@@ -194,7 +194,19 @@ static const struct iio_chan_spec atlas_orp_channels[] = {
};
static const struct iio_chan_spec atlas_do_channels[] = {
- ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),
+ {
+ .type = IIO_CONCENTRATION,
+ .address = ATLAS_REG_DO_DATA,
+ .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_BE,
+ },
+ },
IIO_CHAN_SOFT_TIMESTAMP(1),
{
.type = IIO_TEMP,
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels
2020-04-19 23:28 [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels Matt Ranostay
@ 2020-04-22 17:27 ` Jonathan Cameron
2020-04-23 3:42 ` Matt Ranostay
0 siblings, 1 reply; 5+ messages in thread
From: Jonathan Cameron @ 2020-04-22 17:27 UTC (permalink / raw)
To: Matt Ranostay; +Cc: jic23, linux-iio
On Mon, 20 Apr 2020 02:28:47 +0300
Matt Ranostay <matt.ranostay@konsulko.com> wrote:
> IIO_CONCENTRATION channel for the DO-SM shouldn't be indexed as
> there isn't more than one, and also ATLAS_CONCENTRATION_CHANNEL
> macro scan_index define steps on the IIO_TIMESTAMP channel.
>
> Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
Fixes tag?
J
> ---
> drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/chemical/atlas-sensor.c
> b/drivers/iio/chemical/atlas-sensor.c index
> 82d470561ad3..7b199ce16ecf 100644 ---
> a/drivers/iio/chemical/atlas-sensor.c +++
> b/drivers/iio/chemical/atlas-sensor.c @@ -194,7 +194,19 @@ static
> const struct iio_chan_spec atlas_orp_channels[] = { };
>
> static const struct iio_chan_spec atlas_do_channels[] = {
> - ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),
> + {
> + .type = IIO_CONCENTRATION,
> + .address = ATLAS_REG_DO_DATA,
> + .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_BE,
> + },
> + },
> IIO_CHAN_SOFT_TIMESTAMP(1),
> {
> .type = IIO_TEMP,
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels
2020-04-22 17:27 ` Jonathan Cameron
@ 2020-04-23 3:42 ` Matt Ranostay
2020-04-23 3:43 ` Matt Ranostay
0 siblings, 1 reply; 5+ messages in thread
From: Matt Ranostay @ 2020-04-23 3:42 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Jonathan Cameron, open list:IIO SUBSYSTEM AND DRIVERS
On Wed, Apr 22, 2020 at 10:27 AM Jonathan Cameron
<Jonathan.Cameron@huawei.com> wrote:
>
> On Mon, 20 Apr 2020 02:28:47 +0300
> Matt Ranostay <matt.ranostay@konsulko.com> wrote:
>
> > IIO_CONCENTRATION channel for the DO-SM shouldn't be indexed as
> > there isn't more than one, and also ATLAS_CONCENTRATION_CHANNEL
> > macro scan_index define steps on the IIO_TIMESTAMP channel.
> >
Fixes: 1a881ed8a43b (iio: chemical: atlas-sensor: add RTD-SM module support)
> > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
>
> Fixes tag?
>
> J
> > ---
> > drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++-
> > 1 file changed, 13 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/iio/chemical/atlas-sensor.c
> > b/drivers/iio/chemical/atlas-sensor.c index
> > 82d470561ad3..7b199ce16ecf 100644 ---
> > a/drivers/iio/chemical/atlas-sensor.c +++
> > b/drivers/iio/chemical/atlas-sensor.c @@ -194,7 +194,19 @@ static
> > const struct iio_chan_spec atlas_orp_channels[] = { };
> >
> > static const struct iio_chan_spec atlas_do_channels[] = {
> > - ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),
> > + {
> > + .type = IIO_CONCENTRATION,
> > + .address = ATLAS_REG_DO_DATA,
> > + .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_BE,
> > + },
> > + },
> > IIO_CHAN_SOFT_TIMESTAMP(1),
> > {
> > .type = IIO_TEMP,
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels
2020-04-23 3:42 ` Matt Ranostay
@ 2020-04-23 3:43 ` Matt Ranostay
2020-04-25 13:37 ` Jonathan Cameron
0 siblings, 1 reply; 5+ messages in thread
From: Matt Ranostay @ 2020-04-23 3:43 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: Jonathan Cameron, open list:IIO SUBSYSTEM AND DRIVERS
On Wed, Apr 22, 2020 at 8:42 PM Matt Ranostay
<matt.ranostay@konsulko.com> wrote:
>
> On Wed, Apr 22, 2020 at 10:27 AM Jonathan Cameron
> <Jonathan.Cameron@huawei.com> wrote:
> >
> > On Mon, 20 Apr 2020 02:28:47 +0300
> > Matt Ranostay <matt.ranostay@konsulko.com> wrote:
> >
> > > IIO_CONCENTRATION channel for the DO-SM shouldn't be indexed as
> > > there isn't more than one, and also ATLAS_CONCENTRATION_CHANNEL
> > > macro scan_index define steps on the IIO_TIMESTAMP channel.
> > >
>
> Fixes: 1a881ed8a43b (iio: chemical: atlas-sensor: add RTD-SM module support)
Oops wrong change for Fixes tag. Sorry about that..
Fixes: a751b8e48018 (iio: chemical: atlas-sensor: add DO-SM module support)
>
> > > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
> >
> > Fixes tag?
> >
> > J
> > > ---
> > > drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++-
> > > 1 file changed, 13 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/iio/chemical/atlas-sensor.c
> > > b/drivers/iio/chemical/atlas-sensor.c index
> > > 82d470561ad3..7b199ce16ecf 100644 ---
> > > a/drivers/iio/chemical/atlas-sensor.c +++
> > > b/drivers/iio/chemical/atlas-sensor.c @@ -194,7 +194,19 @@ static
> > > const struct iio_chan_spec atlas_orp_channels[] = { };
> > >
> > > static const struct iio_chan_spec atlas_do_channels[] = {
> > > - ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),
> > > + {
> > > + .type = IIO_CONCENTRATION,
> > > + .address = ATLAS_REG_DO_DATA,
> > > + .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_BE,
> > > + },
> > > + },
> > > IIO_CHAN_SOFT_TIMESTAMP(1),
> > > {
> > > .type = IIO_TEMP,
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels
2020-04-23 3:43 ` Matt Ranostay
@ 2020-04-25 13:37 ` Jonathan Cameron
0 siblings, 0 replies; 5+ messages in thread
From: Jonathan Cameron @ 2020-04-25 13:37 UTC (permalink / raw)
To: Matt Ranostay; +Cc: Jonathan Cameron, open list:IIO SUBSYSTEM AND DRIVERS
On Wed, 22 Apr 2020 20:43:15 -0700
Matt Ranostay <matt.ranostay@konsulko.com> wrote:
> On Wed, Apr 22, 2020 at 8:42 PM Matt Ranostay
> <matt.ranostay@konsulko.com> wrote:
> >
> > On Wed, Apr 22, 2020 at 10:27 AM Jonathan Cameron
> > <Jonathan.Cameron@huawei.com> wrote:
> > >
> > > On Mon, 20 Apr 2020 02:28:47 +0300
> > > Matt Ranostay <matt.ranostay@konsulko.com> wrote:
> > >
> > > > IIO_CONCENTRATION channel for the DO-SM shouldn't be indexed as
> > > > there isn't more than one, and also ATLAS_CONCENTRATION_CHANNEL
> > > > macro scan_index define steps on the IIO_TIMESTAMP channel.
> > > >
> >
> > Fixes: 1a881ed8a43b (iio: chemical: atlas-sensor: add RTD-SM module support)
>
> Oops wrong change for Fixes tag. Sorry about that..
>
> Fixes: a751b8e48018 (iio: chemical: atlas-sensor: add DO-SM module support)
So the index thing isn't really a fix as such. It's perfectly valid for
a single channel to be indexed even if not required. Still it's your
driver so if you prefer it this way fair enough.
The other bit obviously is a fix so I'll just take this whole thing as a
fix. Applied to the fixes-togreg branch of iio.git
Thanks,
Jonathan
>
> >
> > > > Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
> > >
> > > Fixes tag?
> > >
> > > J
> > > > ---
> > > > drivers/iio/chemical/atlas-sensor.c | 14 +++++++++++++-
> > > > 1 file changed, 13 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/drivers/iio/chemical/atlas-sensor.c
> > > > b/drivers/iio/chemical/atlas-sensor.c index
> > > > 82d470561ad3..7b199ce16ecf 100644 ---
> > > > a/drivers/iio/chemical/atlas-sensor.c +++
> > > > b/drivers/iio/chemical/atlas-sensor.c @@ -194,7 +194,19 @@ static
> > > > const struct iio_chan_spec atlas_orp_channels[] = { };
> > > >
> > > > static const struct iio_chan_spec atlas_do_channels[] = {
> > > > - ATLAS_CONCENTRATION_CHANNEL(0, ATLAS_REG_DO_DATA),
> > > > + {
> > > > + .type = IIO_CONCENTRATION,
> > > > + .address = ATLAS_REG_DO_DATA,
> > > > + .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_BE,
> > > > + },
> > > > + },
> > > > IIO_CHAN_SOFT_TIMESTAMP(1),
> > > > {
> > > > .type = IIO_TEMP,
> > >
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-25 13:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-19 23:28 [PATCH] iio: chemical: atlas-sensor: correct DO-SM channels Matt Ranostay
2020-04-22 17:27 ` Jonathan Cameron
2020-04-23 3:42 ` Matt Ranostay
2020-04-23 3:43 ` Matt Ranostay
2020-04-25 13:37 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox