Merge tag 'v3.6-rc2' into drm-intel-next

Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put
even more madness on top:

- drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in
  -fixes, that has been changed in a variable-rename in -next, too.

- drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr
  (since all their users have been extracted in another fucntion),
  -fixes added another user for a hw workaroudn.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

15 files changed, 572 insertions, 46 deletions

diff --git a/include/linux/iio/buffer.h b/include/linux/iio/buffer.h
index fb0fe46fd659..8ba516fc2ec6 100644
--- a/include/linux/iio/buffer.h
+++ b/include/linux/iio/buffer.h
@@ -85,7 +85,7 @@ struct iio_buffer {
 
 /**
  * iio_buffer_init() - Initialize the buffer structure
- * @buffer: buffer to be initialized
+ * @buffer:             buffer to be initialized
  **/
 void iio_buffer_init(struct iio_buffer *buffer);
 
@@ -107,8 +107,9 @@ int iio_scan_mask_query(struct iio_dev *indio_dev,
 
 /**
  * iio_scan_mask_set() - set particular bit in the scan mask
- * @buffer: the buffer whose scan mask we are interested in
- * @bit: the bit to be set.
+ * @indio_dev           IIO device structure
+ * @buffer:             the buffer whose scan mask we are interested in
+ * @bit:                the bit to be set.
  **/
 int iio_scan_mask_set(struct iio_dev *indio_dev,
                       struct iio_buffer *buffer, int bit);
@@ -116,8 +117,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
- * @scan:               Full scan.
- * @timestamp:
+ * @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);
@@ -126,7 +127,9 @@ int iio_update_demux(struct iio_dev *indio_dev);
 
 /**
  * iio_buffer_register() - register the buffer with IIO core
- * @indio_dev: device with the buffer to be registered
+ * @indio_dev:          device with the buffer to be registered
+ * @channels:           the channel descriptions used to construct buffer
+ * @num_channels:       the number of channels
  **/
 int iio_buffer_register(struct iio_dev *indio_dev,
                         const struct iio_chan_spec *channels,
@@ -134,7 +137,7 @@ int iio_buffer_register(struct iio_dev *indio_dev,
 
 /**
  * iio_buffer_unregister() - unregister the buffer from IIO core
- * @indio_dev: the device with the buffer to be unregistered
+ * @indio_dev:          the device with the buffer to be unregistered
  **/
 void iio_buffer_unregister(struct iio_dev *indio_dev);
 
@@ -174,6 +177,9 @@ ssize_t iio_buffer_show_enable(struct device *dev,
 
 int iio_sw_buffer_preenable(struct iio_dev *indio_dev);
 
+bool iio_validate_scan_mask_onehot(struct iio_dev *indio_dev,
+        const unsigned long *mask);
+
 #else /* CONFIG_IIO_BUFFER */
 
 static inline int iio_buffer_register(struct iio_dev *indio_dev,
@@ -184,7 +190,7 @@ static inline int iio_buffer_register(struct iio_dev *indio_dev,
 }
 
 static inline void iio_buffer_unregister(struct iio_dev *indio_dev)
-{};
+{}
 
 #endif /* CONFIG_IIO_BUFFER */
 
diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
index 1a15e560a5a1..e2657e6d4d26 100644
--- a/include/linux/iio/consumer.h
+++ b/include/linux/iio/consumer.h
@@ -33,17 +33,17 @@ struct iio_channel {
  *                      side. This typically describes the channels use within
  *                      the consumer. E.g. 'battery_voltage'
  */
-struct iio_channel *iio_st_channel_get(const char *name,
-                                       const char *consumer_channel);
+struct iio_channel *iio_channel_get(const char *name,
+                                    const char *consumer_channel);
 
 /**
- * iio_st_channel_release() - release channels obtained via iio_st_channel_get
+ * iio_channel_release() - release channels obtained via iio_channel_get
  * @chan:               The channel to be released.
  */
-void iio_st_channel_release(struct iio_channel *chan);
+void iio_channel_release(struct iio_channel *chan);
 
 /**
- * iio_st_channel_get_all() - get all channels associated with a client
+ * iio_channel_get_all() - get all channels associated with a client
  * @name:               name of consumer device.
  *
  * Returns an array of iio_channel structures terminated with one with
@@ -51,37 +51,37 @@ void iio_st_channel_release(struct iio_channel *chan);
  * This function is used by fairly generic consumers to get all the
  * channels registered as having this consumer.
  */
-struct iio_channel *iio_st_channel_get_all(const char *name);
+struct iio_channel *iio_channel_get_all(const char *name);
 
 /**
- * iio_st_channel_release_all() - reverse iio_st_get_all
+ * iio_channel_release_all() - reverse iio_channel_get_all
  * @chan:               Array of channels to be released.
  */
-void iio_st_channel_release_all(struct iio_channel *chan);
+void iio_channel_release_all(struct iio_channel *chan);
 
 /**
- * iio_st_read_channel_raw() - read from a given channel
+ * iio_read_channel_raw() - read from a given channel
  * @channel:            The channel being queried.
  * @val:                Value read back.
  *
  * Note raw reads from iio channels are in adc counts and hence
  * scale will need to be applied if standard units required.
  */
-int iio_st_read_channel_raw(struct iio_channel *chan,
-                            int *val);
+int iio_read_channel_raw(struct iio_channel *chan,
+                         int *val);
 
 /**
- * iio_st_get_channel_type() - get the type of a channel
+ * iio_get_channel_type() - get the type of a channel
  * @channel:            The channel being queried.
  * @type:               The type of the channel.
  *
  * returns the enum iio_chan_type of the channel
  */
-int iio_st_get_channel_type(struct iio_channel *channel,
-                            enum iio_chan_type *type);
+int iio_get_channel_type(struct iio_channel *channel,
+                         enum iio_chan_type *type);
 
 /**
- * iio_st_read_channel_scale() - read the scale value for a channel
+ * iio_read_channel_scale() - read the scale value for a channel
  * @channel:            The channel being queried.
  * @val:                First part of value read back.
  * @val2:               Second part of value read back.
@@ -90,7 +90,7 @@ int iio_st_get_channel_type(struct iio_channel *channel,
  * as IIO_VAL_INT_PLUS_MICRO telling us we have a value of val
  * + val2/1e6
  */
-int iio_st_read_channel_scale(struct iio_channel *chan, int *val,
-                              int *val2);
+int iio_read_channel_scale(struct iio_channel *chan, int *val,
+                           int *val2);
 
 #endif
diff --git a/include/linux/iio/dac/ad5421.h b/include/linux/iio/dac/ad5421.h
new file mode 100644
index 000000000000..8fd8f057a890
--- /dev/null
+++ b/include/linux/iio/dac/ad5421.h
@@ -0,0 +1,28 @@
+#ifndef __IIO_DAC_AD5421_H__
+#define __IIO_DAC_AD5421_H__
+
+/**
+ * enum ad5421_current_range - Current range the AD5421 is configured for.
+ * @AD5421_CURRENT_RANGE_4mA_20mA: 4 mA to 20 mA (RANGE1,0 pins = 00)
+ * @AD5421_CURRENT_RANGE_3mA8_21mA: 3.8 mA to 21 mA (RANGE1,0 pins = x1)
+ * @AD5421_CURRENT_RANGE_3mA2_24mA: 3.2 mA to 24 mA (RANGE1,0 pins = 10)
+ */
+
+enum ad5421_current_range {
+        AD5421_CURRENT_RANGE_4mA_20mA,
+        AD5421_CURRENT_RANGE_3mA8_21mA,
+        AD5421_CURRENT_RANGE_3mA2_24mA,
+};
+
+/**
+ * struct ad5421_platform_data - AD5421 DAC driver platform data
+ * @external_vref: whether an external reference voltage is used or not
+ * @current_range: Current range the AD5421 is configured for
+ */
+
+struct ad5421_platform_data {
+        bool external_vref;
+        enum ad5421_current_range current_range;
+};
+
+#endif
diff --git a/include/linux/iio/dac/ad5504.h b/include/linux/iio/dac/ad5504.h
new file mode 100644
index 000000000000..43895376a9ca
--- /dev/null
+++ b/include/linux/iio/dac/ad5504.h
@@ -0,0 +1,16 @@
+/*
+ * AD5504 SPI DAC driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef SPI_AD5504_H_
+#define SPI_AD5504_H_
+
+struct ad5504_platform_data {
+        u16                             vref_mv;
+};
+
+#endif /* SPI_AD5504_H_ */
diff --git a/include/linux/iio/dac/ad5791.h b/include/linux/iio/dac/ad5791.h
new file mode 100644
index 000000000000..45ee281c6660
--- /dev/null
+++ b/include/linux/iio/dac/ad5791.h
@@ -0,0 +1,25 @@
+/*
+ * AD5791 SPI DAC driver
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef SPI_AD5791_H_
+#define SPI_AD5791_H_
+
+/**
+ * struct ad5791_platform_data - platform specific information
+ * @vref_pos_mv:        Vdd Positive Analog Supply Volatge (mV)
+ * @vref_neg_mv:        Vdd Negative Analog Supply Volatge (mV)
+ * @use_rbuf_gain2:     ext. amplifier connected in gain of two configuration
+ */
+
+struct ad5791_platform_data {
+        u16                             vref_pos_mv;
+        u16                             vref_neg_mv;
+        bool                            use_rbuf_gain2;
+};
+
+#endif /* SPI_AD5791_H_ */
diff --git a/include/linux/iio/dac/max517.h b/include/linux/iio/dac/max517.h
new file mode 100644
index 000000000000..f6d1d252f08d
--- /dev/null
+++ b/include/linux/iio/dac/max517.h
@@ -0,0 +1,15 @@
+/*
+ * MAX517 DAC driver
+ *
+ * Copyright 2011 Roland Stigge <stigge@antcom.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+#ifndef IIO_DAC_MAX517_H_
+#define IIO_DAC_MAX517_H_
+
+struct max517_platform_data {
+        u16                             vref_mv[2];
+};
+
+#endif /* IIO_DAC_MAX517_H_ */
diff --git a/include/linux/iio/dac/mcp4725.h b/include/linux/iio/dac/mcp4725.h
new file mode 100644
index 000000000000..91530e6611e9
--- /dev/null
+++ b/include/linux/iio/dac/mcp4725.h
@@ -0,0 +1,16 @@
+/*
+ * MCP4725 DAC driver
+ *
+ * Copyright (C) 2012 Peter Meerwald <pmeerw@pmeerw.net>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef IIO_DAC_MCP4725_H_
+#define IIO_DAC_MCP4725_H_
+
+struct mcp4725_platform_data {
+        u16 vref_mv;
+};
+
+#endif /* IIO_DAC_MCP4725_H_ */
diff --git a/include/linux/iio/events.h b/include/linux/iio/events.h
index b5acbf93c5da..13ce220c7003 100644
--- a/include/linux/iio/events.h
+++ b/include/linux/iio/events.h
@@ -46,7 +46,7 @@ enum iio_event_direction {
  * @diff:       Whether the event is for an differential channel or not.
  * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
  * @direction:  Direction of the event. One of enum iio_event_direction.
- * @type:       Type of the event. Should be one enum iio_event_type.
+ * @type:       Type of the event. Should be one of enum iio_event_type.
  * @chan:       Channel number for non-differential channels.
  * @chan1:      First channel number for differential channels.
  * @chan2:      Second channel number for differential channels.
@@ -69,7 +69,7 @@ enum iio_event_direction {
  * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
  * @number:     Channel number.
  * @modifier:   Modifier for the channel. Should be one of enum iio_modifier.
- * @type:       Type of the event. Should be one enum iio_event_type.
+ * @type:       Type of the event. Should be one of enum iio_event_type.
  * @direction:  Direction of the event. One of enum iio_event_direction.
  */
 
@@ -81,7 +81,7 @@ enum iio_event_direction {
  * IIO_UNMOD_EVENT_CODE() - create event identifier for unmodified channels
  * @chan_type:  Type of the channel. Should be one of enum iio_chan_type.
  * @number:     Channel number.
- * @type:       Type of the event. Should be one enum iio_event_type.
+ * @type:       Type of the event. Should be one of enum iio_event_type.
  * @direction:  Direction of the event. One of enum iio_event_direction.
  */
 
diff --git a/include/linux/iio/frequency/ad9523.h b/include/linux/iio/frequency/ad9523.h
new file mode 100644
index 000000000000..12ce3ee427fd
--- /dev/null
+++ b/include/linux/iio/frequency/ad9523.h
@@ -0,0 +1,195 @@
+/*
+ * AD9523 SPI Low Jitter Clock Generator
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef IIO_FREQUENCY_AD9523_H_
+#define IIO_FREQUENCY_AD9523_H_
+
+enum outp_drv_mode {
+        TRISTATE,
+        LVPECL_8mA,
+        LVDS_4mA,
+        LVDS_7mA,
+        HSTL0_16mA,
+        HSTL1_8mA,
+        CMOS_CONF1,
+        CMOS_CONF2,
+        CMOS_CONF3,
+        CMOS_CONF4,
+        CMOS_CONF5,
+        CMOS_CONF6,
+        CMOS_CONF7,
+        CMOS_CONF8,
+        CMOS_CONF9
+};
+
+enum ref_sel_mode {
+        NONEREVERTIVE_STAY_ON_REFB,
+        REVERT_TO_REFA,
+        SELECT_REFA,
+        SELECT_REFB,
+        EXT_REF_SEL
+};
+
+/**
+ * struct ad9523_channel_spec - Output channel configuration
+ *
+ * @channel_num: Output channel number.
+ * @divider_output_invert_en: Invert the polarity of the output clock.
+ * @sync_ignore_en: Ignore chip-level SYNC signal.
+ * @low_power_mode_en: Reduce power used in the differential output modes.
+ * @use_alt_clock_src: Channel divider uses alternative clk source.
+ * @output_dis: Disables, powers down the entire channel.
+ * @driver_mode: Output driver mode (logic level family).
+ * @divider_phase: Divider initial phase after a SYNC. Range 0..63
+                   LSB = 1/2 of a period of the divider input clock.
+ * @channel_divider: 10-bit channel divider.
+ * @extended_name: Optional descriptive channel name.
+ */
+
+struct ad9523_channel_spec {
+        unsigned                channel_num;
+        bool                    divider_output_invert_en;
+        bool                    sync_ignore_en;
+        bool                    low_power_mode_en;
+                                 /* CH0..CH3 VCXO, CH4..CH9 VCO2 */
+        bool                    use_alt_clock_src;
+        bool                    output_dis;
+        enum outp_drv_mode      driver_mode;
+        unsigned char           divider_phase;
+        unsigned short          channel_divider;
+        char                    extended_name[16];
+};
+
+enum pll1_rzero_resistor {
+        RZERO_883_OHM,
+        RZERO_677_OHM,
+        RZERO_341_OHM,
+        RZERO_135_OHM,
+        RZERO_10_OHM,
+        RZERO_USE_EXT_RES = 8,
+};
+
+enum rpole2_resistor {
+        RPOLE2_900_OHM,
+        RPOLE2_450_OHM,
+        RPOLE2_300_OHM,
+        RPOLE2_225_OHM,
+};
+
+enum rzero_resistor {
+        RZERO_3250_OHM,
+        RZERO_2750_OHM,
+        RZERO_2250_OHM,
+        RZERO_2100_OHM,
+        RZERO_3000_OHM,
+        RZERO_2500_OHM,
+        RZERO_2000_OHM,
+        RZERO_1850_OHM,
+};
+
+enum cpole1_capacitor {
+        CPOLE1_0_PF,
+        CPOLE1_8_PF,
+        CPOLE1_16_PF,
+        CPOLE1_24_PF,
+        _CPOLE1_24_PF, /* place holder */
+        CPOLE1_32_PF,
+        CPOLE1_40_PF,
+        CPOLE1_48_PF,
+};
+
+/**
+ * struct ad9523_platform_data - platform specific information
+ *
+ * @vcxo_freq: External VCXO frequency in Hz
+ * @refa_diff_rcv_en: REFA differential/single-ended input selection.
+ * @refb_diff_rcv_en: REFB differential/single-ended input selection.
+ * @zd_in_diff_en: Zero Delay differential/single-ended input selection.
+ * @osc_in_diff_en: OSC differential/ single-ended input selection.
+ * @refa_cmos_neg_inp_en: REFA single-ended neg./pos. input enable.
+ * @refb_cmos_neg_inp_en: REFB single-ended neg./pos. input enable.
+ * @zd_in_cmos_neg_inp_en: Zero Delay single-ended neg./pos. input enable.
+ * @osc_in_cmos_neg_inp_en: OSC single-ended neg./pos. input enable.
+ * @refa_r_div: PLL1 10-bit REFA R divider.
+ * @refb_r_div: PLL1 10-bit REFB R divider.
+ * @pll1_feedback_div: PLL1 10-bit Feedback N divider.
+ * @pll1_charge_pump_current_nA: Magnitude of PLL1 charge pump current (nA).
+ * @zero_delay_mode_internal_en: Internal, external Zero Delay mode selection.
+ * @osc_in_feedback_en: PLL1 feedback path, local feedback from
+ *                      the OSC_IN receiver or zero delay mode
+ * @pll1_loop_filter_rzero: PLL1 Loop Filter Zero Resistor selection.
+ * @ref_mode: Reference selection mode.
+ * @pll2_charge_pump_current_nA: Magnitude of PLL2 charge pump current (nA).
+ * @pll2_ndiv_a_cnt: PLL2 Feedback N-divider, A Counter, range 0..4.
+ * @pll2_ndiv_b_cnt: PLL2 Feedback N-divider, B Counter, range 0..63.
+ * @pll2_freq_doubler_en: PLL2 frequency doubler enable.
+ * @pll2_r2_div: PLL2 R2 divider, range 0..31.
+ * @pll2_vco_diff_m1: VCO1 divider, range 3..5.
+ * @pll2_vco_diff_m2: VCO2 divider, range 3..5.
+ * @rpole2: PLL2 loop filter Rpole resistor value.
+ * @rzero: PLL2 loop filter Rzero resistor value.
+ * @cpole1: PLL2 loop filter Cpole capacitor value.
+ * @rzero_bypass_en: PLL2 loop filter Rzero bypass enable.
+ * @num_channels: Array size of struct ad9523_channel_spec.
+ * @channels: Pointer to channel array.
+ * @name: Optional alternative iio device name.
+ */
+
+struct ad9523_platform_data {
+        unsigned long vcxo_freq;
+
+        /* Differential/ Single-Ended Input Configuration */
+        bool                            refa_diff_rcv_en;
+        bool                            refb_diff_rcv_en;
+        bool                            zd_in_diff_en;
+        bool                            osc_in_diff_en;
+
+        /*
+         * Valid if differential input disabled
+         * if false defaults to pos input
+         */
+        bool                            refa_cmos_neg_inp_en;
+        bool                            refb_cmos_neg_inp_en;
+        bool                            zd_in_cmos_neg_inp_en;
+        bool                            osc_in_cmos_neg_inp_en;
+
+        /* PLL1 Setting */
+        unsigned short                  refa_r_div;
+        unsigned short                  refb_r_div;
+        unsigned short                  pll1_feedback_div;
+        unsigned short                  pll1_charge_pump_current_nA;
+        bool                            zero_delay_mode_internal_en;
+        bool                            osc_in_feedback_en;
+        enum pll1_rzero_resistor        pll1_loop_filter_rzero;
+
+        /* Reference */
+        enum ref_sel_mode               ref_mode;
+
+        /* PLL2 Setting */
+        unsigned int                    pll2_charge_pump_current_nA;
+        unsigned char                   pll2_ndiv_a_cnt;
+        unsigned char                   pll2_ndiv_b_cnt;
+        bool                            pll2_freq_doubler_en;
+        unsigned char                   pll2_r2_div;
+        unsigned char                   pll2_vco_diff_m1; /* 3..5 */
+        unsigned char                   pll2_vco_diff_m2; /* 3..5 */
+
+        /* Loop Filter PLL2 */
+        enum rpole2_resistor            rpole2;
+        enum rzero_resistor             rzero;
+        enum cpole1_capacitor           cpole1;
+        bool                            rzero_bypass_en;
+
+        /* Output Channel Configuration */
+        int                             num_channels;
+        struct ad9523_channel_spec      *channels;
+
+        char                            name[SPI_NAME_SIZE];
+};
+
+#endif /* IIO_FREQUENCY_AD9523_H_ */
diff --git a/include/linux/iio/frequency/adf4350.h b/include/linux/iio/frequency/adf4350.h
new file mode 100644
index 000000000000..b76b4a87065e
--- /dev/null
+++ b/include/linux/iio/frequency/adf4350.h
@@ -0,0 +1,126 @@
+/*
+ * ADF4350/ADF4351 SPI PLL driver
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#ifndef IIO_PLL_ADF4350_H_
+#define IIO_PLL_ADF4350_H_
+
+/* Registers */
+#define ADF4350_REG0    0
+#define ADF4350_REG1    1
+#define ADF4350_REG2    2
+#define ADF4350_REG3    3
+#define ADF4350_REG4    4
+#define ADF4350_REG5    5
+
+/* REG0 Bit Definitions */
+#define ADF4350_REG0_FRACT(x)                   (((x) & 0xFFF) << 3)
+#define ADF4350_REG0_INT(x)                     (((x) & 0xFFFF) << 15)
+
+/* REG1 Bit Definitions */
+#define ADF4350_REG1_MOD(x)                     (((x) & 0xFFF) << 3)
+#define ADF4350_REG1_PHASE(x)                   (((x) & 0xFFF) << 15)
+#define ADF4350_REG1_PRESCALER                  (1 << 27)
+
+/* REG2 Bit Definitions */
+#define ADF4350_REG2_COUNTER_RESET_EN           (1 << 3)
+#define ADF4350_REG2_CP_THREESTATE_EN           (1 << 4)
+#define ADF4350_REG2_POWER_DOWN_EN              (1 << 5)
+#define ADF4350_REG2_PD_POLARITY_POS            (1 << 6)
+#define ADF4350_REG2_LDP_6ns                    (1 << 7)
+#define ADF4350_REG2_LDP_10ns                   (0 << 7)
+#define ADF4350_REG2_LDF_FRACT_N                (0 << 8)
+#define ADF4350_REG2_LDF_INT_N                  (1 << 8)
+#define ADF4350_REG2_CHARGE_PUMP_CURR_uA(x)     (((((x)-312) / 312) & 0xF) << 9)
+#define ADF4350_REG2_DOUBLE_BUFF_EN             (1 << 13)
+#define ADF4350_REG2_10BIT_R_CNT(x)             ((x) << 14)
+#define ADF4350_REG2_RDIV2_EN                   (1 << 24)
+#define ADF4350_REG2_RMULT2_EN                  (1 << 25)
+#define ADF4350_REG2_MUXOUT(x)                  ((x) << 26)
+#define ADF4350_REG2_NOISE_MODE(x)              ((x) << 29)
+#define ADF4350_MUXOUT_THREESTATE               0
+#define ADF4350_MUXOUT_DVDD                     1
+#define ADF4350_MUXOUT_GND                      2
+#define ADF4350_MUXOUT_R_DIV_OUT                3
+#define ADF4350_MUXOUT_N_DIV_OUT                4
+#define ADF4350_MUXOUT_ANALOG_LOCK_DETECT       5
+#define ADF4350_MUXOUT_DIGITAL_LOCK_DETECT      6
+
+/* REG3 Bit Definitions */
+#define ADF4350_REG3_12BIT_CLKDIV(x)            ((x) << 3)
+#define ADF4350_REG3_12BIT_CLKDIV_MODE(x)       ((x) << 16)
+#define ADF4350_REG3_12BIT_CSR_EN               (1 << 18)
+#define ADF4351_REG3_CHARGE_CANCELLATION_EN     (1 << 21)
+#define ADF4351_REG3_ANTI_BACKLASH_3ns_EN       (1 << 22)
+#define ADF4351_REG3_BAND_SEL_CLOCK_MODE_HIGH   (1 << 23)
+
+/* REG4 Bit Definitions */
+#define ADF4350_REG4_OUTPUT_PWR(x)              ((x) << 3)
+#define ADF4350_REG4_RF_OUT_EN                  (1 << 5)
+#define ADF4350_REG4_AUX_OUTPUT_PWR(x)          ((x) << 6)
+#define ADF4350_REG4_AUX_OUTPUT_EN              (1 << 8)
+#define ADF4350_REG4_AUX_OUTPUT_FUND            (1 << 9)
+#define ADF4350_REG4_AUX_OUTPUT_DIV             (0 << 9)
+#define ADF4350_REG4_MUTE_TILL_LOCK_EN          (1 << 10)
+#define ADF4350_REG4_VCO_PWRDOWN_EN             (1 << 11)
+#define ADF4350_REG4_8BIT_BAND_SEL_CLKDIV(x)    ((x) << 12)
+#define ADF4350_REG4_RF_DIV_SEL(x)              ((x) << 20)
+#define ADF4350_REG4_FEEDBACK_DIVIDED           (0 << 23)
+#define ADF4350_REG4_FEEDBACK_FUND              (1 << 23)
+
+/* REG5 Bit Definitions */
+#define ADF4350_REG5_LD_PIN_MODE_LOW            (0 << 22)
+#define ADF4350_REG5_LD_PIN_MODE_DIGITAL        (1 << 22)
+#define ADF4350_REG5_LD_PIN_MODE_HIGH           (3 << 22)
+
+/* Specifications */
+#define ADF4350_MAX_OUT_FREQ            4400000000ULL /* Hz */
+#define ADF4350_MIN_OUT_FREQ            137500000 /* Hz */
+#define ADF4351_MIN_OUT_FREQ            34375000 /* Hz */
+#define ADF4350_MIN_VCO_FREQ            2200000000ULL /* Hz */
+#define ADF4350_MAX_FREQ_45_PRESC       3000000000ULL /* Hz */
+#define ADF4350_MAX_FREQ_PFD            32000000 /* Hz */
+#define ADF4350_MAX_BANDSEL_CLK         125000 /* Hz */
+#define ADF4350_MAX_FREQ_REFIN          250000000 /* Hz */
+#define ADF4350_MAX_MODULUS             4095
+
+/**
+ * struct adf4350_platform_data - platform specific information
+ * @name:               Optional device name.
+ * @clkin:              REFin frequency in Hz.
+ * @channel_spacing:    Channel spacing in Hz (influences MODULUS).
+ * @power_up_frequency: Optional, If set in Hz the PLL tunes to the desired
+ *                      frequency on probe.
+ * @ref_div_factor:     Optional, if set the driver skips dynamic calculation
+ *                      and uses this default value instead.
+ * @ref_doubler_en:     Enables reference doubler.
+ * @ref_div2_en:        Enables reference divider.
+ * @r2_user_settings:   User defined settings for ADF4350/1 REGISTER_2.
+ * @r3_user_settings:   User defined settings for ADF4350/1 REGISTER_3.
+ * @r4_user_settings:   User defined settings for ADF4350/1 REGISTER_4.
+ * @gpio_lock_detect:   Optional, if set with a valid GPIO number,
+ *                      pll lock state is tested upon read.
+ *                      If not used - set to -1.
+ */
+
+struct adf4350_platform_data {
+        char                    name[32];
+        unsigned long           clkin;
+        unsigned long           channel_spacing;
+        unsigned long long      power_up_frequency;
+
+        unsigned short          ref_div_factor; /* 10-bit R counter */
+        bool                    ref_doubler_en;
+        bool                    ref_div2_en;
+
+        unsigned                r2_user_settings;
+        unsigned                r3_user_settings;
+        unsigned                r4_user_settings;
+        int                     gpio_lock_detect;
+};
+
+#endif /* IIO_PLL_ADF4350_H_ */
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 3a4f6a3ab80d..be82936c4089 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -130,14 +130,78 @@ struct iio_chan_spec_ext_info {
 };
 
 /**
+ * struct iio_enum - Enum channel info attribute
+ * @items:      An array of strings.
+ * @num_items:  Length of the item array.
+ * @set:        Set callback function, may be NULL.
+ * @get:        Get callback function, may be NULL.
+ *
+ * The iio_enum struct can be used to implement enum style channel attributes.
+ * Enum style attributes are those which have a set of strings which map to
+ * unsigned integer values. The IIO enum helper code takes care of mapping
+ * between value and string as well as generating a "_available" file which
+ * contains a list of all available items. The set callback will be called when
+ * the attribute is updated. The last parameter is the index to the newly
+ * activated item. The get callback will be used to query the currently active
+ * item and is supposed to return the index for it.
+ */
+struct iio_enum {
+        const char * const *items;
+        unsigned int num_items;
+        int (*set)(struct iio_dev *, const struct iio_chan_spec *, unsigned int);
+        int (*get)(struct iio_dev *, const struct iio_chan_spec *);
+};
+
+ssize_t iio_enum_available_read(struct iio_dev *indio_dev,
+        uintptr_t priv, const struct iio_chan_spec *chan, char *buf);
+ssize_t iio_enum_read(struct iio_dev *indio_dev,
+        uintptr_t priv, const struct iio_chan_spec *chan, char *buf);
+ssize_t iio_enum_write(struct iio_dev *indio_dev,
+        uintptr_t priv, const struct iio_chan_spec *chan, const char *buf,
+        size_t len);
+
+/**
+ * IIO_ENUM() - Initialize enum extended channel attribute
+ * @_name:      Attribute name
+ * @_shared:    Whether the attribute is shared between all channels
+ * @_e:         Pointer to a iio_enum struct
+ *
+ * This should usually be used together with IIO_ENUM_AVAILABLE()
+ */
+#define IIO_ENUM(_name, _shared, _e) \
+{ \
+        .name = (_name), \
+        .shared = (_shared), \
+        .read = iio_enum_read, \
+        .write = iio_enum_write, \
+        .private = (uintptr_t)(_e), \
+}
+
+/**
+ * IIO_ENUM_AVAILABLE() - Initialize enum available extended channel attribute
+ * @_name:      Attribute name ("_available" will be appended to the name)
+ * @_e:         Pointer to a iio_enum struct
+ *
+ * Creates a read only attribute which list all the available enum items in a
+ * space separated list. This should usually be used together with IIO_ENUM()
+ */
+#define IIO_ENUM_AVAILABLE(_name, _e) \
+{ \
+        .name = (_name "_available"), \
+        .shared = true, \
+        .read = iio_enum_available_read, \
+        .private = (uintptr_t)(_e), \
+}
+
+/**
  * struct iio_chan_spec - specification of a single channel
  * @type:               What type of measurement is the channel making.
- * @channel:            What number or name do we wish to assign the channel.
+ * @channel:            What number do we wish to assign the channel.
  * @channel2:           If there is a second number for a differential
  *                      channel then this is it. If modified is set then the
  *                      value here specifies the modifier.
  * @address:            Driver specific identifier.
- * @scan_index: Monotonic index to give ordering in scans when read
+ * @scan_index:         Monotonic index to give ordering in scans when read
  *                      from a buffer.
  * @scan_type:          Sign:           's' or 'u' to specify signed or unsigned
  *                      realbits:       Number of valid bits of data
@@ -147,14 +211,14 @@ struct iio_chan_spec_ext_info {
  *                      endianness:     little or big endian
  * @info_mask:          What information is to be exported about this channel.
  *                      This includes calibbias, scale etc.
- * @event_mask: What events can this channel produce.
+ * @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
- *                      have it's name field set to NULL.
+ *                      have its name field set to NULL.
  * @extend_name:        Allows labeling of channel attributes with an
  *                      informative name. Note this has no effect codes etc,
  *                      unlike modifiers.
- * @datasheet_name:     A name used in in kernel mapping of channels. It should
+ * @datasheet_name:     A name used in in-kernel mapping of channels. It should
  *                      correspond to the first name that the channel is referred
  *                      to by in the datasheet (e.g. IND), or the nearest
  *                      possible compound name (e.g. IND-INC).
@@ -163,9 +227,8 @@ struct iio_chan_spec_ext_info {
  *                      channel2. Examples are IIO_MOD_X for axial sensors about
  *                      the 'x' axis.
  * @indexed:            Specify the channel has a numerical index. If not,
- *                      the value in channel will be suppressed for attribute
- *                      but not for event codes. Typically set it to 0 when
- *                      the index is false.
+ *                      the channel index number will be suppressed for sysfs
+ *                      attributes but not for event codes.
  * @differential:       Channel is differential.
  */
 struct iio_chan_spec {
@@ -300,12 +363,16 @@ struct iio_info {
  * @predisable:         [DRIVER] function to run prior to marking buffer
  *                      disabled
  * @postdisable:        [DRIVER] function to run after marking buffer disabled
+ * @validate_scan_mask: [DRIVER] function callback to check whether a given
+ *                      scan mask is valid for the device.
  */
 struct iio_buffer_setup_ops {
         int                             (*preenable)(struct iio_dev *);
         int                             (*postenable)(struct iio_dev *);
         int                             (*predisable)(struct iio_dev *);
         int                             (*postdisable)(struct iio_dev *);
+        bool (*validate_scan_mask)(struct iio_dev *indio_dev,
+                                   const unsigned long *scan_mask);
 };
 
 /**
@@ -329,7 +396,7 @@ struct iio_buffer_setup_ops {
  * @trig:               [INTERN] current device trigger (buffer modes)
  * @pollfunc:           [DRIVER] function run on trigger being received
  * @channels:           [DRIVER] channel specification structure table
- * @num_channels:       [DRIVER] number of chanels specified in @channels.
+ * @num_channels:       [DRIVER] number of channels specified in @channels.
  * @channel_attr_list:  [INTERN] keep track of automatically created channel
  *                      attributes
  * @chan_attr_group:    [INTERN] group for all attrs in base directory
@@ -419,7 +486,7 @@ extern struct bus_type iio_bus_type;
 
 /**
  * iio_device_put() - reference counted deallocation of struct device
- * @dev: the iio_device containing the device
+ * @indio_dev:          IIO device structure containing the device
  **/
 static inline void iio_device_put(struct iio_dev *indio_dev)
 {
@@ -429,7 +496,7 @@ static inline void iio_device_put(struct iio_dev *indio_dev)
 
 /**
  * dev_to_iio_dev() - Get IIO device struct from a device struct
- * @dev: The device embedded in the IIO device
+ * @dev:                The device embedded in the IIO device
  *
  * Note: The device must be a IIO device, otherwise the result is undefined.
  */
@@ -438,11 +505,22 @@ static inline struct iio_dev *dev_to_iio_dev(struct device *dev)
         return container_of(dev, struct iio_dev, dev);
 }
 
+/**
+ * iio_device_get() - increment reference count for the device
+ * @indio_dev:          IIO device structure
+ *
+ * Returns: The passed IIO device
+ **/
+static inline struct iio_dev *iio_device_get(struct iio_dev *indio_dev)
+{
+        return indio_dev ? dev_to_iio_dev(get_device(&indio_dev->dev)) : NULL;
+}
+
 /* Can we make this smaller? */
 #define IIO_ALIGN L1_CACHE_BYTES
 /**
  * iio_device_alloc() - allocate an iio_dev from a driver
- * @sizeof_priv: Space to allocate for private structure.
+ * @sizeof_priv:        Space to allocate for private structure.
  **/
 struct iio_dev *iio_device_alloc(int sizeof_priv);
 
@@ -459,13 +537,13 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv)
 
 /**
  * iio_device_free() - free an iio_dev from a driver
- * @dev: the iio_dev associated with the device
+ * @indio_dev:          the iio_dev associated with the device
  **/
 void iio_device_free(struct iio_dev *indio_dev);
 
 /**
  * iio_buffer_enabled() - helper function to test if the buffer is enabled
- * @indio_dev:          IIO device info structure for device
+ * @indio_dev:          IIO device structure for device
  **/
 static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
 {
@@ -475,7 +553,7 @@ static inline bool iio_buffer_enabled(struct iio_dev *indio_dev)
 
 /**
  * iio_get_debugfs_dentry() - helper function to get the debugfs_dentry
- * @indio_dev:          IIO device info structure for device
+ * @indio_dev:          IIO device structure for device
  **/
 #if defined(CONFIG_DEBUG_FS)
 static inline struct dentry *iio_get_debugfs_dentry(struct iio_dev *indio_dev)
diff --git a/include/linux/iio/machine.h b/include/linux/iio/machine.h
index 0b1f19bfdc44..400a453ff67b 100644
--- a/include/linux/iio/machine.h
+++ b/include/linux/iio/machine.h
@@ -14,7 +14,7 @@
  *                      This is matched against the datasheet_name element
  *                      of struct iio_chan_spec.
  * @consumer_dev_name:  Name to uniquely identify the consumer device.
- * @consumer_channel:   Unique name used to idenitify the channel on the
+ * @consumer_channel:   Unique name used to identify the channel on the
  *                      consumer side.
  */
 struct iio_map {
diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
index bfedb73b850e..b7a934b9431b 100644
--- a/include/linux/iio/sysfs.h
+++ b/include/linux/iio/sysfs.h
@@ -97,7 +97,7 @@ struct iio_const_attr {
 #define IIO_DEV_ATTR_SAMP_FREQ_AVAIL(_show)                             \
         IIO_DEVICE_ATTR(sampling_frequency_available, S_IRUGO, _show, NULL, 0)
 /**
- * IIO_CONST_ATTR_AVAIL_SAMP_FREQ - list available sampling frequencies
+ * IIO_CONST_ATTR_SAMP_FREQ_AVAIL - list available sampling frequencies
  * @_string: frequency string for the attribute
  *
  * Constant version
diff --git a/include/linux/iio/triggered_buffer.h b/include/linux/iio/triggered_buffer.h
new file mode 100644
index 000000000000..c378ebec605e
--- /dev/null
+++ b/include/linux/iio/triggered_buffer.h
@@ -0,0 +1,15 @@
+#ifndef _LINUX_IIO_TRIGGERED_BUFFER_H_
+#define _LINUX_IIO_TRIGGERED_BUFFER_H_
+
+#include <linux/interrupt.h>
+
+struct iio_dev;
+struct iio_buffer_setup_ops;
+
+int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
+        irqreturn_t (*pollfunc_bh)(int irq, void *p),
+        irqreturn_t (*pollfunc_th)(int irq, void *p),
+        const struct iio_buffer_setup_ops *setup_ops);
+void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev);
+
+#endif
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 1b073b1cc7c2..44e397705d7f 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -11,7 +11,6 @@
 #define _IIO_TYPES_H_
 
 enum iio_chan_type {
-        /* real channel types */
         IIO_VOLTAGE,
         IIO_CURRENT,
         IIO_POWER,
@@ -28,6 +27,7 @@ enum iio_chan_type {
         IIO_TIMESTAMP,
         IIO_CAPACITANCE,
         IIO_ALTVOLTAGE,
+        IIO_CCT,
 };
 
 enum iio_modifier {
@@ -45,6 +45,12 @@ enum iio_modifier {
         IIO_MOD_X_OR_Y_OR_Z,
         IIO_MOD_LIGHT_BOTH,
         IIO_MOD_LIGHT_IR,
+        IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+        IIO_MOD_SUM_SQUARED_X_Y_Z,
+        IIO_MOD_LIGHT_CLEAR,
+        IIO_MOD_LIGHT_RED,
+        IIO_MOD_LIGHT_GREEN,
+        IIO_MOD_LIGHT_BLUE,
 };
 
 #define IIO_VAL_INT 1