On 09/16/13 17:02, Lee Jones wrote:
> 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. This patch allows for
> the Vdd_IO power supply to be specified by either platform data or
> Device Tree.
>
> Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Applied to the togreg branch of iio.git
Thanks - just the DT patches to go once that discussion is cleanly finished.
> ---
> drivers/iio/pressure/st_pressure_core.c | 13 ++++++++++++-
> include/linux/iio/common/st_sensors.h | 2 ++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/iio/pressure/st_pressure_core.c
> b/drivers/iio/pressure/st_pressure_core.c
> index c801c80..e3f3888 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -319,7 +319,7 @@ void st_press_power_enable(struct iio_dev *indio_dev)
> struct st_sensor_data *pdata = iio_priv(indio_dev);
> int err;
>
> - /* Regulators not mandatory, but if requested we should enable it. */
> + /* Regulators not mandatory, but if requested we should enable them. */
> pdata->vdd = devm_regulator_get_optional(&indio_dev->dev, "vdd");
> if (!IS_ERR(pdata->vdd)) {
> err = regulator_enable(pdata->vdd);
> @@ -327,6 +327,14 @@ void st_press_power_enable(struct iio_dev *indio_dev)
> dev_warn(&indio_dev->dev,
> "Failed to enable specified Vdd supply\n");
> }
> +
> + pdata->vdd_io = devm_regulator_get_optional(&indio_dev->dev, "vddio");
> + if (!IS_ERR(pdata->vdd_io)) {
> + err = regulator_enable(pdata->vdd_io);
> + if (err != 0)
> + dev_warn(&indio_dev->dev,
> + "Failed to enable specified Vdd_IO supply\n");
> + }
> }
>
> void st_press_power_disable(struct iio_dev *indio_dev)
> @@ -335,6 +343,9 @@ void st_press_power_disable(struct iio_dev *indio_dev)
>
> if (!IS_ERR(pdata->vdd))
> regulator_disable(pdata->vdd);
> +
> + if (!IS_ERR(pdata->vdd_io))
> + regulator_disable(pdata->vdd_io);
> }
>
> int st_press_common_probe(struct iio_dev *indio_dev,
> diff --git a/include/linux/iio/common/st_sensors.h
> b/include/linux/iio/common/st_sensors.h
> index 968b84e..3c005eb 100644
> --- a/include/linux/iio/common/st_sensors.h
> +++ b/include/linux/iio/common/st_sensors.h
> @@ -203,6 +203,7 @@ struct st_sensors {
> * @sensor: Pointer to the current sensor struct in use.
> * @current_fullscale: Maximum range of measure by the sensor.
> * @vdd: Pointer to sensor's Vdd power supply
> + * @vdd_io: Pointer to sensor's Vdd-IO 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.
> @@ -219,6 +220,7 @@ struct st_sensor_data {
> struct st_sensors *sensor;
> struct st_sensor_fullscale_avl *current_fullscale;
> struct regulator *vdd;
> + struct regulator *vdd_io;
>
> bool enabled;
> bool multiread_bit;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
