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

IIO new drivers, features and rework for the 3.7 cycle, 4th set.

Here we have

1) a set cleaning up and moving the ad7476 driver out of staging.
Support for a number of additional parts is also added to that driver.

2) cleanups from various people for the in kernel interface code as that
is getting more an more real use and hence people are picking up on
minor issues that made it through review.  Also a related useful set
of utility functions to avoid duplicate code for converting IIO
representations to other forms.

3) a new fractional type for our read_raw / write_raw functions.
  This allows avoiding loss of accuracy via the in kernel interfaces in some
  cases as well as being rather convenient for a lot of range -> scale
  conversions.

4) New AD5755 DAC driver.

5) Some Blackfin timer trigger improvements including hardware pulse control
for device triggering.

6) Support for the ad7091r in the ad7476 driver.

4 files changed, 161 insertions, 2 deletions

diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
index 06ab4ec56c37..e875bcf0478f 100644
--- a/include/linux/iio/consumer.h
+++ b/include/linux/iio/consumer.h
@@ -61,7 +61,7 @@ void iio_channel_release_all(struct iio_channel *chan);
 
 /**
  * iio_read_channel_raw() - read from a given channel
- * @channel:            The channel being queried.
+ * @chan:               The channel being queried.
  * @val:                Value read back.
  *
  * Note raw reads from iio channels are in adc counts and hence
@@ -71,6 +71,21 @@ int iio_read_channel_raw(struct iio_channel *chan,
                          int *val);
 
 /**
+ * iio_read_channel_processed() - read processed value from a given channel
+ * @chan:               The channel being queried.
+ * @val:                Value read back.
+ *
+ * Returns an error code or 0.
+ *
+ * This function will read a processed value from a channel. A processed value
+ * means that this value will have the correct unit and not some device internal
+ * representation. If the device does not support reporting a processed value
+ * the function will query the raw value and the channels scale and offset and
+ * do the appropriate transformation.
+ */
+int iio_read_channel_processed(struct iio_channel *chan, int *val);
+
+/**
  * iio_get_channel_type() - get the type of a channel
  * @channel:            The channel being queried.
  * @type:               The type of the channel.
@@ -82,7 +97,7 @@ int iio_get_channel_type(struct iio_channel *channel,
 
 /**
  * iio_read_channel_scale() - read the scale value for a channel
- * @channel:            The channel being queried.
+ * @chan:               The channel being queried.
  * @val:                First part of value read back.
  * @val2:               Second part of value read back.
  *
@@ -93,4 +108,27 @@ int iio_get_channel_type(struct iio_channel *channel,
 int iio_read_channel_scale(struct iio_channel *chan, int *val,
                            int *val2);
 
+/**
+ * iio_convert_raw_to_processed() - Converts a raw value to a processed value
+ * @chan:               The channel being queried
+ * @raw:                The raw IIO to convert
+ * @processed:          The result of the conversion
+ * @scale:              Scale factor to apply during the conversion
+ *
+ * Returns an error code or 0.
+ *
+ * This function converts a raw value to processed value for a specific channel.
+ * A raw value is the device internal representation of a sample and the value
+ * returned by iio_read_channel_raw, so the unit of that value is device
+ * depended. A processed value on the other hand is value has a normed unit
+ * according with the IIO specification.
+ *
+ * The scale factor allows to increase the precession of the returned value. For
+ * a scale factor of 1 the function will return the result in the normal IIO
+ * unit for the channel type. E.g. millivolt for voltage channels, if you want
+ * nanovolts instead pass 1000 as the scale factor.
+ */
+int iio_convert_raw_to_processed(struct iio_channel *chan, int raw,
+        int *processed, unsigned int scale);
+
 #endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 30affa533a1f..c0ae76ac4e0b 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -40,6 +40,8 @@ enum iio_chan_info_enum {
 
 #define IIO_CHAN_INFO_SHARED_BIT(type) BIT(type*2)
 #define IIO_CHAN_INFO_SEPARATE_BIT(type) BIT(type*2 + 1)
+#define IIO_CHAN_INFO_BITS(type) (IIO_CHAN_INFO_SHARED_BIT(type) | \
+                                    IIO_CHAN_INFO_SEPARATE_BIT(type))
 
 #define IIO_CHAN_INFO_RAW_SEPARATE_BIT                  \
         IIO_CHAN_INFO_SEPARATE_BIT(IIO_CHAN_INFO_RAW)
@@ -261,6 +263,21 @@ struct iio_chan_spec {
         unsigned                differential:1;
 };
 
+
+/**
+ * iio_channel_has_info() - Checks whether a channel supports a info attribute
+ * @chan: The channel to be queried
+ * @type: Type of the info attribute to be checked
+ *
+ * Returns true if the channels supports reporting values for the given info
+ * attribute type, false otherwise.
+ */
+static inline bool iio_channel_has_info(const struct iio_chan_spec *chan,
+        enum iio_chan_info_enum type)
+{
+        return chan->info_mask & IIO_CHAN_INFO_BITS(type);
+}
+
 #define IIO_ST(si, rb, sb, sh)                                          \
         { .sign = si, .realbits = rb, .storagebits = sb, .shift = sh }
 
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 44e397705d7f..5c647ecfd5ba 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -57,5 +57,6 @@ enum iio_modifier {
 #define IIO_VAL_INT_PLUS_MICRO 2
 #define IIO_VAL_INT_PLUS_NANO 3
 #define IIO_VAL_INT_PLUS_MICRO_DB 4
+#define IIO_VAL_FRACTIONAL 10
 
 #endif /* _IIO_TYPES_H_ */
diff --git a/include/linux/platform_data/ad5755.h b/include/linux/platform_data/ad5755.h
new file mode 100644
index 000000000000..a5a1cb751874
--- /dev/null
+++ b/include/linux/platform_data/ad5755.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+#ifndef __LINUX_PLATFORM_DATA_AD5755_H__
+#define __LINUX_PLATFORM_DATA_AD5755_H__
+
+enum ad5755_mode {
+        AD5755_MODE_VOLTAGE_0V_5V               = 0,
+        AD5755_MODE_VOLTAGE_0V_10V              = 1,
+        AD5755_MODE_VOLTAGE_PLUSMINUS_5V        = 2,
+        AD5755_MODE_VOLTAGE_PLUSMINUS_10V       = 3,
+        AD5755_MODE_CURRENT_4mA_20mA            = 4,
+        AD5755_MODE_CURRENT_0mA_20mA            = 5,
+        AD5755_MODE_CURRENT_0mA_24mA            = 6,
+};
+
+enum ad5755_dc_dc_phase {
+        AD5755_DC_DC_PHASE_ALL_SAME_EDGE                = 0,
+        AD5755_DC_DC_PHASE_A_B_SAME_EDGE_C_D_OPP_EDGE   = 1,
+        AD5755_DC_DC_PHASE_A_C_SAME_EDGE_B_D_OPP_EDGE   = 2,
+        AD5755_DC_DC_PHASE_90_DEGREE                    = 3,
+};
+
+enum ad5755_dc_dc_freq {
+        AD5755_DC_DC_FREQ_250kHZ = 0,
+        AD5755_DC_DC_FREQ_410kHZ = 1,
+        AD5755_DC_DC_FREQ_650kHZ = 2,
+};
+
+enum ad5755_dc_dc_maxv {
+        AD5755_DC_DC_MAXV_23V   = 0,
+        AD5755_DC_DC_MAXV_24V5  = 1,
+        AD5755_DC_DC_MAXV_27V   = 2,
+        AD5755_DC_DC_MAXV_29V5  = 3,
+};
+
+enum ad5755_slew_rate {
+        AD5755_SLEW_RATE_64k    = 0,
+        AD5755_SLEW_RATE_32k    = 1,
+        AD5755_SLEW_RATE_16k    = 2,
+        AD5755_SLEW_RATE_8k     = 3,
+        AD5755_SLEW_RATE_4k     = 4,
+        AD5755_SLEW_RATE_2k     = 5,
+        AD5755_SLEW_RATE_1k     = 6,
+        AD5755_SLEW_RATE_500    = 7,
+        AD5755_SLEW_RATE_250    = 8,
+        AD5755_SLEW_RATE_125    = 9,
+        AD5755_SLEW_RATE_64     = 10,
+        AD5755_SLEW_RATE_32     = 11,
+        AD5755_SLEW_RATE_16     = 12,
+        AD5755_SLEW_RATE_8      = 13,
+        AD5755_SLEW_RATE_4      = 14,
+        AD5755_SLEW_RATE_0_5    = 15,
+};
+
+enum ad5755_slew_step_size {
+        AD5755_SLEW_STEP_SIZE_1 = 0,
+        AD5755_SLEW_STEP_SIZE_2 = 1,
+        AD5755_SLEW_STEP_SIZE_4 = 2,
+        AD5755_SLEW_STEP_SIZE_8 = 3,
+        AD5755_SLEW_STEP_SIZE_16 = 4,
+        AD5755_SLEW_STEP_SIZE_32 = 5,
+        AD5755_SLEW_STEP_SIZE_64 = 6,
+        AD5755_SLEW_STEP_SIZE_128 = 7,
+        AD5755_SLEW_STEP_SIZE_256 = 8,
+};
+
+/**
+ * struct ad5755_platform_data - AD5755 DAC driver platform data
+ * @ext_dc_dc_compenstation_resistor: Whether an external DC-DC converter
+ * compensation register is used.
+ * @dc_dc_phase: DC-DC converter phase.
+ * @dc_dc_freq: DC-DC converter frequency.
+ * @dc_dc_maxv: DC-DC maximum allowed boost voltage.
+ * @dac.mode: The mode to be used for the DAC output.
+ * @dac.ext_current_sense_resistor: Whether an external current sense resistor
+ * is used.
+ * @dac.enable_voltage_overrange: Whether to enable 20% voltage output overrange.
+ * @dac.slew.enable: Whether to enable digital slew.
+ * @dac.slew.rate: Slew rate of the digital slew.
+ * @dac.slew.step_size: Slew step size of the digital slew.
+ **/
+struct ad5755_platform_data {
+        bool ext_dc_dc_compenstation_resistor;
+        enum ad5755_dc_dc_phase dc_dc_phase;
+        enum ad5755_dc_dc_freq dc_dc_freq;
+        enum ad5755_dc_dc_maxv dc_dc_maxv;
+
+        struct {
+                enum ad5755_mode mode;
+                bool ext_current_sense_resistor;
+                bool enable_voltage_overrange;
+                struct {
+                        bool enable;
+                        enum ad5755_slew_rate rate;
+                        enum ad5755_slew_step_size step_size;
+                } slew;
+        } dac[4];
+};
+
+#endif