Merge tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 4.5-rc1.

  Lots of cleanups and fixes here, not as many as some releases, but
  800+ isn't that bad.  Full details in the shortlog.  All of these have
  been in linux-next for a while"

* tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (843 commits)
  Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC."
  staging: gdm724x: constify tty_port_operations structs
  staging: gdm72xx: add userspace data struct
  staging: gdm72xx: Replace timeval with ktime_t
  iio: adc: ina2xx: Fix incorrect report of data endianness to userspace.
  iio: light: us5182d: Refactor read_raw function
  iio: light: us5182d: Add interrupt support and events
  iio: light: us5182d: Fix enable status inconcistency
  iio: Make IIO value formating function globally available.
  staging: emxx_udc: use list_first_entry_or_null()
  staging/emxx_udc: fix 64-bit warnings
  STAGING: COMEDI: Using kernel types in plx9080.h
  STAGING: COMEDI: Added spaces around binary operators in plx9080.h
  STAGING: COMEDI: Fixed format of comments in plx9080.h
  staging: comedi: comedilib.h: Coding style warning fix for block comments
  staging: comedi: s526: add macros for counter control reg values
  staging: comedi: s526: replace counter mode bitfield struct
  staging: comedi: check for more errors for zero-length write
  staging: comedi: simplify returned errors for comedi_write()
  staging: comedi: return error on "write" if no command set up
  ...

7 files changed, 324 insertions, 24 deletions

diff --git a/include/linux/iio/buffer-dma.h b/include/linux/iio/buffer-dma.h
new file mode 100644
index 000000000000..767467d886de
--- /dev/null
+++ b/include/linux/iio/buffer-dma.h
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2013-2015 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef __INDUSTRIALIO_DMA_BUFFER_H__
+#define __INDUSTRIALIO_DMA_BUFFER_H__
+
+#include <linux/list.h>
+#include <linux/kref.h>
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+#include <linux/iio/buffer.h>
+
+struct iio_dma_buffer_queue;
+struct iio_dma_buffer_ops;
+struct device;
+
+struct iio_buffer_block {
+        u32 size;
+        u32 bytes_used;
+};
+
+/**
+ * enum iio_block_state - State of a struct iio_dma_buffer_block
+ * @IIO_BLOCK_STATE_DEQUEUED: Block is not queued
+ * @IIO_BLOCK_STATE_QUEUED: Block is on the incoming queue
+ * @IIO_BLOCK_STATE_ACTIVE: Block is currently being processed by the DMA
+ * @IIO_BLOCK_STATE_DONE: Block is on the outgoing queue
+ * @IIO_BLOCK_STATE_DEAD: Block has been marked as to be freed
+ */
+enum iio_block_state {
+        IIO_BLOCK_STATE_DEQUEUED,
+        IIO_BLOCK_STATE_QUEUED,
+        IIO_BLOCK_STATE_ACTIVE,
+        IIO_BLOCK_STATE_DONE,
+        IIO_BLOCK_STATE_DEAD,
+};
+
+/**
+ * struct iio_dma_buffer_block - IIO buffer block
+ * @head: List head
+ * @size: Total size of the block in bytes
+ * @bytes_used: Number of bytes that contain valid data
+ * @vaddr: Virutal address of the blocks memory
+ * @phys_addr: Physical address of the blocks memory
+ * @queue: Parent DMA buffer queue
+ * @kref: kref used to manage the lifetime of block
+ * @state: Current state of the block
+ */
+struct iio_dma_buffer_block {
+        /* May only be accessed by the owner of the block */
+        struct list_head head;
+        size_t bytes_used;
+
+        /*
+         * Set during allocation, constant thereafter. May be accessed read-only
+         * by anybody holding a reference to the block.
+         */
+        void *vaddr;
+        dma_addr_t phys_addr;
+        size_t size;
+        struct iio_dma_buffer_queue *queue;
+
+        /* Must not be accessed outside the core. */
+        struct kref kref;
+        /*
+         * Must not be accessed outside the core. Access needs to hold
+         * queue->list_lock if the block is not owned by the core.
+         */
+        enum iio_block_state state;
+};
+
+/**
+ * struct iio_dma_buffer_queue_fileio - FileIO state for the DMA buffer
+ * @blocks: Buffer blocks used for fileio
+ * @active_block: Block being used in read()
+ * @pos: Read offset in the active block
+ * @block_size: Size of each block
+ */
+struct iio_dma_buffer_queue_fileio {
+        struct iio_dma_buffer_block *blocks[2];
+        struct iio_dma_buffer_block *active_block;
+        size_t pos;
+        size_t block_size;
+};
+
+/**
+ * struct iio_dma_buffer_queue - DMA buffer base structure
+ * @buffer: IIO buffer base structure
+ * @dev: Parent device
+ * @ops: DMA buffer callbacks
+ * @lock: Protects the incoming list, active and the fields in the fileio
+ *   substruct
+ * @list_lock: Protects lists that contain blocks which can be modified in
+ *   atomic context as well as blocks on those lists. This is the outgoing queue
+ *   list and typically also a list of active blocks in the part that handles
+ *   the DMA controller
+ * @incoming: List of buffers on the incoming queue
+ * @outgoing: List of buffers on the outgoing queue
+ * @active: Whether the buffer is currently active
+ * @fileio: FileIO state
+ */
+struct iio_dma_buffer_queue {
+        struct iio_buffer buffer;
+        struct device *dev;
+        const struct iio_dma_buffer_ops *ops;
+
+        struct mutex lock;
+        spinlock_t list_lock;
+        struct list_head incoming;
+        struct list_head outgoing;
+
+        bool active;
+
+        struct iio_dma_buffer_queue_fileio fileio;
+};
+
+/**
+ * struct iio_dma_buffer_ops - DMA buffer callback operations
+ * @submit: Called when a block is submitted to the DMA controller
+ * @abort: Should abort all pending transfers
+ */
+struct iio_dma_buffer_ops {
+        int (*submit)(struct iio_dma_buffer_queue *queue,
+                struct iio_dma_buffer_block *block);
+        void (*abort)(struct iio_dma_buffer_queue *queue);
+};
+
+void iio_dma_buffer_block_done(struct iio_dma_buffer_block *block);
+void iio_dma_buffer_block_list_abort(struct iio_dma_buffer_queue *queue,
+        struct list_head *list);
+
+int iio_dma_buffer_enable(struct iio_buffer *buffer,
+        struct iio_dev *indio_dev);
+int iio_dma_buffer_disable(struct iio_buffer *buffer,
+        struct iio_dev *indio_dev);
+int iio_dma_buffer_read(struct iio_buffer *buffer, size_t n,
+        char __user *user_buffer);
+size_t iio_dma_buffer_data_available(struct iio_buffer *buffer);
+int iio_dma_buffer_set_bytes_per_datum(struct iio_buffer *buffer, size_t bpd);
+int iio_dma_buffer_set_length(struct iio_buffer *buffer, int length);
+int iio_dma_buffer_request_update(struct iio_buffer *buffer);
+
+int iio_dma_buffer_init(struct iio_dma_buffer_queue *queue,
+        struct device *dma_dev, const struct iio_dma_buffer_ops *ops);
+void iio_dma_buffer_exit(struct iio_dma_buffer_queue *queue);
+void iio_dma_buffer_release(struct iio_dma_buffer_queue *queue);
+
+#endif
diff --git a/include/linux/iio/buffer-dmaengine.h b/include/linux/iio/buffer-dmaengine.h
new file mode 100644
index 000000000000..5dcddf427bb0
--- /dev/null
+++ b/include/linux/iio/buffer-dmaengine.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2014-2015 Analog Devices Inc.
+ *  Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __IIO_DMAENGINE_H__
+#define __IIO_DMAENGINE_H__
+
+struct iio_buffer;
+struct device;
+
+struct iio_buffer *iio_dmaengine_buffer_alloc(struct device *dev,
+        const char *channel);
+void iio_dmaengine_buffer_free(struct iio_buffer *buffer);
+
+#endif
diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index 1600c55828e0..2ec3ad58e8a0 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -18,6 +18,12 @@
 struct iio_buffer;
 
 /**
+ * INDIO_BUFFER_FLAG_FIXED_WATERMARK - Watermark level of the buffer can not be
+ *   configured. It has a fixed value which will be buffer specific.
+ */
+#define INDIO_BUFFER_FLAG_FIXED_WATERMARK BIT(0)
+
+/**
  * struct iio_buffer_access_funcs - access functions for buffers.
  * @store_to:           actually store stuff to the buffer
  * @read_first_n:       try to get a specified number of bytes (must exist)
@@ -27,9 +33,15 @@ struct iio_buffer;
  *                      storage.
  * @set_bytes_per_datum:set number of bytes per datum
  * @set_length:         set number of datums in buffer
+ * @enable:             called if the buffer is attached to a device and the
+ *                      device starts sampling. Calls are balanced with
+ *                      @disable.
+ * @disable:            called if the buffer is attached to a device and the
+ *                      device stops sampling. Calles are balanced with @enable.
  * @release:            called when the last reference to the buffer is dropped,
  *                      should free all resources allocated by the buffer.
  * @modes:              Supported operating modes by this buffer type
+ * @flags:              A bitmask combination of INDIO_BUFFER_FLAG_*
  *
  * The purpose of this structure is to make the buffer element
  * modular as event for a given driver, different usecases may require
@@ -51,9 +63,13 @@ struct iio_buffer_access_funcs {
         int (*set_bytes_per_datum)(struct iio_buffer *buffer, size_t bpd);
         int (*set_length)(struct iio_buffer *buffer, int length);
 
+        int (*enable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
+        int (*disable)(struct iio_buffer *buffer, struct iio_dev *indio_dev);
+
         void (*release)(struct iio_buffer *buffer);
 
         unsigned int modes;
+        unsigned int flags;
 };
 
 /**
diff --git a/include/linux/iio/configfs.h b/include/linux/iio/configfs.h
new file mode 100644
index 000000000000..93befd67c15c
--- /dev/null
+++ b/include/linux/iio/configfs.h
@@ -0,0 +1,15 @@
+/*
+ * Industrial I/O configfs support
+ *
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#ifndef __IIO_CONFIGFS
+#define __IIO_CONFIGFS
+
+extern struct configfs_subsystem iio_configfs_subsys;
+
+#endif /* __IIO_CONFIGFS */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 19c94c9acc81..b5894118755f 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -636,6 +636,8 @@ static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
 }
 #endif
 
+ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals);
+
 int iio_str_to_fixpoint(const char *str, int fract_mult, int *integer,
         int *fract);
 
diff --git a/include/linux/iio/sw_trigger.h b/include/linux/iio/sw_trigger.h
new file mode 100644
index 000000000000..5198f8ed08a4
--- /dev/null
+++ b/include/linux/iio/sw_trigger.h
@@ -0,0 +1,70 @@
+/*
+ * Industrial I/O software trigger interface
+ *
+ * Copyright (c) 2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef __IIO_SW_TRIGGER
+#define __IIO_SW_TRIGGER
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/iio/iio.h>
+#include <linux/configfs.h>
+
+#define module_iio_sw_trigger_driver(__iio_sw_trigger_type) \
+        module_driver(__iio_sw_trigger_type, iio_register_sw_trigger_type, \
+                      iio_unregister_sw_trigger_type)
+
+struct iio_sw_trigger_ops;
+
+struct iio_sw_trigger_type {
+        const char *name;
+        struct module *owner;
+        const struct iio_sw_trigger_ops *ops;
+        struct list_head list;
+        struct config_group *group;
+};
+
+struct iio_sw_trigger {
+        struct iio_trigger *trigger;
+        struct iio_sw_trigger_type *trigger_type;
+        struct config_group group;
+};
+
+struct iio_sw_trigger_ops {
+        struct iio_sw_trigger* (*probe)(const char *);
+        int (*remove)(struct iio_sw_trigger *);
+};
+
+static inline
+struct iio_sw_trigger *to_iio_sw_trigger(struct config_item *item)
+{
+        return container_of(to_config_group(item), struct iio_sw_trigger,
+                            group);
+}
+
+int iio_register_sw_trigger_type(struct iio_sw_trigger_type *tt);
+void iio_unregister_sw_trigger_type(struct iio_sw_trigger_type *tt);
+
+struct iio_sw_trigger *iio_sw_trigger_create(const char *, const char *);
+void iio_sw_trigger_destroy(struct iio_sw_trigger *);
+
+int iio_sw_trigger_type_configfs_register(struct iio_sw_trigger_type *tt);
+void iio_sw_trigger_type_configfs_unregister(struct iio_sw_trigger_type *tt);
+
+static inline
+void iio_swt_group_init_type_name(struct iio_sw_trigger *t,
+                                  const char *name,
+                                  struct config_item_type *type)
+{
+#ifdef CONFIG_CONFIGFS_FS
+        config_group_init_type_name(&t->group, name, type);
+#endif
+}
+
+#endif /* __IIO_SW_TRIGGER */
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 13e1d96935ed..c800dbc42079 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -134,21 +134,32 @@ struct palmas_pmic_driver_data {
                             struct regulator_config config);
 };
 
+struct palmas_adc_wakeup_property {
+        int adc_channel_number;
+        int adc_high_threshold;
+        int adc_low_threshold;
+};
+
 struct palmas_gpadc_platform_data {
         /* Channel 3 current source is only enabled during conversion */
-        int ch3_current;
+        int ch3_current;        /* 0: off; 1: 10uA; 2: 400uA; 3: 800 uA */
 
         /* Channel 0 current source can be used for battery detection.
          * If used for battery detection this will cause a permanent current
          * consumption depending on current level set here.
          */
-        int ch0_current;
+        int ch0_current;        /* 0: off; 1: 5uA; 2: 15uA; 3: 20 uA */
+        bool extended_delay;    /* use extended delay for conversion */
 
         /* default BAT_REMOVAL_DAT setting on device probe */
         int bat_removal;
 
         /* Sets the START_POLARITY bit in the RT_CTRL register */
         int start_polarity;
+
+        int auto_conversion_period_ms;
+        struct palmas_adc_wakeup_property *adc_wakeup1_data;
+        struct palmas_adc_wakeup_property *adc_wakeup2_data;
 };
 
 struct palmas_reg_init {
@@ -405,28 +416,7 @@ struct palmas_gpadc_calibration {
         s32 offset_error;
 };
 
-struct palmas_gpadc {
-        struct device *dev;
-        struct palmas *palmas;
-
-        int ch3_current;
-        int ch0_current;
-
-        int gpadc_force;
-
-        int bat_removal;
-
-        struct mutex reading_lock;
-        struct completion irq_complete;
-
-        int eoc_sw_irq;
-
-        struct palmas_gpadc_calibration *palmas_cal_tbl;
-
-        int conv0_channel;
-        int conv1_channel;
-        int rt_channel;
-};
+#define PALMAS_DATASHEET_NAME(_name)    "palmas-gpadc-chan-"#_name
 
 struct palmas_gpadc_result {
         s32 raw_code;
@@ -520,6 +510,43 @@ enum palmas_irqs {
         PALMAS_NUM_IRQ,
 };
 
+/* Palmas GPADC Channels */
+enum {
+        PALMAS_ADC_CH_IN0,
+        PALMAS_ADC_CH_IN1,
+        PALMAS_ADC_CH_IN2,
+        PALMAS_ADC_CH_IN3,
+        PALMAS_ADC_CH_IN4,
+        PALMAS_ADC_CH_IN5,
+        PALMAS_ADC_CH_IN6,
+        PALMAS_ADC_CH_IN7,
+        PALMAS_ADC_CH_IN8,
+        PALMAS_ADC_CH_IN9,
+        PALMAS_ADC_CH_IN10,
+        PALMAS_ADC_CH_IN11,
+        PALMAS_ADC_CH_IN12,
+        PALMAS_ADC_CH_IN13,
+        PALMAS_ADC_CH_IN14,
+        PALMAS_ADC_CH_IN15,
+        PALMAS_ADC_CH_MAX,
+};
+
+/* Palmas GPADC Channel0 Current Source */
+enum {
+        PALMAS_ADC_CH0_CURRENT_SRC_0,
+        PALMAS_ADC_CH0_CURRENT_SRC_5,
+        PALMAS_ADC_CH0_CURRENT_SRC_15,
+        PALMAS_ADC_CH0_CURRENT_SRC_20,
+};
+
+/* Palmas GPADC Channel3 Current Source */
+enum {
+        PALMAS_ADC_CH3_CURRENT_SRC_0,
+        PALMAS_ADC_CH3_CURRENT_SRC_10,
+        PALMAS_ADC_CH3_CURRENT_SRC_400,
+        PALMAS_ADC_CH3_CURRENT_SRC_800,
+};
+
 struct palmas_pmic {
         struct palmas *palmas;
         struct device *dev;