Merge branch 'for-3.2' into for-3.3

diff --combined sound/soc/codecs/Kconfig
index bc2364aced1babd7cb703693491a8f95e32b5975,fa787d45d74a920a32c4e8327a69c4a8a3544461..7c205e77d83aa8af2439955b56cecc9fc1e7419b
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -26,16 -26,14 +26,16 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
        select SND_SOC_ALC5623 if I2C
 +      select SND_SOC_ALC5632 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS42L51 if I2C
 +      select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
        select SND_SOC_CX20442
        select SND_SOC_DA7210 if I2C
        select SND_SOC_DFBMCS320
-       select SND_SOC_JZ4740_CODEC if SOC_JZ4740
+       select SND_SOC_JZ4740_CODEC
        select SND_SOC_LM4857 if I2C
        select SND_SOC_MAX98088 if I2C
        select SND_SOC_MAX98095 if I2C
@@@ -141,7 -139,7 +141,7 @@@ config SND_SOC_AD7331
        tristate
  
  config SND_SOC_ADAU1701
 -      select SIGMA
 +      select SND_SOC_SIGMADSP
        tristate
  
  config SND_SOC_ADAU1373
@@@ -170,8 -168,6 +170,8 @@@ config SND_SOC_AK467
  
  config SND_SOC_ALC5623
         tristate
 +config SND_SOC_ALC5632
 +      tristate
  
  config SND_SOC_CQ0093VC
        tristate
@@@ -179,9 -175,6 +179,9 @@@
  config SND_SOC_CS42L51
        tristate
  
 +config SND_SOC_CS42L73
 +      tristate
 +
  # Cirrus Logic CS4270 Codec
  config SND_SOC_CS4270
        tristate
@@@ -234,10 -227,6 +234,10 @@@ config SND_SOC_RT563
  config SND_SOC_SGTL5000
        tristate
  
 +config SND_SOC_SIGMADSP
 +      tristate
 +      select CRC32
 +
  config SND_SOC_SN95031
        tristate
  
@@@ -289,9 -278,6 +289,9 @@@ config SND_SOC_WL127
  config SND_SOC_WM1250_EV1
        tristate
  
 +config SND_SOC_WM2000
 +      tristate
 +
  config SND_SOC_WM5100
        tristate
  
@@@ -409,9 -395,6 +409,9 @@@ config SND_SOC_WM899
  config SND_SOC_WM9081
        tristate
  
 +config SND_SOC_WM9090
 +      tristate
 +
  config SND_SOC_WM9705
        tristate
  
@@@ -430,3 -413,9 +430,3 @@@ config SND_SOC_MAX987
  
  config SND_SOC_TPA6130A2
        tristate
 -
 -config SND_SOC_WM2000
 -      tristate
 -
 -config SND_SOC_WM9090
 -      tristate

diff --combined sound/soc/codecs/jz4740.c
index 517e2a516daf68b39db24e4d9c0911993ea00f29,3e1f4e172bfb90c318e4150d8aebbe782b78d4ab..d73d28317c005d17e29504e723a802b00ac9e47a
--- 1/sound/soc/codecs/jz4740.c
--- 2/sound/soc/codecs/jz4740.c
+++ b/sound/soc/codecs/jz4740.c
@@@ -15,6 -15,7 +15,7 @@@
  #include <linux/module.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
+ #include <linux/io.h>
  
  #include <linux/delay.h>
  
@@@ -206,7 -207,7 +207,7 @@@ static int jz4740_codec_hw_params(struc
        return 0;
  }
  
 -static struct snd_soc_dai_ops jz4740_codec_dai_ops = {
 +static const struct snd_soc_dai_ops jz4740_codec_dai_ops = {
        .hw_params = jz4740_codec_hw_params,
  };
  
@@@ -311,7 -312,7 +312,7 @@@ static int jz4740_codec_dev_remove(stru
  
  #ifdef CONFIG_PM_SLEEP
  
 -static int jz4740_codec_suspend(struct snd_soc_codec *codec, pm_message_t state)
 +static int jz4740_codec_suspend(struct snd_soc_codec *codec)
  {
        return jz4740_codec_set_bias_level(codec, SND_SOC_BIAS_OFF);
  }
@@@ -424,7 -425,17 +425,7 @@@ static struct platform_driver jz4740_co
        },
  };
  
 -static int __init jz4740_codec_init(void)
 -{
 -      return platform_driver_register(&jz4740_codec_driver);
 -}
 -module_init(jz4740_codec_init);
 -
 -static void __exit jz4740_codec_exit(void)
 -{
 -      platform_driver_unregister(&jz4740_codec_driver);
 -}
 -module_exit(jz4740_codec_exit);
 +module_platform_driver(jz4740_codec_driver);
  
  MODULE_DESCRIPTION("JZ4740 SoC internal codec driver");
  MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");