Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
  ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
  ALSA: hda - Keep EAPD turned on for old Conexant chips
  ALSA: hda/realtek - Fix missing volume controls with ALC260
  ASoC: wm8940: Properly set codec->dapm.bias_level
  ALSA: hda - Fix pin-config for ASUS W90V
  ALSA: hda - Fix surround/CLFE headphone and speaker pins order
  ALSA: hda - Fix typo
  ALSA: Update the sound git tree URL
  ALSA: HDA: Add new revision for ALC662
  ASoC: max98095: Convert codec->hw_write to snd_soc_write
  ASoC: keep pointer to resource so it can be freed
  ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
  ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
  ASoC: da7210: Add support for line out and DAC
  ASoC: da7210: Add support for DAPM
  ALSA: hda/realtek - Fix DAC assignments of multiple speakers
  ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
  ASoC: Set sgtl5000->ldo in ldo_regulator_register
  ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
  ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
  ...

13 files changed, 249 insertions, 71 deletions

diff --git a/include/sound/adau1373.h b/include/sound/adau1373.h
new file mode 100644
index 000000000000..1b19c7666574
--- /dev/null
+++ b/include/sound/adau1373.h
@@ -0,0 +1,34 @@
+/*
+ * Analog Devices ADAU1373 Audio Codec drive
+ *
+ * Copyright 2011 Analog Devices Inc.
+ * Author: Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef __SOUND_ADAU1373_H__
+#define __SOUND_ADAU1373_H__
+
+enum adau1373_micbias_voltage {
+        ADAU1373_MICBIAS_2_9V = 0,
+        ADAU1373_MICBIAS_2_2V = 1,
+        ADAU1373_MICBIAS_2_6V = 2,
+        ADAU1373_MICBIAS_1_8V = 3,
+};
+
+#define ADAU1373_DRC_SIZE 13
+
+struct adau1373_platform_data {
+        bool input_differential[4];
+        bool lineout_differential;
+        bool lineout_ground_sense;
+
+        unsigned int num_drc;
+        uint8_t drc_setting[3][ADAU1373_DRC_SIZE];
+
+        enum adau1373_micbias_voltage micbias1;
+        enum adau1373_micbias_voltage micbias2;
+};
+
+#endif
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 5d6074faa279..a2e4ff5ba9e9 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -706,7 +706,7 @@ struct snd_timer_tread {
  *                                                                          *
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 6)
+#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 7)
 
 struct snd_ctl_card_info {
         int card;                       /* card number */
@@ -803,6 +803,8 @@ struct snd_ctl_elem_info {
                         unsigned int items;     /* R: number of items */
                         unsigned int item;      /* W: item number */
                         char name[64];          /* R: value name */
+                        __u64 names_ptr;        /* W: names list (ELEM_ADD only) */
+                        unsigned int names_length;
                 } enumerated;
                 unsigned char reserved[128];
         } value;
diff --git a/include/sound/initval.h b/include/sound/initval.h
index 1daa6dff8297..f99a0d2ddfe7 100644
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table)
 {
         while (*irq_table != -1) {
                 if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
-                                 IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ",
+                                 IRQF_PROBE_SHARED, "ALSA Test IRQ",
                                  (void *) irq_table)) {
                         free_irq(*irq_table, (void *) irq_table);
                         return *irq_table;
diff --git a/include/sound/jack.h b/include/sound/jack.h
index c140fc7cbd3f..63c790742db4 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -42,6 +42,7 @@ enum snd_jack_types {
         SND_JACK_MECHANICAL     = 0x0008, /* If detected separately */
         SND_JACK_VIDEOOUT       = 0x0010,
         SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+        SND_JACK_LINEIN         = 0x0020,
 
         /* Kept separate from switches to facilitate implementation */
         SND_JACK_BTN_0          = 0x4000,
diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index 1f1d53f8830b..20230db00ef1 100644
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -50,7 +50,10 @@
 #define MPU401_INFO_INTEGRATED  (1 << 2)        /* integrated h/w port */
 #define MPU401_INFO_MMIO        (1 << 3)        /* MMIO access */
 #define MPU401_INFO_TX_IRQ      (1 << 4)        /* independent TX irq */
+#define MPU401_INFO_IRQ_HOOK    (1 << 5)        /* mpu401 irq handler is called
+                                                   from driver irq handler */
 #define MPU401_INFO_NO_ACK      (1 << 6)        /* No ACK cmd needed */
+#define MPU401_INFO_USE_TIMER   (1 << 15)       /* internal */
 
 #define MPU401_MODE_BIT_INPUT           0
 #define MPU401_MODE_BIT_OUTPUT          1
@@ -73,8 +76,7 @@ struct snd_mpu401 {
         unsigned long port;             /* base port of MPU-401 chip */
         unsigned long cport;            /* port + 1 (usually) */
         struct resource *res;           /* port resource */
-        int irq;                        /* IRQ number of MPU-401 chip (-1 = poll) */
-        int irq_flags;
+        int irq;                        /* IRQ number of MPU-401 chip */
 
         unsigned long mode;             /* MPU401_MODE_XXXX */
         int timer_invoked;
@@ -131,7 +133,6 @@ int snd_mpu401_uart_new(struct snd_card *card,
                         unsigned long port,
                         unsigned int info_flags,
                         int irq,
-                        int irq_flags,
                         struct snd_rawmidi ** rrawmidi);
 
 #endif /* __SOUND_MPU401_H */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 54cb079b7bf1..0cf91b2f08ca 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -825,6 +825,8 @@ int snd_pcm_hw_constraint_step(struct snd_pcm_runtime *runtime,
 int snd_pcm_hw_constraint_pow2(struct snd_pcm_runtime *runtime,
                                unsigned int cond,
                                snd_pcm_hw_param_t var);
+int snd_pcm_hw_rule_noresample(struct snd_pcm_runtime *runtime,
+                               unsigned int base_rate);
 int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime,
                         unsigned int cond,
                         int var,
@@ -1035,6 +1037,8 @@ static inline void snd_pcm_mmap_data_close(struct vm_area_struct *area)
         atomic_dec(&substream->mmap_count);
 }
 
+int snd_pcm_lib_default_mmap(struct snd_pcm_substream *substream,
+                             struct vm_area_struct *area);
 /* mmap for io-memory area */
 #if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_ALPHA)
 #define SNDRV_PCM_INFO_MMAP_IOMEM       SNDRV_PCM_INFO_MMAP
diff --git a/include/sound/saif.h b/include/sound/saif.h
new file mode 100644
index 000000000000..d0e0de7984ec
--- /dev/null
+++ b/include/sound/saif.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * 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 __SOUND_SAIF_H__
+#define __SOUND_SAIF_H__
+
+struct mxs_saif_platform_data {
+        int (*init) (void);
+        int (*get_master_id) (unsigned int saif_id);
+};
+#endif
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 5ad5f3a50c68..2413acc54883 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -24,13 +24,13 @@ struct snd_pcm_substream;
  * Describes the physical PCM data formating and clocking. Add new formats
  * to the end.
  */
-#define SND_SOC_DAIFMT_I2S              0 /* I2S mode */
-#define SND_SOC_DAIFMT_RIGHT_J          1 /* Right Justified mode */
-#define SND_SOC_DAIFMT_LEFT_J           2 /* Left Justified mode */
-#define SND_SOC_DAIFMT_DSP_A            3 /* L data MSB after FRM LRC */
-#define SND_SOC_DAIFMT_DSP_B            4 /* L data MSB during FRM LRC */
-#define SND_SOC_DAIFMT_AC97             5 /* AC97 */
-#define SND_SOC_DAIFMT_PDM              6 /* Pulse density modulation */
+#define SND_SOC_DAIFMT_I2S              1 /* I2S mode */
+#define SND_SOC_DAIFMT_RIGHT_J          2 /* Right Justified mode */
+#define SND_SOC_DAIFMT_LEFT_J           3 /* Left Justified mode */
+#define SND_SOC_DAIFMT_DSP_A            4 /* L data MSB after FRM LRC */
+#define SND_SOC_DAIFMT_DSP_B            5 /* L data MSB during FRM LRC */
+#define SND_SOC_DAIFMT_AC97             6 /* AC97 */
+#define SND_SOC_DAIFMT_PDM              7 /* Pulse density modulation */
 
 /* left and right justified also known as MSB and LSB respectively */
 #define SND_SOC_DAIFMT_MSB              SND_SOC_DAIFMT_LEFT_J
@@ -42,8 +42,8 @@ struct snd_pcm_substream;
  * DAI bit clocks can be be gated (disabled) when the DAI is not
  * sending or receiving PCM data in a frame. This can be used to save power.
  */
-#define SND_SOC_DAIFMT_CONT             (0 << 4) /* continuous clock */
-#define SND_SOC_DAIFMT_GATED            (1 << 4) /* clock is gated */
+#define SND_SOC_DAIFMT_CONT             (1 << 4) /* continuous clock */
+#define SND_SOC_DAIFMT_GATED            (2 << 4) /* clock is gated */
 
 /*
  * DAI hardware signal inversions.
@@ -51,10 +51,10 @@ struct snd_pcm_substream;
  * Specifies whether the DAI can also support inverted clocks for the specified
  * format.
  */
-#define SND_SOC_DAIFMT_NB_NF            (0 << 8) /* normal bit clock + frame */
-#define SND_SOC_DAIFMT_NB_IF            (1 << 8) /* normal BCLK + inv FRM */
-#define SND_SOC_DAIFMT_IB_NF            (2 << 8) /* invert BCLK + nor FRM */
-#define SND_SOC_DAIFMT_IB_IF            (3 << 8) /* invert BCLK + FRM */
+#define SND_SOC_DAIFMT_NB_NF            (1 << 8) /* normal bit clock + frame */
+#define SND_SOC_DAIFMT_NB_IF            (2 << 8) /* normal BCLK + inv FRM */
+#define SND_SOC_DAIFMT_IB_NF            (3 << 8) /* invert BCLK + nor FRM */
+#define SND_SOC_DAIFMT_IB_IF            (4 << 8) /* invert BCLK + FRM */
 
 /*
  * DAI hardware clock masters.
@@ -63,10 +63,10 @@ struct snd_pcm_substream;
  * i.e. if the codec is clk and FRM master then the interface is
  * clk and frame slave.
  */
-#define SND_SOC_DAIFMT_CBM_CFM          (0 << 12) /* codec clk & FRM master */
-#define SND_SOC_DAIFMT_CBS_CFM          (1 << 12) /* codec clk slave & FRM master */
-#define SND_SOC_DAIFMT_CBM_CFS          (2 << 12) /* codec clk master & frame slave */
-#define SND_SOC_DAIFMT_CBS_CFS          (3 << 12) /* codec clk & FRM slave */
+#define SND_SOC_DAIFMT_CBM_CFM          (1 << 12) /* codec clk & FRM master */
+#define SND_SOC_DAIFMT_CBS_CFM          (2 << 12) /* codec clk slave & FRM master */
+#define SND_SOC_DAIFMT_CBM_CFS          (3 << 12) /* codec clk master & frame slave */
+#define SND_SOC_DAIFMT_CBS_CFS          (4 << 12) /* codec clk & FRM slave */
 
 #define SND_SOC_DAIFMT_FORMAT_MASK      0x000f
 #define SND_SOC_DAIFMT_CLOCK_MASK       0x00f0
@@ -242,6 +242,9 @@ struct snd_soc_dai {
         void *playback_dma_data;
         void *capture_dma_data;
 
+        /* Symmetry data - only valid if symmetry is being enforced */
+        unsigned int rate;
+
         /* parent platform/codec */
         union {
                 struct snd_soc_platform *platform;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e0583b7769cb..17a4c17f19f5 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -381,6 +381,9 @@ int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm,
 int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm,
                                 const char *pin);
 
+/* Mostly internal - should not normally be used */
+void dapm_mark_dirty(struct snd_soc_dapm_widget *w, const char *reason);
+
 /* dapm widget types */
 enum snd_soc_dapm_type {
         snd_soc_dapm_input = 0,         /* input pin */
@@ -473,6 +476,8 @@ struct snd_soc_dapm_widget {
         unsigned char ext:1;                    /* has external widgets */
         unsigned char force:1;                  /* force state */
         unsigned char ignore_suspend:1;         /* kept enabled over suspend */
+        unsigned char new_power:1;              /* power from this run */
+        unsigned char power_checked:1;          /* power checked this run */
         int subseq;                             /* sort within widget type */
 
         int (*power_check)(struct snd_soc_dapm_widget *w);
@@ -492,6 +497,9 @@ struct snd_soc_dapm_widget {
 
         /* used during DAPM updates */
         struct list_head power_list;
+        struct list_head dirty;
+        int inputs;
+        int outputs;
 };
 
 struct snd_soc_dapm_update {
@@ -524,6 +532,8 @@ struct snd_soc_dapm_context {
         enum snd_soc_bias_level target_bias_level;
         struct list_head list;
 
+        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
+
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_dapm;
 #endif
@@ -535,4 +545,10 @@ struct snd_soc_dapm_widget_list {
         struct snd_soc_dapm_widget *widgets[0];
 };
 
+struct snd_soc_dapm_stats {
+        int power_checks;
+        int path_checks;
+        int neighbour_checks;
+};
+
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index aa19f5a32ba8..11cfb5953e06 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -19,6 +19,7 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/regmap.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/control.h>
@@ -27,13 +28,20 @@
 /*
  * Convenience kcontrol builders
  */
-#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
+#define SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, xmax, xinvert) \
         ((unsigned long)&(struct soc_mixer_control) \
-        {.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \
-        .platform_max = xmax, .invert = xinvert})
+        {.reg = xreg, .rreg = xreg, .shift = shift_left, \
+        .rshift = shift_right, .max = xmax, .platform_max = xmax, \
+        .invert = xinvert})
+#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
+        SOC_DOUBLE_VALUE(xreg, xshift, xshift, xmax, xinvert)
 #define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
         ((unsigned long)&(struct soc_mixer_control) \
         {.reg = xreg, .max = xmax, .platform_max = xmax, .invert = xinvert})
+#define SOC_DOUBLE_R_VALUE(xlreg, xrreg, xshift, xmax, xinvert) \
+        ((unsigned long)&(struct soc_mixer_control) \
+        {.reg = xlreg, .rreg = xrreg, .shift = xshift, .rshift = xshift, \
+        .max = xmax, .platform_max = xmax, .invert = xinvert})
 #define SOC_SINGLE(xname, reg, shift, max, invert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
@@ -47,40 +55,36 @@
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\
         .put = snd_soc_put_volsw, \
         .private_value =  SOC_SINGLE_VALUE(reg, shift, max, invert) }
-#define SOC_DOUBLE(xname, xreg, shift_left, shift_right, xmax, xinvert) \
+#define SOC_DOUBLE(xname, reg, shift_left, shift_right, max, invert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
         .put = snd_soc_put_volsw, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg, .shift = shift_left, .rshift = shift_right, \
-                 .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
+                                          max, invert) }
 #define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .info = snd_soc_info_volsw_2r, \
-        .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
-                .max = xmax, .platform_max = xmax, .invert = xinvert} }
-#define SOC_DOUBLE_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert, tlv_array) \
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \
+        .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
+                                            xmax, xinvert) }
+#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
                  SNDRV_CTL_ELEM_ACCESS_READWRITE,\
         .tlv.p = (tlv_array), \
         .info = snd_soc_info_volsw, .get = snd_soc_get_volsw, \
         .put = snd_soc_put_volsw, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg, .shift = shift_left, .rshift = shift_right,\
-                 .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \
+                                          max, invert) }
 #define SOC_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
                  SNDRV_CTL_ELEM_ACCESS_READWRITE,\
         .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw_2r, \
-        .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
-                .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .info = snd_soc_info_volsw, \
+        .get = snd_soc_get_volsw, .put = snd_soc_put_volsw, \
+        .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
+                                            xmax, xinvert) }
 #define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
 {       .iface  = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
@@ -120,14 +124,13 @@
         .info = snd_soc_info_volsw, \
         .get = xhandler_get, .put = xhandler_put, \
         .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) }
-#define SOC_DOUBLE_EXT(xname, xreg, shift_left, shift_right, xmax, xinvert,\
+#define SOC_DOUBLE_EXT(xname, reg, shift_left, shift_right, max, invert,\
          xhandler_get, xhandler_put) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
         .info = snd_soc_info_volsw, \
         .get = xhandler_get, .put = xhandler_put, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg, .shift = shift_left, .rshift = shift_right, \
-                 .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .private_value = \
+                SOC_DOUBLE_VALUE(reg, shift_left, shift_right, max, invert) }
 #define SOC_SINGLE_EXT_TLV(xname, xreg, xshift, xmax, xinvert,\
          xhandler_get, xhandler_put, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
@@ -145,20 +148,18 @@
         .tlv.p = (tlv_array), \
         .info = snd_soc_info_volsw, \
         .get = xhandler_get, .put = xhandler_put, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = xreg, .shift = shift_left, .rshift = shift_right, \
-                .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .private_value = SOC_DOUBLE_VALUE(xreg, shift_left, shift_right, \
+                                          xmax, xinvert) }
 #define SOC_DOUBLE_R_EXT_TLV(xname, reg_left, reg_right, xshift, xmax, xinvert,\
          xhandler_get, xhandler_put, tlv_array) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
         .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
                  SNDRV_CTL_ELEM_ACCESS_READWRITE, \
         .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw_2r, \
+        .info = snd_soc_info_volsw, \
         .get = xhandler_get, .put = xhandler_put, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
-                .max = xmax, .platform_max = xmax, .invert = xinvert} }
+        .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
+                                            xmax, xinvert) }
 #define SOC_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \
 {       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
         .info = snd_soc_info_bool_ext, \
@@ -260,6 +261,7 @@ extern struct snd_ac97_bus_ops soc_ac97_ops;
 enum snd_soc_control_type {
         SND_SOC_I2C = 1,
         SND_SOC_SPI,
+        SND_SOC_REGMAP,
 };
 
 enum snd_soc_compress_type {
@@ -274,7 +276,7 @@ enum snd_soc_pcm_subclass {
 };
 
 int snd_soc_codec_set_sysclk(struct snd_soc_codec *codec, int clk_id,
-                             unsigned int freq, int dir);
+                             int source, unsigned int freq, int dir);
 int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source,
                           unsigned int freq_in, unsigned int freq_out);
 
@@ -391,12 +393,8 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
 int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol);
-int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_info *uinfo);
-int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
-int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol);
+#define snd_soc_get_volsw_2r snd_soc_get_volsw
+#define snd_soc_put_volsw_2r snd_soc_put_volsw
 int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_info *uinfo);
 int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
@@ -576,9 +574,11 @@ struct snd_soc_codec {
         const void *reg_def_copy;
         const struct snd_soc_cache_ops *cache_ops;
         struct mutex cache_rw_mutex;
+        int val_bytes;
 
         /* dapm */
         struct snd_soc_dapm_context dapm;
+        unsigned int ignore_pmdown_time:1; /* pmdown_time is ignored at stop */
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_codec_root;
@@ -607,7 +607,7 @@ struct snd_soc_codec_driver {
 
         /* codec wide operations */
         int (*set_sysclk)(struct snd_soc_codec *codec,
-                          int clk_id, unsigned int freq, int dir);
+                          int clk_id, int source, unsigned int freq, int dir);
         int (*set_pll)(struct snd_soc_codec *codec, int pll_id, int source,
                 unsigned int freq_in, unsigned int freq_out);
 
@@ -619,7 +619,7 @@ struct snd_soc_codec_driver {
         int (*volatile_register)(struct snd_soc_codec *, unsigned int);
         int (*readable_register)(struct snd_soc_codec *, unsigned int);
         int (*writable_register)(struct snd_soc_codec *, unsigned int);
-        short reg_cache_size;
+        unsigned int reg_cache_size;
         short reg_cache_step;
         short reg_word_size;
         const void *reg_cache_default;
@@ -630,10 +630,14 @@ struct snd_soc_codec_driver {
         /* codec bias level */
         int (*set_bias_level)(struct snd_soc_codec *,
                               enum snd_soc_bias_level level);
+        bool idle_bias_off;
 
         void (*seq_notifier)(struct snd_soc_dapm_context *,
                              enum snd_soc_dapm_type, int);
 
+        /* codec stream completion event */
+        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
+
         /* probe ordering - for components with runtime dependencies */
         int probe_order;
         int remove_order;
@@ -669,6 +673,9 @@ struct snd_soc_platform_driver {
         /* platform stream ops */
         struct snd_pcm_ops *ops;
 
+        /* platform stream completion event */
+        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
+
         /* probe ordering - for components with runtime dependencies */
         int probe_order;
         int remove_order;
@@ -703,6 +710,8 @@ struct snd_soc_dai_link {
         const char *cpu_dai_name;
         const char *codec_dai_name;
 
+        unsigned int dai_fmt;           /* format to set on init */
+
         /* Keep DAI active over suspend */
         unsigned int ignore_suspend:1;
 
@@ -815,9 +824,11 @@ struct snd_soc_card {
         struct list_head widgets;
         struct list_head paths;
         struct list_head dapm_list;
+        struct list_head dapm_dirty;
 
         /* Generic DAPM context for the card */
         struct snd_soc_dapm_context dapm;
+        struct snd_soc_dapm_stats dapm_stats;
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_card_root;
@@ -840,8 +851,6 @@ struct snd_soc_pcm_runtime  {
         unsigned int complete:1;
         unsigned int dev_registered:1;
 
-        /* Symmetry data - only valid if symmetry is being enforced */
-        unsigned int rate;
         long pmdown_time;
 
         /* runtime devices */
@@ -936,6 +945,18 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
         INIT_LIST_HEAD(&card->dapm_list);
 }
 
+static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
+{
+        if (mc->reg == mc->rreg && mc->shift == mc->rshift)
+                return 0;
+        /*
+         * mc->reg == mc->rreg && mc->shift != mc->rshift, or
+         * mc->reg != mc->rreg means that the control is
+         * stereo (bits in one register or in two registers)
+         */
+        return 1;
+}
+
 int snd_soc_util_init(void);
 void snd_soc_util_exit(void);
 
diff --git a/include/sound/tpa6130a2-plat.h b/include/sound/tpa6130a2-plat.h
index 89beccb57edd..4cc1093844c8 100644
--- a/include/sound/tpa6130a2-plat.h
+++ b/include/sound/tpa6130a2-plat.h
@@ -23,13 +23,7 @@
 #ifndef TPA6130A2_PLAT_H
 #define TPA6130A2_PLAT_H
 
-enum tpa_model {
-        TPA6130A2,
-        TPA6140A2,
-};
-
 struct tpa6130a2_platform_data {
-        enum tpa_model id;
         int power_gpio;
 };
 
diff --git a/include/sound/wm1250-ev1.h b/include/sound/wm1250-ev1.h
new file mode 100644
index 000000000000..7dff82834123
--- /dev/null
+++ b/include/sound/wm1250-ev1.h
@@ -0,0 +1,27 @@
+/*
+ * linux/sound/wm1250-ev1.h - Platform data for WM1250-EV1
+ *
+ * Copyright 2011 Wolfson Microelectronics. PLC.
+ *
+ * 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 __LINUX_SND_WM1250_EV1_H
+#define __LINUX_SND_WM1250_EV1_H
+
+#define WM1250_EV1_NUM_GPIOS 5
+
+#define WM1250_EV1_GPIO_CLK_ENA  0
+#define WM1250_EV1_GPIO_CLK_SEL0 1
+#define WM1250_EV1_GPIO_CLK_SEL1 2
+#define WM1250_EV1_GPIO_OSR      3
+#define WM1250_EV1_GPIO_MASTER   4
+
+
+struct wm1250_ev1_pdata {
+        int gpios[WM1250_EV1_NUM_GPIOS];
+};
+
+#endif
diff --git a/include/sound/wm5100.h b/include/sound/wm5100.h
new file mode 100644
index 000000000000..617d0c4a159f
--- /dev/null
+++ b/include/sound/wm5100.h
@@ -0,0 +1,59 @@
+/*
+ * linux/sound/wm5100.h -- Platform data for WM5100
+ *
+ * Copyright 2011 Wolfson Microelectronics. PLC.
+ *
+ * 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 __LINUX_SND_WM5100_H
+#define __LINUX_SND_WM5100_H
+
+enum wm5100_in_mode {
+        WM5100_IN_SE = 0,
+        WM5100_IN_DIFF = 1,
+        WM5100_IN_DMIC = 2,
+};
+
+enum wm5100_dmic_sup {
+        WM5100_DMIC_SUP_MICVDD = 0,
+        WM5100_DMIC_SUP_MICBIAS1 = 1,
+        WM5100_DMIC_SUP_MICBIAS2 = 2,
+        WM5100_DMIC_SUP_MICBIAS3 = 3,
+};
+
+enum wm5100_micdet_bias {
+        WM5100_MICDET_MICBIAS1 = 0,
+        WM5100_MICDET_MICBIAS2 = 1,
+        WM5100_MICDET_MICBIAS3 = 2,
+};
+
+struct wm5100_jack_mode {
+        enum wm5100_micdet_bias bias;
+        int hp_pol;
+        int micd_src;
+};
+
+#define WM5100_GPIO_SET 0x10000
+
+struct wm5100_pdata {
+        int reset;      /** GPIO controlling /RESET, if any */
+        int ldo_ena;    /** GPIO controlling LODENA, if any */
+        int hp_pol;     /** GPIO controlling headset polarity, if any */
+        int irq_flags;
+        int gpio_base;
+
+        struct wm5100_jack_mode jack_modes[2];
+
+        /* Input pin mode selection */
+        enum wm5100_in_mode in_mode[4];
+
+        /* DMIC supply selection */
+        enum wm5100_dmic_sup dmic_sup[4];
+
+        int gpio_defaults[6];
+};
+
+#endif