Merge tag 'iio-for-4.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First set of new device support, features and cleanups for IIO in the 4.5 cycle

Usual mixed bag, but the big item perhaps in this series is the DMA buffer
support added by Lars-Peter Clausen. It's been in the works for a long time
and it will be interesting to see what hardware support shows up now that
this is available.

New core features + associate cleanup.
* Add generic DMA buffer infrastructure
* Add a DMAengine framework based buffer
 Also associated minor changes.
   - Set the device buffer watermark based on the minimum watermark for all
     attached buffers rather than just the 'primary' one.
   - iio_buffer_init - only set the watermark default if one hasn't already
     been provided.  This allows simple support for devices with a fixed
     watermark.
   - read only attribute for watermark on fixed watermark devices.
   - add explicit buffer enable/disable callbacks to allow the buffer to
     do more than trivial actions when it is being turned on and off.
* IIO_VAL_INT support in write_raw_get_fmt function.

New device support
* Freescale MMA7455/7456L accelerometers
* Memsic MXC6255XC accelerometer
* ST lis2dh12 accelerometer
* TI ADS8688 ADC
* TI Palamas (twl6035/7) gpadc

New driver features
* mma8452
  - support either of the available interrupt pins to cope with the case
    where board layout has lead to a particular one being connected.

Staging graduation
* Dummy driver
  - this driver acts as both an example and a test device for those with
    out hardware to develop userspace code against.

Cleanups and minor bits and bobs.
* treewide
  - Sort out the ordering of iio_device_register/unregister vs runtime
    pm function calls so that it's all nice and consistent and not race
    prone.
  - Check sscanf return values.  None of the cases will actually happen as
    the strings are supplied internally, but best to be consistent on this.
* ad7780
  - switch over to the gpio descriptor interface and remove the now unused
    platform data which gets rid of a header entirely.
* ad7793
  - drop a pointless else statement.
* at91_adc
  - Swap kmalloc_array in for a kmalloc doing the same job.
* dummy
  - get rid of some commented out lines that snuck in during the move of
    the driver.
* lm3533-als
  - Print an error message on provision of an invalid resistance.
* mcp320x
  - Add compatible strings with vendor prefix and deprecate those with
    no vendor prefix.
* mxs-lradc
  - Use BIT macro in various places rather than shifted ones.
* pa12203001
  - Power off the chip if the registration fails.
* pulsedlight-lidar-lite
  - add runtime PM support.
* xilinx XADC
  - constify an iio_buffer_setup_ops structure.

1 files changed, 55 insertions, 1 deletions

diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
index 961f9f990faf..be8ccef735f8 100644
--- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
+++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
@@ -13,7 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * TODO: runtime pm, interrupt mode, and signal strength reporting
+ * TODO: interrupt mode, and signal strength reporting
  */
 
 #include <linux/err.h>
@@ -21,6 +21,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/pm_runtime.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
@@ -37,6 +38,7 @@
 
 #define LIDAR_REG_DATA_HBYTE    0x0f
 #define LIDAR_REG_DATA_LBYTE    0x10
+#define LIDAR_REG_PWR_CONTROL   0x65
 
 #define LIDAR_DRV_NAME "lidar"
 
@@ -90,6 +92,12 @@ static inline int lidar_write_control(struct lidar_data *data, int val)
         return i2c_smbus_write_byte_data(data->client, LIDAR_REG_CONTROL, val);
 }
 
+static inline int lidar_write_power(struct lidar_data *data, int val)
+{
+        return i2c_smbus_write_byte_data(data->client,
+                                         LIDAR_REG_PWR_CONTROL, val);
+}
+
 static int lidar_read_measurement(struct lidar_data *data, u16 *reg)
 {
         int ret;
@@ -116,6 +124,8 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg)
         int tries = 10;
         int ret;
 
+        pm_runtime_get_sync(&client->dev);
+
         /* start sample */
         ret = lidar_write_control(data, LIDAR_REG_CONTROL_ACQUIRE);
         if (ret < 0) {
@@ -144,6 +154,8 @@ static int lidar_get_measurement(struct lidar_data *data, u16 *reg)
                 }
                 ret = -EIO;
         }
+        pm_runtime_mark_last_busy(&client->dev);
+        pm_runtime_put_autosuspend(&client->dev);
 
         return ret;
 }
@@ -243,6 +255,17 @@ static int lidar_probe(struct i2c_client *client,
         if (ret)
                 goto error_unreg_buffer;
 
+        pm_runtime_set_autosuspend_delay(&client->dev, 1000);
+        pm_runtime_use_autosuspend(&client->dev);
+
+        ret = pm_runtime_set_active(&client->dev);
+        if (ret)
+                goto error_unreg_buffer;
+        pm_runtime_enable(&client->dev);
+
+        pm_runtime_mark_last_busy(&client->dev);
+        pm_runtime_idle(&client->dev);
+
         return 0;
 
 error_unreg_buffer:
@@ -258,6 +281,9 @@ static int lidar_remove(struct i2c_client *client)
         iio_device_unregister(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
 
+        pm_runtime_disable(&client->dev);
+        pm_runtime_set_suspended(&client->dev);
+
         return 0;
 }
 
@@ -273,10 +299,38 @@ static const struct of_device_id lidar_dt_ids[] = {
 };
 MODULE_DEVICE_TABLE(of, lidar_dt_ids);
 
+#ifdef CONFIG_PM
+static int lidar_pm_runtime_suspend(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct lidar_data *data = iio_priv(indio_dev);
+
+        return lidar_write_power(data, 0x0f);
+}
+
+static int lidar_pm_runtime_resume(struct device *dev)
+{
+        struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+        struct lidar_data *data = iio_priv(indio_dev);
+        int ret = lidar_write_power(data, 0);
+
+        /* regulator and FPGA needs settling time */
+        usleep_range(15000, 20000);
+
+        return ret;
+}
+#endif
+
+static const struct dev_pm_ops lidar_pm_ops = {
+        SET_RUNTIME_PM_OPS(lidar_pm_runtime_suspend,
+                           lidar_pm_runtime_resume, NULL)
+};
+
 static struct i2c_driver lidar_driver = {
         .driver = {
                 .name   = LIDAR_DRV_NAME,
                 .of_match_table = of_match_ptr(lidar_dt_ids),
+                .pm     = &lidar_pm_ops,
         },
         .probe          = lidar_probe,
         .remove         = lidar_remove,