Merge remote-tracking branch 'regulator/for-next'

diff --combined sound/soc/codecs/sgtl5000.c
index 250175755eb280ef2d7f63829bd4e6c90375d9d1,fc7ab30572d0a6012548c731f602c8b7c405a1ef..eb176eea8d2451f1c06bebd6878b861d90bddd9f
--- 1/sound/soc/codecs/sgtl5000.c
--- 2/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@@ -16,6 -16,7 +16,6 @@@
  #include <linux/pm.h>
  #include <linux/i2c.h>
  #include <linux/clk.h>
 -#include <linux/platform_device.h>
  #include <linux/regulator/driver.h>
  #include <linux/regulator/machine.h>
  #include <linux/regulator/consumer.h>
@@@ -364,7 -365,7 +364,7 @@@ static const DECLARE_TLV_DB_SCALE(captu
  
  /* tlv for mic gain, 0db 20db 30db 40db */
  static const unsigned int mic_gain_tlv[] = {
 -      TLV_DB_RANGE_HEAD(4),
 +      TLV_DB_RANGE_HEAD(2),
        0, 0, TLV_DB_SCALE_ITEM(0, 0, 0),
        1, 3, TLV_DB_SCALE_ITEM(2000, 1000, 0),
  };
@@@ -832,7 -833,7 +832,7 @@@ static int ldo_regulator_register(struc
        ldo->voltage = voltage;
  
        ldo->dev = regulator_register(&ldo->desc, codec->dev,
-                                         init_data, ldo);
+                                         init_data, ldo, NULL);
        if (IS_ERR(ldo->dev)) {
                int ret = PTR_ERR(ldo->dev);
  
@@@ -922,7 -923,7 +922,7 @@@ static int sgtl5000_set_bias_level(stru
                        SNDRV_PCM_FMTBIT_S24_LE |\
                        SNDRV_PCM_FMTBIT_S32_LE)
  
 -static struct snd_soc_dai_ops sgtl5000_ops = {
 +static const struct snd_soc_dai_ops sgtl5000_ops = {
        .hw_params = sgtl5000_pcm_hw_params,
        .digital_mute = sgtl5000_digital_mute,
        .set_fmt = sgtl5000_set_dai_fmt,
@@@ -967,7 -968,7 +967,7 @@@ static int sgtl5000_volatile_register(s
  }
  
  #ifdef CONFIG_SUSPEND
 -static int sgtl5000_suspend(struct snd_soc_codec *codec, pm_message_t state)
 +static int sgtl5000_suspend(struct snd_soc_codec *codec)
  {
        sgtl5000_set_bias_level(codec, SND_SOC_BIAS_OFF);