Merge tag 'v3.16-rc6' into next

Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.

16 files changed, 268 insertions, 127 deletions

diff --git a/include/linux/platform_data/adau17x1.h b/include/linux/platform_data/adau17x1.h
new file mode 100644
index 000000000000..a81766cae230
--- /dev/null
+++ b/include/linux/platform_data/adau17x1.h
@@ -0,0 +1,109 @@
+/*
+ * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961/ADAU1781/ADAU1781 codecs
+ *
+ * Copyright 2011-2014 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __LINUX_PLATFORM_DATA_ADAU17X1_H__
+#define __LINUX_PLATFORM_DATA_ADAU17X1_H__
+
+/**
+ * enum adau17x1_micbias_voltage - Microphone bias voltage
+ * @ADAU17X1_MICBIAS_0_90_AVDD: 0.9 * AVDD
+ * @ADAU17X1_MICBIAS_0_65_AVDD: 0.65 * AVDD
+ */
+enum adau17x1_micbias_voltage {
+        ADAU17X1_MICBIAS_0_90_AVDD = 0,
+        ADAU17X1_MICBIAS_0_65_AVDD = 1,
+};
+
+/**
+ * enum adau1761_digmic_jackdet_pin_mode - Configuration of the JACKDET/MICIN pin
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: Disable the pin
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC: Configure the pin for usage as
+ *   digital microphone input.
+ * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT: Configure the pin for jack
+ *  insertion detection.
+ */
+enum adau1761_digmic_jackdet_pin_mode {
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE,
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC,
+        ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT,
+};
+
+/**
+ * adau1761_jackdetect_debounce_time - Jack insertion detection debounce time
+ * @ADAU1761_JACKDETECT_DEBOUNCE_5MS: 5 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_10MS: 10 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_20MS: 20 milliseconds
+ * @ADAU1761_JACKDETECT_DEBOUNCE_40MS: 40 milliseconds
+ */
+enum adau1761_jackdetect_debounce_time {
+        ADAU1761_JACKDETECT_DEBOUNCE_5MS = 0,
+        ADAU1761_JACKDETECT_DEBOUNCE_10MS = 1,
+        ADAU1761_JACKDETECT_DEBOUNCE_20MS = 2,
+        ADAU1761_JACKDETECT_DEBOUNCE_40MS = 3,
+};
+
+/**
+ * enum adau1761_output_mode - Output mode configuration
+ * @ADAU1761_OUTPUT_MODE_HEADPHONE: Headphone output
+ * @ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS: Capless headphone output
+ * @ADAU1761_OUTPUT_MODE_LINE: Line output
+ */
+enum adau1761_output_mode {
+        ADAU1761_OUTPUT_MODE_HEADPHONE,
+        ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS,
+        ADAU1761_OUTPUT_MODE_LINE,
+};
+
+/**
+ * struct adau1761_platform_data - ADAU1761 Codec driver platform data
+ * @input_differential: If true the input pins will be configured in
+ *  differential mode.
+ * @lineout_mode: Output mode for the LOUT/ROUT pins
+ * @headphone_mode: Output mode for the LHP/RHP pins
+ * @digmic_jackdetect_pin_mode: JACKDET/MICIN pin configuration
+ * @jackdetect_debounce_time: Jack insertion detection debounce time.
+ *  Note: This value will only be used, if the JACKDET/MICIN pin is configured
+ *  for jack insertion detection.
+ * @jackdetect_active_low: If true the jack insertion detection is active low.
+ *  Othwise it will be active high.
+ * @micbias_voltage: Microphone voltage bias
+ */
+struct adau1761_platform_data {
+        bool input_differential;
+        enum adau1761_output_mode lineout_mode;
+        enum adau1761_output_mode headphone_mode;
+
+        enum adau1761_digmic_jackdet_pin_mode digmic_jackdetect_pin_mode;
+
+        enum adau1761_jackdetect_debounce_time jackdetect_debounce_time;
+        bool jackdetect_active_low;
+
+        enum adau17x1_micbias_voltage micbias_voltage;
+};
+
+/**
+ * struct adau1781_platform_data - ADAU1781 Codec driver platform data
+ * @left_input_differential: If true configure the left input as
+ * differential input.
+ * @right_input_differential: If true configure the right input as differntial
+ *  input.
+ * @use_dmic: If true configure the MIC pins as digital microphone pins instead
+ *  of analog microphone pins.
+ * @micbias_voltage: Microphone voltage bias
+ */
+struct adau1781_platform_data {
+        bool left_input_differential;
+        bool right_input_differential;
+
+        bool use_dmic;
+
+        enum adau17x1_micbias_voltage micbias_voltage;
+};
+
+#endif
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
index b3ca1e94e0c8..7819fc787731 100644
--- a/include/linux/platform_data/at91_adc.h
+++ b/include/linux/platform_data/at91_adc.h
@@ -7,23 +7,10 @@
 #ifndef _AT91_ADC_H_
 #define _AT91_ADC_H_
 
-/**
- * struct at91_adc_reg_desc - Various informations relative to registers
- * @channel_base:       Base offset for the channel data registers
- * @drdy_mask:          Mask of the DRDY field in the relevant registers
-                        (Interruptions registers mostly)
- * @status_register:    Offset of the Interrupt Status Register
- * @trigger_register:   Offset of the Trigger setup register
- * @mr_prescal_mask:    Mask of the PRESCAL field in the adc MR register
- * @mr_startup_mask:    Mask of the STARTUP field in the adc MR register
- */
-struct at91_adc_reg_desc {
-        u8      channel_base;
-        u32     drdy_mask;
-        u8      status_register;
-        u8      trigger_register;
-        u32     mr_prescal_mask;
-        u32     mr_startup_mask;
+enum atmel_adc_ts_type {
+        ATMEL_ADC_TOUCHSCREEN_NONE = 0,
+        ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
+        ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
 };
 
 /**
@@ -42,23 +29,21 @@ struct at91_adc_trigger {
 /**
  * struct at91_adc_data - platform data for ADC driver
  * @channels_used:              channels in use on the board as a bitmask
- * @num_channels:               global number of channels available on the board
- * @registers:                  Registers definition on the board
  * @startup_time:               startup time of the ADC in microseconds
  * @trigger_list:               Triggers available in the ADC
  * @trigger_number:             Number of triggers available in the ADC
  * @use_external_triggers:      does the board has external triggers availables
  * @vref:                       Reference voltage for the ADC in millivolts
+ * @touchscreen_type:           If a touchscreen is connected, its type (4 or 5 wires)
  */
 struct at91_adc_data {
         unsigned long                   channels_used;
-        u8                              num_channels;
-        struct at91_adc_reg_desc        *registers;
         u8                              startup_time;
         struct at91_adc_trigger         *trigger_list;
         u8                              trigger_number;
         bool                            use_external_triggers;
         u16                             vref;
+        enum atmel_adc_ts_type          touchscreen_type;