Merge branch 'upstream/wm8350' into for-2.6.32

diff --combined sound/soc/codecs/wm8350.c
index 3ff0373,26f826c..593d5b9
--- 1/sound/soc/codecs/wm8350.c
--- 2/sound/soc/codecs/wm8350.c
+++ b/sound/soc/codecs/wm8350.c
@@@ -63,8 -63,6 +63,8 @@@ struct wm8350_data 
        struct wm8350_jack_data hpl;
        struct wm8350_jack_data hpr;
        struct regulator_bulk_data supplies[ARRAY_SIZE(supply_names)];
 +      int fll_freq_out;
 +      int fll_freq_in;
  };
  
  static unsigned int wm8350_codec_cache_read(struct snd_soc_codec *codec,
@@@ -408,6 -406,7 +408,6 @@@ static const char *wm8350_deemp[] = { "
  static const char *wm8350_pol[] = { "Normal", "Inv R", "Inv L", "Inv L & R" };
  static const char *wm8350_dacmutem[] = { "Normal", "Soft" };
  static const char *wm8350_dacmutes[] = { "Fast", "Slow" };
 -static const char *wm8350_dacfilter[] = { "Normal", "Sloping" };
  static const char *wm8350_adcfilter[] = { "None", "High Pass" };
  static const char *wm8350_adchp[] = { "44.1kHz", "8kHz", "16kHz", "32kHz" };
  static const char *wm8350_lr[] = { "Left", "Right" };
@@@ -417,6 -416,7 +417,6 @@@ static const struct soc_enum wm8350_enu
        SOC_ENUM_SINGLE(WM8350_DAC_CONTROL, 0, 4, wm8350_pol),
        SOC_ENUM_SINGLE(WM8350_DAC_MUTE_VOLUME, 14, 2, wm8350_dacmutem),
        SOC_ENUM_SINGLE(WM8350_DAC_MUTE_VOLUME, 13, 2, wm8350_dacmutes),
 -      SOC_ENUM_SINGLE(WM8350_DAC_MUTE_VOLUME, 12, 2, wm8350_dacfilter),
        SOC_ENUM_SINGLE(WM8350_ADC_CONTROL, 15, 2, wm8350_adcfilter),
        SOC_ENUM_SINGLE(WM8350_ADC_CONTROL, 8, 4, wm8350_adchp),
        SOC_ENUM_SINGLE(WM8350_ADC_CONTROL, 0, 4, wm8350_pol),
@@@ -444,9 -444,10 +444,9 @@@ static const struct snd_kcontrol_new wm
                                0, 255, 0, dac_pcm_tlv),
        SOC_ENUM("Playback PCM Mute Function", wm8350_enum[2]),
        SOC_ENUM("Playback PCM Mute Speed", wm8350_enum[3]),
 -      SOC_ENUM("Playback PCM Filter", wm8350_enum[4]),
 -      SOC_ENUM("Capture PCM Filter", wm8350_enum[5]),
 -      SOC_ENUM("Capture PCM HP Filter", wm8350_enum[6]),
 -      SOC_ENUM("Capture ADC Inversion", wm8350_enum[7]),
 +      SOC_ENUM("Capture PCM Filter", wm8350_enum[4]),
 +      SOC_ENUM("Capture PCM HP Filter", wm8350_enum[5]),
 +      SOC_ENUM("Capture ADC Inversion", wm8350_enum[6]),
        SOC_WM8350_DOUBLE_R_TLV("Capture PCM Volume",
                                WM8350_ADC_DIGITAL_VOLUME_L,
                                WM8350_ADC_DIGITAL_VOLUME_R,
@@@ -579,7 -580,7 +579,7 @@@ static const struct snd_kcontrol_new wm
        SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
                            WM8350_INPUT_MIXER_VOLUME_L, 9, 7, 0, out_mix_tlv),
        SOC_DAPM_SINGLE("PGA Capture Switch",
-                       WM8350_LEFT_INPUT_VOLUME, 14, 1, 0),
+                       WM8350_LEFT_INPUT_VOLUME, 14, 1, 1),
  };
  
  /* Right Input Mixer */
@@@ -589,7 -590,7 +589,7 @@@ static const struct snd_kcontrol_new wm
        SOC_DAPM_SINGLE_TLV("L3 Capture Volume",
                            WM8350_INPUT_MIXER_VOLUME_R, 13, 7, 0, out_mix_tlv),
        SOC_DAPM_SINGLE("PGA Capture Switch",
-                       WM8350_RIGHT_INPUT_VOLUME, 14, 1, 0),
+                       WM8350_RIGHT_INPUT_VOLUME, 14, 1, 1),
  };
  
  /* Left Mic Mixer */
@@@ -612,7 -613,7 +612,7 @@@ SOC_DAPM_SINGLE("Switch", WM8350_BEEP_V
  
  /* Out4 Capture Mux */
  static const struct snd_kcontrol_new wm8350_out4_capture_controls =
 -SOC_DAPM_ENUM("Route", wm8350_enum[8]);
 +SOC_DAPM_ENUM("Route", wm8350_enum[7]);
  
  static const struct snd_soc_dapm_widget wm8350_dapm_widgets[] = {
  
@@@ -992,7 -993,6 +992,7 @@@ static int wm8350_pcm_hw_params(struct 
                                struct snd_soc_dai *codec_dai)
  {
        struct snd_soc_codec *codec = codec_dai->codec;
 +      struct wm8350 *wm8350 = codec->control_data;
        u16 iface = wm8350_codec_read(codec, WM8350_AI_FORMATING) &
            ~WM8350_AIF_WL_MASK;
  
@@@ -1012,19 -1012,6 +1012,19 @@@
        }
  
        wm8350_codec_write(codec, WM8350_AI_FORMATING, iface);
 +
 +      /* The sloping stopband filter is recommended for use with
 +       * lower sample rates to improve performance.
 +       */
 +      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
 +              if (params_rate(params) < 24000)
 +                      wm8350_set_bits(wm8350, WM8350_DAC_MUTE_VOLUME,
 +                                      WM8350_DAC_SB_FILT);
 +              else
 +                      wm8350_clear_bits(wm8350, WM8350_DAC_MUTE_VOLUME,
 +                                        WM8350_DAC_SB_FILT);
 +      }
 +
        return 0;
  }
  
@@@ -1106,14 -1093,10 +1106,14 @@@ static int wm8350_set_fll(struct snd_so
  {
        struct snd_soc_codec *codec = codec_dai->codec;
        struct wm8350 *wm8350 = codec->control_data;
 +      struct wm8350_data *priv = codec->private_data;
        struct _fll_div fll_div;
        int ret = 0;
        u16 fll_1, fll_4;
  
 +      if (freq_in == priv->fll_freq_in && freq_out == priv->fll_freq_out)
 +              return 0;
 +
        /* power down FLL - we need to do this for reconfiguration */
        wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_4,
                          WM8350_FLL_ENA | WM8350_FLL_OSC_ENA);
@@@ -1148,9 -1131,6 +1148,9 @@@
        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_FLL_OSC_ENA);
        wm8350_set_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_FLL_ENA);
  
 +      priv->fll_freq_out = freq_out;
 +      priv->fll_freq_in = freq_in;
 +
        return 0;
  }
  
@@@ -1680,21 -1660,6 +1680,21 @@@ static int __devexit wm8350_codec_remov
        return 0;
  }
  
 +#ifdef CONFIG_PM
 +static int wm8350_codec_suspend(struct platform_device *pdev, pm_message_t m)
 +{
 +      return snd_soc_suspend_device(&pdev->dev);
 +}
 +
 +static int wm8350_codec_resume(struct platform_device *pdev)
 +{
 +      return snd_soc_resume_device(&pdev->dev);
 +}
 +#else
 +#define wm8350_codec_suspend NULL
 +#define wm8350_codec_resume NULL
 +#endif
 +
  static struct platform_driver wm8350_codec_driver = {
        .driver = {
                   .name = "wm8350-codec",
@@@ -1702,8 -1667,6 +1702,8 @@@
                   },
        .probe = wm8350_codec_probe,
        .remove = __devexit_p(wm8350_codec_remove),
 +      .suspend = wm8350_codec_suspend,
 +      .resume = wm8350_codec_resume,
  };
  
  static __init int wm8350_init(void)