Merge tag 'iio-for-3.7c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into work-next

Third set of IIO rework and new drivers for the 3.7 cycle.

This set includes:

1) HID sensor drivers. This includes a core elements in the
HID subsystem merged through the IIO tree because we have some
ABI changes outstanding (some in this set) which will effect them.
The HID sensors specification covers an extremely wide range of
sensors so we will probably be seeing lots more elements of this
as the hardware hits the market.

2) Some general abi cleanups to use the utility function
iio_push_to_buffer and to drop the used timestamp parameter
from the same call.  For a long time timestamps have taken
the same path as all other channel types into the buffers so
it is good to clean this out.

3) More ADC driver support for Analog Devices parts in the form
of one new driver and some additional supported parts via current
drivers.

4) An increase to the accuracy of the calibration scale for
the isl29018 driver.

So a mixed bag, but all good additions to IIO.

5 files changed, 296 insertions, 4 deletions

diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
new file mode 100644
index 000000000000..0aa5f4c42ae6
--- /dev/null
+++ b/include/linux/hid-sensor-hub.h
@@ -0,0 +1,160 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_HUB_H
+#define _HID_SENSORS_HUB_H
+
+#include <linux/hid.h>
+#include <linux/hid-sensor-ids.h>
+
+/**
+ * struct hid_sensor_hub_attribute_info - Attribute info
+ * @usage_id:           Parent usage id of a physical device.
+ * @attrib_id:          Attribute id for this attribute.
+ * @report_id:          Report id in which this information resides.
+ * @index:              Field index in the report.
+ * @units:              Measurment unit for this attribute.
+ * @unit_expo:          Exponent used in the data.
+ * @size:               Size in bytes for data size.
+ */
+struct hid_sensor_hub_attribute_info {
+        u32 usage_id;
+        u32 attrib_id;
+        s32 report_id;
+        s32 index;
+        s32 units;
+        s32 unit_expo;
+        s32 size;
+};
+
+/**
+ * struct hid_sensor_hub_device - Stores the hub instance data
+ * @hdev:               Stores the hid instance.
+ * @vendor_id:          Vendor id of hub device.
+ * @product_id:         Product id of hub device.
+ */
+struct hid_sensor_hub_device {
+        struct hid_device *hdev;
+        u32 vendor_id;
+        u32 product_id;
+};
+
+/**
+ * struct hid_sensor_hub_callbacks - Client callback functions
+ * @pdev:               Platform device instance of the client driver.
+ * @suspend:            Suspend callback.
+ * @resume:             Resume callback.
+ * @capture_sample:     Callback to get a sample.
+ * @send_event:         Send notification to indicate all samples are
+ *                      captured, process and send event
+ */
+struct hid_sensor_hub_callbacks {
+        struct platform_device *pdev;
+        int (*suspend)(struct hid_sensor_hub_device *hsdev, void *priv);
+        int (*resume)(struct hid_sensor_hub_device *hsdev, void *priv);
+        int (*capture_sample)(struct hid_sensor_hub_device *hsdev,
+                        u32 usage_id, size_t raw_len, char *raw_data,
+                        void *priv);
+        int (*send_event)(struct hid_sensor_hub_device *hsdev, u32 usage_id,
+                         void *priv);
+};
+
+/* Registration functions */
+
+/**
+* sensor_hub_register_callback() - Register client callbacks
+* @hsdev:       Hub device instance.
+* @usage_id:    Usage id of the client (E.g. 0x200076 for Gyro).
+* @usage_callback: Callback function storage
+*
+* Used to register callbacks by client processing drivers. Sensor
+* hub core driver will call these callbacks to offload processing
+* of data streams and notifications.
+*/
+int sensor_hub_register_callback(struct hid_sensor_hub_device *hsdev,
+                        u32 usage_id,
+                        struct hid_sensor_hub_callbacks *usage_callback);
+
+/**
+* sensor_hub_remove_callback() - Remove client callbacks
+* @hsdev:       Hub device instance.
+* @usage_id:    Usage id of the client (E.g. 0x200076 for Gyro).
+*
+* If there is a callback registred, this call will remove that
+* callbacks, so that it will stop data and event notifications.
+*/
+int sensor_hub_remove_callback(struct hid_sensor_hub_device *hsdev,
+                        u32 usage_id);
+
+
+/* Hid sensor hub core interfaces */
+
+/**
+* sensor_hub_input_get_attribute_info() - Get an attribute information
+* @hsdev:       Hub device instance.
+* @type:        Type of this attribute, input/output/feature
+* @usage_id:    Attribute usage id of parent physical device as per spec
+* @attr_usage_id:       Attribute usage id as per spec
+* @info:        return information about attribute after parsing report
+*
+* Parses report and returns the attribute information such as report id,
+* field index, units and exponet etc.
+*/
+int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev,
+                        u8 type,
+                        u32 usage_id, u32 attr_usage_id,
+                        struct hid_sensor_hub_attribute_info *info);
+
+/**
+* sensor_hub_input_attr_get_raw_value() - Synchronous read request
+* @usage_id:    Attribute usage id of parent physical device as per spec
+* @attr_usage_id:       Attribute usage id as per spec
+* @report_id:   Report id to look for
+*
+* Issues a synchronous read request for an input attribute. Returns
+* data upto 32 bits. Since client can get events, so this call should
+* not be used for data paths, this will impact performance.
+*/
+
+int sensor_hub_input_attr_get_raw_value(struct hid_sensor_hub_device *hsdev,
+                        u32 usage_id,
+                        u32 attr_usage_id, u32 report_id);
+/**
+* sensor_hub_set_feature() - Feature set request
+* @report_id:   Report id to look for
+* @field_index: Field index inside a report
+* @value:       Value to set
+*
+* Used to set a field in feature report. For example this can set polling
+* interval, sensitivity, activate/deactivate state.
+*/
+int sensor_hub_set_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+                        u32 field_index, s32 value);
+
+/**
+* sensor_hub_get_feature() - Feature get request
+* @report_id:   Report id to look for
+* @field_index: Field index inside a report
+* @value:       Place holder for return value
+*
+* Used to get a field in feature report. For example this can get polling
+* interval, sensitivity, activate/deactivate state.
+*/
+int sensor_hub_get_feature(struct hid_sensor_hub_device *hsdev, u32 report_id,
+                        u32 field_index, s32 *value);
+#endif
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h
new file mode 100644
index 000000000000..ca8d7e94eb3c
--- /dev/null
+++ b/include/linux/hid-sensor-ids.h
@@ -0,0 +1,112 @@
+/*
+ * HID Sensors Driver
+ * Copyright (c) 2012, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+#ifndef _HID_SENSORS_IDS_H
+#define _HID_SENSORS_IDS_H
+
+#define HID_UP_SENSOR                                           0x00200000
+#define HID_MAX_PHY_DEVICES                                     0xFF
+
+/* Accel 3D (200073) */
+#define HID_USAGE_SENSOR_ACCEL_3D                               0x200073
+#define HID_USAGE_SENSOR_ACCEL_X_AXIS                           0x200453
+#define HID_USAGE_SENSOR_ACCEL_Y_AXIS                           0x200454
+#define HID_USAGE_SENSOR_ACCEL_Z_AXIS                           0x200455
+
+/* ALS (200041) */
+#define HID_USAGE_SENSOR_ALS                                    0x200041
+#define HID_USAGE_SENSOR_LIGHT_ILLUM                            0x2004d1
+
+/* Gyro 3D: (200076) */
+#define HID_USAGE_SENSOR_GYRO_3D                                0x200076
+#define HID_USAGE_SENSOR_ANGL_VELOCITY_X_AXIS                   0x200457
+#define HID_USAGE_SENSOR_ANGL_VELOCITY_Y_AXIS                   0x200458
+#define HID_USAGE_SENSOR_ANGL_VELOCITY_Z_AXIS                   0x200459
+
+/*ORIENTATION: Compass 3D: (200083) */
+#define HID_USAGE_SENSOR_COMPASS_3D                             0x200083
+#define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING                    0x200471
+#define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING_X                  0x200472
+#define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING_Y                  0x200473
+#define HID_USAGE_SENSOR_ORIENT_MAGN_HEADING_Z                  0x200474
+
+#define HID_USAGE_SENSOR_ORIENT_COMP_MAGN_NORTH                 0x200475
+#define HID_USAGE_SENSOR_ORIENT_COMP_TRUE_NORTH                 0x200476
+#define HID_USAGE_SENSOR_ORIENT_MAGN_NORTH                      0x200477
+#define HID_USAGE_SENSOR_ORIENT_TRUE_NORTH                      0x200478
+
+#define HID_USAGE_SENSOR_ORIENT_DISTANCE                        0x200479
+#define HID_USAGE_SENSOR_ORIENT_DISTANCE_X                      0x20047A
+#define HID_USAGE_SENSOR_ORIENT_DISTANCE_Y                      0x20047B
+#define HID_USAGE_SENSOR_ORIENT_DISTANCE_Z                      0x20047C
+#define HID_USAGE_SENSOR_ORIENT_DISTANCE_OUT_OF_RANGE           0x20047D
+#define HID_USAGE_SENSOR_ORIENT_TILT                            0x20047E
+#define HID_USAGE_SENSOR_ORIENT_TILT_X                          0x20047F
+#define HID_USAGE_SENSOR_ORIENT_TILT_Y                          0x200480
+#define HID_USAGE_SENSOR_ORIENT_TILT_Z                          0x200481
+#define HID_USAGE_SENSOR_ORIENT_ROTATION_MATRIX                 0x200482
+#define HID_USAGE_SENSOR_ORIENT_QUATERNION                      0x200483
+#define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX                       0x200484
+
+#define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_X_AXIS                0x200485
+#define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Y_AXIS                0x200486
+#define HID_USAGE_SENSOR_ORIENT_MAGN_FLUX_Z_AXIS                0x200487
+
+/* Units */
+#define HID_USAGE_SENSOR_UNITS_NOT_SPECIFIED                    0x00
+#define HID_USAGE_SENSOR_UNITS_LUX                              0x01
+#define HID_USAGE_SENSOR_UNITS_KELVIN                           0x01000100
+#define HID_USAGE_SENSOR_UNITS_FAHRENHEIT                       0x03000100
+#define HID_USAGE_SENSOR_UNITS_PASCAL                           0xF1E1
+#define HID_USAGE_SENSOR_UNITS_NEWTON                           0x11E1
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SECOND                0x11F0
+#define HID_USAGE_SENSOR_UNITS_METERS_PER_SEC_SQRD              0x11E0
+#define HID_USAGE_SENSOR_UNITS_FARAD                            0xE14F2000
+#define HID_USAGE_SENSOR_UNITS_AMPERE                           0x01001000
+#define HID_USAGE_SENSOR_UNITS_WATT                             0x21d1
+#define HID_USAGE_SENSOR_UNITS_HENRY                            0x21E1E000
+#define HID_USAGE_SENSOR_UNITS_OHM                              0x21D1E000
+#define HID_USAGE_SENSOR_UNITS_VOLT                             0x21D1F000
+#define HID_USAGE_SENSOR_UNITS_HERTZ                            0x01F0
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SEC_SQRD             0x14E0
+#define HID_USAGE_SENSOR_UNITS_RADIANS                          0x12
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SECOND               0x12F0
+#define HID_USAGE_SENSOR_UNITS_RADIANS_PER_SEC_SQRD             0x12E0
+#define HID_USAGE_SENSOR_UNITS_SECOND                           0x0110
+#define HID_USAGE_SENSOR_UNITS_GAUSS                            0x01E1F000
+#define HID_USAGE_SENSOR_UNITS_GRAM                             0x0101
+#define HID_USAGE_SENSOR_UNITS_CENTIMETER                       0x11
+#define HID_USAGE_SENSOR_UNITS_G                                0x1A
+#define HID_USAGE_SENSOR_UNITS_MILLISECOND                      0x19
+#define HID_USAGE_SENSOR_UNITS_PERCENT                          0x17
+#define HID_USAGE_SENSOR_UNITS_DEGREES                          0x14
+#define HID_USAGE_SENSOR_UNITS_DEGREES_PER_SECOND               0x15
+
+/* Common selectors */
+#define HID_USAGE_SENSOR_PROP_REPORT_INTERVAL                   0x20030E
+#define HID_USAGE_SENSOR_PROP_SENSITIVITY_ABS                   0x20030F
+#define HID_USAGE_SENSOR_PROP_SENSITIVITY_RANGE_PCT             0x200310
+#define HID_USAGE_SENSOR_PROP_SENSITIVITY_REL_PCT               0x200311
+#define HID_USAGE_SENSOR_PROP_ACCURACY                          0x200312
+#define HID_USAGE_SENSOR_PROP_RESOLUTION                        0x200313
+#define HID_USAGE_SENSOR_PROP_RANGE_MAXIMUM                     0x200314
+#define HID_USAGE_SENSOR_PROP_RANGE_MINIMUM                     0x200315
+#define HID_USAGE_SENSOR_PROP_REPORT_STATE                      0x200316
+#define HID_USAGE_SENSOR_PROY_POWER_STATE                       0x200319
+
+#endif
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index 8ba516fc2ec6..c629b3a1d9a9 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -36,7 +36,7 @@ struct iio_buffer;
  * any of them not existing.
  **/
 struct iio_buffer_access_funcs {
-        int (*store_to)(struct iio_buffer *buffer, u8 *data, s64 timestamp);
+        int (*store_to)(struct iio_buffer *buffer, u8 *data);
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
@@ -118,10 +118,8 @@ int iio_scan_mask_set(struct iio_dev *indio_dev,
  * iio_push_to_buffer() - push to a registered buffer.
  * @buffer:             IIO buffer structure for device
  * @data:               the data to push to the buffer
- * @timestamp:          timestamp to associate with the data
  */
-int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data,
-                       s64 timestamp);
+int iio_push_to_buffer(struct iio_buffer *buffer, unsigned char *data);
 
 int iio_update_demux(struct iio_dev *indio_dev);
 
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 057d60382eac..30affa533a1f 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -35,6 +35,7 @@ enum iio_chan_info_enum {
         IIO_CHAN_INFO_FREQUENCY,
         IIO_CHAN_INFO_PHASE,
         IIO_CHAN_INFO_HARDWAREGAIN,
+        IIO_CHAN_INFO_HYSTERESIS,
 };
 
 #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
@@ -100,6 +101,10 @@ enum iio_chan_info_enum {
         IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
 #define IIO_CHAN_INFO_HARDWAREGAIN_SHARED_BIT                   \
         IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HARDWAREGAIN)
+#define IIO_CHAN_INFO_HYSTERESIS_SEPARATE_BIT                   \
+        IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_HYSTERESIS)
+#define IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT                     \
+        IIO_CHAN_INFO_SHARED_BIT(IIO_CHAN_INFO_HYSTERESIS)
 
 enum iio_endian {
         IIO_CPU,
diff --git a/include/linux/platform_data/ad7791.h b/include/linux/platform_data/ad7791.h
new file mode 100644
index 000000000000..f9e4db1b82ae
--- /dev/null
+++ b/include/linux/platform_data/ad7791.h
@@ -0,0 +1,17 @@
+#ifndef __LINUX_PLATFORM_DATA_AD7791__
+#define __LINUX_PLATFORM_DATA_AD7791__
+
+/**
+ * struct ad7791_platform_data - AD7791 device platform data
+ * @buffered: If set to true configure the device for buffered input mode.
+ * @burnout_current: If set to true the 100mA burnout current is enabled.
+ * @unipolar: If set to true sample in unipolar mode, if set to false sample in
+ *              bipolar mode.
+ */
+struct ad7791_platform_data {
+        bool buffered;
+        bool burnout_current;
+        bool unipolar;
+};
+
+#endif