From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/14] iio: sensors-core: st: Allow full-scale to be an optional feature
Date: Mon, 9 Sep 2013 11:10:02 +0100 [thread overview]
Message-ID: <1378721410-30937-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1378721410-30937-1-git-send-email-lee.jones@linaro.org>
Some chips either don't support it or fail to provide adequate documentation,
so sometimes it's impossible to enable the feature even if it is supported.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/iio/common/st_sensors/st_sensors_core.c | 11 +++++++----
drivers/iio/pressure/st_pressure_core.c | 6 ++++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 965ee22..eb261a5 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -235,10 +235,13 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
if (err < 0)
goto init_error;
- err = st_sensors_set_fullscale(indio_dev,
- sdata->current_fullscale->num);
- if (err < 0)
- goto init_error;
+ if (sdata->current_fullscale) {
+ err = st_sensors_set_fullscale(indio_dev,
+ sdata->current_fullscale->num);
+ if (err < 0)
+ goto init_error;
+ } else
+ dev_info(&indio_dev->dev, "Full-scale not possible\n");
err = st_sensors_set_odr(indio_dev, sdata->odr);
if (err < 0)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index fd7e4d1..506b02d 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -247,8 +247,10 @@ int st_press_common_probe(struct iio_dev *indio_dev,
indio_dev->channels = pdata->sensor->ch;
indio_dev->num_channels = ARRAY_SIZE(st_press_lps331ap_channels);
- pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
- &pdata->sensor->fs.fs_avl[0];
+ if (pdata->sensor->fs.addr != 0)
+ pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
+ &pdata->sensor->fs.fs_avl[0];
+
pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
if (!plat_data)
--
1.8.1.2
next prev parent reply other threads:[~2013-09-09 10:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 10:09 [PATCH v2 00/14] iio: ST clean-ups and new pressure sensor device Lee Jones
2013-09-09 10:09 ` [PATCH 01/14] ARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes Lee Jones
2013-09-09 10:09 ` [PATCH 02/14] ARM: ux500: Enable the LPS001WP Pressure & Temperature sensor from DT Lee Jones
2013-09-09 10:09 ` [PATCH 03/14] ARM: ux500: CONFIG: Enable ST's IIO Pressure Sensors by default Lee Jones
2013-09-09 10:10 ` [PATCH 04/14] iio: pressure-core: st: Describe LPS331AP defines by name Lee Jones
2013-09-09 10:10 ` [PATCH 05/14] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor Lee Jones
2013-09-09 10:10 ` Lee Jones [this message]
2013-09-09 10:10 ` [PATCH 07/14] iio: pressure-core: st: Allow for number of channels to vary Lee Jones
2013-09-09 10:10 ` [PATCH 08/14] iio: pressure-core: st: Clean-up probe() function Lee Jones
2013-09-09 10:10 ` [PATCH 09/14] iio: pressure: st: Add support for new LPS001WP pressure sensor Lee Jones
2013-09-09 10:10 ` [PATCH 10/14] iio: pressure-core: st: Provide support for the Vdd power supply Lee Jones
2013-09-09 10:10 ` [PATCH 11/14] iio: pressure-core: st: Provide support for the Vdd_IO " Lee Jones
2013-09-09 10:10 ` [PATCH 12/14] Documentation: dt: i2c: Add LPS001WP to the Trivial Devices list Lee Jones
2013-09-09 11:42 ` [PATCH v2 12/14] Documentation: dt: iio: Add binding for LPS001WP Lee Jones
2013-09-09 10:10 ` [PATCH 13/14] iio: sensors-core: st: Clean-up error handling in st_sensors_init_sensor() Lee Jones
2013-09-09 10:10 ` [PATCH 14/14] iio: sensors-core: st: Support sensors which don't have a Data Ready pin Lee Jones
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=1378721410-30937-7-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).