Merge branch 'regmap-asoc' into for-3.2

diff --combined include/sound/soc.h
index 64a9dd5a69d609e9f2372a8843f273745128f6f3,d02269437de3f7aaaef45978bf5936a969303dba..3fe658eea28b4162cebfef9546d010b509ff8492
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
+++ b/include/sound/soc.h
@@@ -19,6 -19,7 +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>
@@@ -260,6 -261,7 +261,7 @@@ extern struct snd_ac97_bus_ops soc_ac97
  enum snd_soc_control_type {
        SND_SOC_I2C = 1,
        SND_SOC_SPI,
+       SND_SOC_REGMAP,
  };
  
  enum snd_soc_compress_type {
@@@ -576,6 -578,7 +578,7 @@@ 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;
@@@ -634,9 -637,6 +637,9 @@@ struct snd_soc_codec_driver 
        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;
@@@ -672,9 -672,6 +675,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;

diff --combined sound/soc/Kconfig
index 47d07ce4e867c96966a8c03e05049720fda036a3,f9054f7c1d52ea98d730ed3fe171ffe73d1f2e6c..1381db853ef0f8b5d875c6ba220de0f90476add5
--- 1/sound/soc/Kconfig
--- 2/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@@ -7,6 -7,8 +7,8 @@@ menuconfig SND_SO
        select SND_PCM
        select AC97_BUS if SND_SOC_AC97_BUS
        select SND_JACK if INPUT=y || INPUT=SND
+       select REGMAP_I2C if I2C
+       select REGMAP_SPI if SPI_MASTER
        ---help---
  
          If you want ASoC support, you should say Y here and also to the
@@@ -51,7 -53,6 +53,7 @@@ source "sound/soc/nuc900/Kconfig
  source "sound/soc/omap/Kconfig"
  source "sound/soc/kirkwood/Kconfig"
  source "sound/soc/mid-x86/Kconfig"
 +source "sound/soc/mxs/Kconfig"
  source "sound/soc/pxa/Kconfig"
  source "sound/soc/samsung/Kconfig"
  source "sound/soc/s6000/Kconfig"