From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/11] iio: pressure-core: st: Provide correct regulator support
Date: Wed, 4 Sep 2013 10:31:43 +0100 [thread overview]
Message-ID: <1378287103-21765-12-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1378287103-21765-1-git-send-email-lee.jones@linaro.org>
The power to some of the sensors are controlled by regulators. In most
cases these are 'always on', but if not they will fail to work until
the regulator is enabled using the relevant APIs.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/iio/pressure/st_pressure_core.c | 13 +++++++++++++
include/linux/iio/common/st_sensors.h | 3 +++
2 files changed, 16 insertions(+)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index f452417..7beed89 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -23,6 +23,7 @@
#include <linux/iio/sysfs.h>
#include <linux/iio/trigger.h>
#include <linux/iio/buffer.h>
+#include <linux/regulator/consumer.h>
#include <asm/unaligned.h>
#include <linux/iio/common/st_sensors.h>
@@ -315,6 +316,15 @@ int st_press_common_probe(struct iio_dev *indio_dev)
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &press_info;
+ /* Regulator not mandatory, but if requested we should enable it. */
+ pdata->regulator = regulator_get(&indio_dev->dev, "vdd");
+ if (!IS_ERR_OR_NULL(pdata->regulator)) {
+ err = regulator_enable(pdata->regulator);
+ if (err != 0)
+ dev_warn(&indio_dev->dev,
+ "Failed to enable specified vdd regulator\n");
+ }
+
err = st_sensors_check_device_support(indio_dev,
ARRAY_SIZE(st_press_sensors),
st_press_sensors);
@@ -363,6 +373,9 @@ void st_press_common_remove(struct iio_dev *indio_dev)
{
struct st_sensor_data *pdata = iio_priv(indio_dev);
+ if (!IS_ERR_OR_NULL(pdata->regulator))
+ regulator_disable(pdata->regulator);
+
iio_device_unregister(indio_dev);
if (pdata->get_irq_data_ready(indio_dev) > 0) {
st_sensors_deallocate_trigger(indio_dev);
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index 4aef925..eb6ef3f 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -16,6 +16,7 @@
#include <linux/irqreturn.h>
#include <linux/iio/trigger.h>
#include <linux/bitops.h>
+#include <linux/regulator/consumer.h>
#define ST_SENSORS_TX_MAX_LENGTH 2
#define ST_SENSORS_RX_MAX_LENGTH 6
@@ -197,6 +198,7 @@ struct st_sensors {
* @trig: The trigger in use by the core driver.
* @sensor: Pointer to the current sensor struct in use.
* @current_fullscale: Maximum range of measure by the sensor.
+ * @regulator: Pointer to sensor's power supply
* @enabled: Status of the sensor (false->off, true->on).
* @multiread_bit: Use or not particular bit for [I2C/SPI] multiread.
* @buffer_data: Data used by buffer part.
@@ -211,6 +213,7 @@ struct st_sensor_data {
struct iio_trigger *trig;
struct st_sensors *sensor;
struct st_sensor_fullscale_avl *current_fullscale;
+ struct regulator *regulator;
bool enabled;
bool multiread_bit;
--
1.8.1.2
next prev parent reply other threads:[~2013-09-04 9:31 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-04 9:31 [PATCH 00/11] iio: ST clean-ups and new pressure sensor device Lee Jones
2013-09-04 9:31 ` [PATCH 01/11] ARM: ux500: Remove PrimeCell IDs from Nomadik I2C DT nodes Lee Jones
2013-09-04 9:31 ` [PATCH 02/11] ARM: ux500: Enable the LPS001WP Pressure & Temperature sensor from DT Lee Jones
2013-09-04 12:38 ` Mark Rutland
2013-09-04 13:36 ` Lee Jones
2013-09-04 14:08 ` Mark Rutland
2013-09-04 13:51 ` Lee Jones
2013-09-04 13:55 ` [PATCH v2 " Lee Jones
2013-09-04 9:31 ` [PATCH 03/11] ARM: ux500: CONFIG: Enable ST's IIO Pressure Sensors by default Lee Jones
2013-09-04 9:31 ` [PATCH 04/11] iio: pressure-i2c: st: Simplify error checking in probe() Lee Jones
2013-09-04 16:21 ` Jonathan Cameron
2013-09-04 16:30 ` Lee Jones
2013-09-04 9:31 ` [PATCH 05/11] iio: pressure-core: st: Describe LPS331AP defines by name Lee Jones
2013-09-04 20:10 ` Denis CIOCCA
2013-09-05 7:38 ` Lee Jones
2013-09-04 9:31 ` [PATCH 06/11] iio: pressure-core: st: Expand and rename LPS331AP's channel descriptor Lee Jones
2013-09-04 20:15 ` Denis CIOCCA
2013-09-05 7:21 ` Lee Jones
2013-09-05 7:31 ` Denis CIOCCA
2013-09-05 7:59 ` Lee Jones
2013-09-05 8:35 ` Denis CIOCCA
2013-09-04 9:31 ` [PATCH 07/11] iio: sensors-core: st: Allow full-scale to be an optional feature Lee Jones
2013-09-04 20:17 ` Denis CIOCCA
2013-09-04 9:31 ` [PATCH 08/11] iio: pressure-core: st: Allow for number of channels to vary Lee Jones
2013-09-04 20:17 ` Denis CIOCCA
2013-09-04 9:31 ` [PATCH 09/11] iio: pressure-core: st: Clean-up error handling in probe function Lee Jones
2013-09-04 16:32 ` Jonathan Cameron
2013-09-04 9:31 ` [PATCH 10/11] iio: pressure: st: Add support for new LPS001WP pressure sensor Lee Jones
2013-09-04 9:31 ` Lee Jones [this message]
2013-09-04 13:11 ` [PATCH 11/11] iio: pressure-core: st: Provide correct regulator support Mark Rutland
2013-09-04 13:18 ` Lars-Peter Clausen
2013-09-04 13:26 ` Lee Jones
2013-09-04 15:05 ` Mark Brown
2013-09-04 13:24 ` Mark Brown
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=1378287103-21765-12-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).