From: Jonathan Cameron <jonathan.cameron@huawei.com>
To: Andrea Merello <andrea.merello@gmail.com>
Cc: Jonathan Cameron <jic23@kernel.org>,
<patrick.havelange@essensium.com>,
<paresh.chaudhary@rockwellcollins.com>, <pmeerw@pmeerw.net>,
<lars@metafoo.de>, <knaack.h@gmx.de>,
Matthew Weber <matthew.weber@rockwellcollins.com>,
Colin King <colin.king@canonical.com>,
<linux-iio@vger.kernel.org>
Subject: Re: [PATCH 2/3] iio: max31856: add support for configuring the HW averaging
Date: Thu, 17 Oct 2019 13:34:14 +0100 [thread overview]
Message-ID: <20191017133414.000062ae@huawei.com> (raw)
In-Reply-To: <CAN8YU5NPpcwcj1ik+yzWuvRheBzLtj3A75b_5FZtqw2osfoahQ@mail.gmail.com>
On Wed, 16 Oct 2019 15:33:42 +0200
Andrea Merello <andrea.merello@gmail.com> wrote:
> Il giorno dom 6 ott 2019 alle ore 09:55 Jonathan Cameron
> <jic23@kernel.org> ha scritto:
> >
> > On Mon, 23 Sep 2019 14:17:13 +0200
> > Andrea Merello <andrea.merello@gmail.com> wrote:
> >
> > > This sensor can perform samples averaging in hardware, but currently the
> > > driver leaves this setting alone (default is no averaging).
> > >
> > > This patch introduces a new IIO attribute that allows the user to set the
> > > averaging as desired (the HW supports averaging of 2, 5, 8 or 16 samples)
> > >
> > > Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
> >
> > Sounds like oversampling combined with a lower sampling frequency, so
> > there is standard ABI for that.
>
> OK. Do you refer to "oversampling_ratio"?
>
> The datasheet says this applies to thermocouple measure, but by doing
> some testing with real HW, it seems that this setting affects both
> thermocouple and cold-junction measures, so I guess it shouldn't be in
> the form "in_temp_raw_oversampling_ratio"; does this sound right to
> you?
Ah yes. oversampling_ratio it is. I should read our Docs :)
I think
in_temp_oversampling_ratio will be generated if you use the info_mask_shared_by_type
to do this.
_raw is just another type of information about the channel, rather than
part of the channel naming.
Thanks,
Jonathan
>
> > Jonathan
> >
> > > ---
> > > drivers/iio/temperature/max31856.c | 43 ++++++++++++++++++++++++++++++
> > > 1 file changed, 43 insertions(+)
> > >
> > > diff --git a/drivers/iio/temperature/max31856.c b/drivers/iio/temperature/max31856.c
> > > index d12613f7ba3c..8b2e0102fa5c 100644
> > > --- a/drivers/iio/temperature/max31856.c
> > > +++ b/drivers/iio/temperature/max31856.c
> > > @@ -24,6 +24,8 @@
> > > #define MAX31856_CR0_OCFAULT BIT(4)
> > > #define MAX31856_CR0_OCFAULT_MASK GENMASK(5, 4)
> > > #define MAX31856_CR0_FILTER_50HZ BIT(0)
> > > +#define MAX31856_AVERAGING_MASK GENMASK(6, 4)
> > > +#define MAX31856_AVERAGING_SHIFT 4
> > > #define MAX31856_TC_TYPE_MASK GENMASK(3, 0)
> > > #define MAX31856_FAULT_OVUV BIT(1)
> > > #define MAX31856_FAULT_OPEN BIT(0)
> > > @@ -65,6 +67,7 @@ struct max31856_data {
> > > struct spi_device *spi;
> > > u32 thermocouple_type;
> > > bool filter_50hz;
> > > + int averaging;
> > > };
> > >
> > > static int max31856_read(struct max31856_data *data, u8 reg,
> > > @@ -109,6 +112,10 @@ static int max31856_init(struct max31856_data *data)
> > >
> > > reg_cr1_val &= ~MAX31856_TC_TYPE_MASK;
> > > reg_cr1_val |= data->thermocouple_type;
> > > +
> > > + reg_cr1_val &= ~MAX31856_AVERAGING_MASK;
> > > + reg_cr1_val |= data->averaging << MAX31856_AVERAGING_SHIFT;
> > > +
> > > ret = max31856_write(data, MAX31856_CR1_REG, reg_cr1_val);
> > > if (ret)
> > > return ret;
> > > @@ -295,14 +302,50 @@ static ssize_t set_filter(struct device *dev,
> > > return len;
> > > }
> > >
> > > +static ssize_t show_averaging(struct device *dev,
> > > + struct device_attribute *attr,
> > > + char *buf)
> > > +{
> > > + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> > > + struct max31856_data *data = iio_priv(indio_dev);
> > > +
> > > + return sprintf(buf, "%d\n", 1 << data->averaging);
> > > +}
> > > +
> > > +static ssize_t set_averaging(struct device *dev,
> > > + struct device_attribute *attr,
> > > + const char *buf,
> > > + size_t len)
> > > +{
> > > + struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> > > + struct max31856_data *data = iio_priv(indio_dev);
> > > + unsigned int nsamples;
> > > + int shift;
> > > + int ret;
> > > +
> > > + ret = kstrtouint(buf, 10, &nsamples);
> > > + if (ret)
> > > + return ret;
> > > +
> > > + shift = fls(nsamples) - 1;
> > > + if (nsamples > 16 || BIT(shift) != nsamples)
> > > + return -EINVAL;
> > > +
> > > + data->averaging = shift;
> > > + max31856_init(data);
> > > + return len;
> > > +}
> > > +
> > > static IIO_DEVICE_ATTR(fault_ovuv, 0444, show_fault_ovuv, NULL, 0);
> > > static IIO_DEVICE_ATTR(fault_oc, 0444, show_fault_oc, NULL, 0);
> > > static IIO_DEVICE_ATTR(filter, 0644, show_filter, set_filter, 0);
> > > +static IIO_DEVICE_ATTR(averaging, 0644, show_averaging, set_averaging, 0);
> > >
> > > static struct attribute *max31856_attributes[] = {
> > > &iio_dev_attr_fault_ovuv.dev_attr.attr,
> > > &iio_dev_attr_fault_oc.dev_attr.attr,
> > > &iio_dev_attr_filter.dev_attr.attr,
> > > + &iio_dev_attr_averaging.dev_attr.attr,
> > > NULL,
> > > };
> > >
> >
next prev parent reply other threads:[~2019-10-17 12:34 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 12:17 [PATCH 0/3] iio: max31856: provide more configuration options Andrea Merello
2019-09-23 12:17 ` [PATCH 1/3] iio: max31856: add option for setting mains filter rejection frequency Andrea Merello
2019-10-06 7:54 ` Jonathan Cameron
2019-10-16 13:14 ` Andrea Merello
2019-10-17 12:32 ` Jonathan Cameron
2019-10-18 13:46 ` Andrea Merello
2019-10-22 9:34 ` Jonathan Cameron
2019-10-23 8:29 ` Andrea Merello
2019-10-27 9:22 ` Jonathan Cameron
2019-10-28 7:32 ` Andrea Merello
2019-11-02 14:17 ` Jonathan Cameron
2019-11-04 13:51 ` Andrea Merello
2019-09-23 12:17 ` [PATCH 2/3] iio: max31856: add support for configuring the HW averaging Andrea Merello
2019-10-06 7:55 ` Jonathan Cameron
2019-10-16 13:33 ` Andrea Merello
2019-10-17 12:34 ` Jonathan Cameron [this message]
2019-10-18 13:47 ` Andrea Merello
2019-09-23 12:17 ` [PATCH 3/3] iio: max31856: add support for runtime-configuring the thermocouple type Andrea Merello
2019-10-06 7:58 ` Jonathan Cameron
2019-10-16 13:43 ` Andrea Merello
2019-10-17 12:35 ` Jonathan Cameron
2019-10-18 13:48 ` Andrea Merello
2019-11-11 15:35 ` [v2 0/9] iio: max31856: provide more configuration options Andrea Merello
2019-11-11 15:35 ` [v2 1/9] iio: max31856: add option for setting mains filter rejection frequency Andrea Merello
2019-11-11 22:59 ` Matt Ranostay
2019-11-16 14:29 ` Jonathan Cameron
2019-11-11 15:35 ` [v2 2/9] Documentation: ABI: document IIO in_temp_filter_notch_center_frequency file Andrea Merello
2019-11-11 15:35 ` [v2 3/9] iio: max31856: add support for configuring the HW averaging Andrea Merello
2019-11-11 23:01 ` Matt Ranostay
2019-11-11 15:35 ` [v2 4/9] RFC: iio: core: add char type for sysfs attributes Andrea Merello
2019-11-16 14:45 ` Jonathan Cameron
2019-11-11 15:35 ` [v2 5/9] iio: core: add thermocouple_type standard attribute Andrea Merello
2019-11-11 15:35 ` [v2 6/9] Documentation: ABI: document IIO thermocouple_type file Andrea Merello
2019-11-16 14:47 ` Jonathan Cameron
2019-11-11 15:35 ` [v2 7/9] iio: max31856: add support for runtime-configuring the thermocouple type Andrea Merello
2019-11-16 14:49 ` Jonathan Cameron
2019-11-11 15:35 ` [v2 8/9] RFC/RFT: iio: maxim_thermocouple: add thermocouple_type sysfs attribute Andrea Merello
2019-11-16 14:51 ` Jonathan Cameron
2019-11-11 15:35 ` [v2 9/9] dt-bindings: iio: maxim_thermocouple: document new 'compatible' strings Andrea Merello
2019-11-14 22:12 ` Rob Herring
2019-11-20 14:47 ` [v3 0/9] iio: max31856: provide more configuration options Andrea Merello
2019-11-20 14:47 ` [v3 1/9] iio: max31856: add option for setting mains filter rejection frequency Andrea Merello
2019-11-23 12:30 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 2/9] Documentation: ABI: document IIO in_temp_filter_notch_center_frequency file Andrea Merello
2019-11-23 12:31 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 3/9] iio: max31856: add support for configuring the HW averaging Andrea Merello
2019-11-23 12:32 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 4/9] RFC: iio: core: add char type for sysfs attributes Andrea Merello
2019-11-23 12:33 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 5/9] iio: core: add thermocouple_type standard attribute Andrea Merello
2019-11-23 12:36 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 6/9] Documentation: ABI: document IIO thermocouple_type file Andrea Merello
2019-11-23 12:37 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 7/9] iio: max31856: add support for runtime-configuring the thermocouple type Andrea Merello
2019-11-23 12:40 ` Jonathan Cameron
2019-11-23 12:41 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 8/9] RFC/RFT: iio: maxim_thermocouple: add thermocouple_type sysfs attribute Andrea Merello
2019-11-23 12:46 ` Jonathan Cameron
2019-11-20 14:47 ` [v3 9/9] dt-bindings: iio: maxim_thermocouple: document new 'compatible' strings Andrea Merello
2019-11-23 12:46 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191017133414.000062ae@huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=andrea.merello@gmail.com \
--cc=colin.king@canonical.com \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=matthew.weber@rockwellcollins.com \
--cc=paresh.chaudhary@rockwellcollins.com \
--cc=patrick.havelange@essensium.com \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).