6 files changed, 78 insertions, 15 deletions

diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index 2bac0eb8948d..a1124bdc4cac 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);
+        int (*store_to)(struct iio_buffer *buffer, const void *data);
         int (*read_first_n)(struct iio_buffer *buffer,
                             size_t n,
                             char __user *buf);
@@ -81,7 +81,7 @@ struct iio_buffer {
         bool                                    stufftoread;
         const struct attribute_group *attrs;
         struct list_head                        demux_list;
-        unsigned char                           *demux_bounce;
+        void                                    *demux_bounce;
         struct list_head                        buffer_list;
 };
 
@@ -120,7 +120,32 @@ int iio_scan_mask_set(struct iio_dev *indio_dev,
  * @indio_dev:          iio_dev structure for device.
  * @data:               Full scan.
  */
-int iio_push_to_buffers(struct iio_dev *indio_dev, unsigned char *data);
+int iio_push_to_buffers(struct iio_dev *indio_dev, const void *data);
+
+/*
+ * iio_push_to_buffers_with_timestamp() - push data and timestamp to buffers
+ * @indio_dev:          iio_dev structure for device.
+ * @data:               sample data
+ * @timestamp:          timestamp for the sample data
+ *
+ * Pushes data to the IIO device's buffers. If timestamps are enabled for the
+ * device the function will store the supplied timestamp as the last element in
+ * the sample data buffer before pushing it to the device buffers. The sample
+ * data buffer needs to be large enough to hold the additional timestamp
+ * (usually the buffer should be indio->scan_bytes bytes large).
+ *
+ * Returns 0 on success, a negative error code otherwise.
+ */
+static inline int iio_push_to_buffers_with_timestamp(struct iio_dev *indio_dev,
+        void *data, int64_t timestamp)
+{
+        if (indio_dev->scan_timestamp) {
+                size_t ts_offset = indio_dev->scan_bytes / sizeof(int64_t) - 1;
+                ((int64_t *)data)[ts_offset] = timestamp;
+        }
+
+        return iio_push_to_buffers(indio_dev, data);
+}
 
 int iio_update_demux(struct iio_dev *indio_dev);
 
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index e51f65480ea5..e732fda6c8e6 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -184,6 +184,7 @@ struct st_sensors {
         u8 wai;
         char sensors_supported[ST_SENSORS_MAX_4WAI][ST_SENSORS_MAX_NAME];
         struct iio_chan_spec *ch;
+        int num_ch;
         struct st_sensor_odr odr;
         struct st_sensor_power pw;
         struct st_sensor_axis enable_axis;
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
index 833926c91aa8..2752b1fd12be 100644
--- a/include/linux/iio/consumer.h
+++ b/include/linux/iio/consumer.h
@@ -77,7 +77,7 @@ struct iio_cb_buffer;
  * fail.
  */
 struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
-                                             int (*cb)(u8 *data,
+                                             int (*cb)(const void *data,
                                                        void *private),
                                              void *private);
 /**
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 2103cc32a5fb..ac1cb8f1858c 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -36,6 +36,14 @@ enum iio_chan_info_enum {
         IIO_CHAN_INFO_PHASE,
         IIO_CHAN_INFO_HARDWAREGAIN,
         IIO_CHAN_INFO_HYSTERESIS,
+        IIO_CHAN_INFO_INT_TIME,
+};
+
+enum iio_shared_by {
+        IIO_SEPARATE,
+        IIO_SHARED_BY_TYPE,
+        IIO_SHARED_BY_DIR,
+        IIO_SHARED_BY_ALL
 };
 
 enum iio_endian {
@@ -57,7 +65,7 @@ struct iio_dev;
  */
 struct iio_chan_spec_ext_info {
         const char *name;
-        bool shared;
+        enum iio_shared_by shared;
         ssize_t (*read)(struct iio_dev *, uintptr_t private,
                         struct iio_chan_spec const *, char *buf);
         ssize_t (*write)(struct iio_dev *, uintptr_t private,
@@ -125,7 +133,7 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev,
 #define IIO_ENUM_AVAILABLE(_name, _e) \
 { \
         .name = (_name "_available"), \
-        .shared = true, \
+        .shared = IIO_SHARED_BY_TYPE, \
         .read = iio_enum_available_read, \
         .private = (uintptr_t)(_e), \
 }
@@ -146,12 +154,14 @@ ssize_t iio_enum_write(struct iio_dev *indio_dev,
  *                      shift:          Shift right by this before masking out
  *                                      realbits.
  *                      endianness:     little or big endian
- * @info_mask:          What information is to be exported about this channel.
- *                      This includes calibbias, scale etc.
  * @info_mask_separate: What information is to be exported that is specific to
  *                      this channel.
  * @info_mask_shared_by_type: What information is to be exported that is shared
-*                       by all channels of the same type.
+ *                      by all channels of the same type.
+ * @info_mask_shared_by_dir: What information is to be exported that is shared
+ *                      by all channels of the same direction.
+ * @info_mask_shared_by_all: What information is to be exported that is shared
+ *                      by all channels.
  * @event_mask:         What events can this channel produce.
  * @ext_info:           Array of extended info attributes for this channel.
  *                      The array is NULL terminated, the last element should
@@ -186,9 +196,10 @@ struct iio_chan_spec {
                 u8      shift;
                 enum iio_endian endianness;
         } scan_type;
-        long                    info_mask;
         long                    info_mask_separate;
         long                    info_mask_shared_by_type;
+        long                    info_mask_shared_by_dir;
+        long                    info_mask_shared_by_all;
         long                    event_mask;
         const struct iio_chan_spec_ext_info *ext_info;
         const char              *extend_name;
@@ -212,7 +223,9 @@ static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
         enum iio_chan_info_enum type)
 {
         return (chan->info_mask_separate & BIT(type)) |
-               (chan->info_mask_shared_by_type & BIT(type));
+                (chan->info_mask_shared_by_type & BIT(type)) |
+                (chan->info_mask_shared_by_dir & BIT(type)) |
+                (chan->info_mask_shared_by_all & BIT(type));
 }
 
 #define IIO_ST(si, rb, sb, sh)                                          \
@@ -457,7 +470,7 @@ static inline void iio_device_put(struct iio_dev *indio_dev)
 {
         if (indio_dev)
                 put_device(&indio_dev->dev);
-};
+}
 
 /**
  * dev_to_iio_dev() - Get IIO device struct from a device struct
@@ -593,7 +606,7 @@ static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
 {
         return indio_dev->currentmode
                 & (INDIO_BUFFER_TRIGGERED | INDIO_BUFFER_HARDWARE);
-};
+}
 
 /**
  * iio_get_debugfs_dentry() - helper function to get the debugfs_dentry
@@ -603,12 +616,12 @@ static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
 static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
 {
         return indio_dev->debugfs_dentry;
-};
+}
 #else
 static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
 {
         return NULL;
-};
+}
 #endif
 
 int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer,
diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
index 2958c960003a..8a1d18640ab9 100644
--- a/include/linux/iio/sysfs.h
+++ b/include/linux/iio/sysfs.h
@@ -100,6 +100,21 @@ struct iio_const_attr {
 #define IIO_CONST_ATTR_SAMP_FREQ_AVAIL(_string)                 \
         IIO_CONST_ATTR(sampling_frequency_available, _string)
 
+/**
+ * IIO_DEV_ATTR_INT_TIME_AVAIL - list available integration times
+ * @_show: output method for the attribute
+ **/
+#define IIO_DEV_ATTR_INT_TIME_AVAIL(_show)              \
+        IIO_DEVICE_ATTR(integration_time_available, S_IRUGO, _show, NULL, 0)
+/**
+ * IIO_CONST_ATTR_INT_TIME_AVAIL - list available integration times
+ * @_string: frequency string for the attribute
+ *
+ * Constant version
+ **/
+#define IIO_CONST_ATTR_INT_TIME_AVAIL(_string)          \
+        IIO_CONST_ATTR(integration_time_available, _string)
+
 #define IIO_DEV_ATTR_TEMP_RAW(_show)                    \
         IIO_DEVICE_ATTR(in_temp_raw, S_IRUGO, _show, NULL, 0)
 
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index 25f2c611ab01..08cce7f96ab9 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -46,16 +46,24 @@
 /* Step Enable */
 #define STEPENB_MASK            (0x1FFFF << 0)
 #define STEPENB(val)            ((val) << 0)
+#define ENB(val)                        (1 << (val))
+#define STPENB_STEPENB          STEPENB(0x1FFFF)
+#define STPENB_STEPENB_TC       STEPENB(0x1FFF)
 
 /* IRQ enable */
 #define IRQENB_HW_PEN           BIT(0)
 #define IRQENB_FIFO0THRES       BIT(2)
+#define IRQENB_FIFO0OVRRUN      BIT(3)
+#define IRQENB_FIFO0UNDRFLW     BIT(4)
 #define IRQENB_FIFO1THRES       BIT(5)
+#define IRQENB_FIFO1OVRRUN      BIT(6)
+#define IRQENB_FIFO1UNDRFLW     BIT(7)
 #define IRQENB_PENUP            BIT(9)
 
 /* Step Configuration */
 #define STEPCONFIG_MODE_MASK    (3 << 0)
 #define STEPCONFIG_MODE(val)    ((val) << 0)
+#define STEPCONFIG_MODE_SWCNT   STEPCONFIG_MODE(1)
 #define STEPCONFIG_MODE_HWSYNC  STEPCONFIG_MODE(2)
 #define STEPCONFIG_AVG_MASK     (7 << 2)
 #define STEPCONFIG_AVG(val)     ((val) << 2)
@@ -123,6 +131,7 @@
 #define ADC_CLK                 3000000
 #define TOTAL_STEPS             16
 #define TOTAL_CHANNELS          8
+#define FIFO1_THRESHOLD         19
 
 /*
 * ADC runs at 3MHz, and it takes