14 files changed, 147 insertions, 27 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 99b6f8203a50..b5b8baa1d70e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6402,8 +6402,9 @@ S:	Supported
 F:      drivers/input/touchscreen/*wm97*
 F:      include/linux/wm97xx.h
 
-WOLFSON MICROELECTRONICS PMIC DRIVERS
+WOLFSON MICROELECTRONICS DRIVERS
 M:      Mark Brown <broonie@opensource.wolfsonmicro.com>
+M:      Ian Lartey <ian@opensource.wolfsonmicro.com>
 T:      git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:      http://opensource.wolfsonmicro.com/node/8
 S:      Supported
@@ -6418,8 +6419,8 @@ F:	drivers/watchdog/wm83*_wdt.c
 F:      include/linux/mfd/wm831x/
 F:      include/linux/mfd/wm8350/
 F:      include/linux/mfd/wm8400*
-F:      sound/soc/codecs/wm8350.*
-F:      sound/soc/codecs/wm8400.*
+F:      include/sound/wm????.h
+F:      sound/soc/codecs/wm*
 
 X.25 NETWORK LAYER
 M:      Andrew Hendry <andrew.hendry@gmail.com>
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index fdb58eb83d4e..479e3025a8a3 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -15,7 +15,6 @@
 #include <linux/linkage.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/smp_lock.h>
 #include <linux/sound.h>
 #include <linux/smp_lock.h>
 #include <linux/soundcard.h>
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 720a81d711e3..dd8fb86c842b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1261,12 +1261,17 @@ void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
 }
 EXPORT_SYMBOL_HDA(snd_hda_codec_setup_stream);
 
+static void really_cleanup_stream(struct hda_codec *codec,
+                                  struct hda_cvt_setup *q);
+
 /**
- * snd_hda_codec_cleanup_stream - clean up the codec for closing
+ * __snd_hda_codec_cleanup_stream - clean up the codec for closing
  * @codec: the CODEC to clean up
  * @nid: the NID to clean up
+ * @do_now: really clean up the stream instead of clearing the active flag
  */
-void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
+void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,
+                                    int do_now)
 {
         struct hda_cvt_setup *p;
 
@@ -1274,14 +1279,19 @@ void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid)
                 return;
 
         snd_printdd("hda_codec_cleanup_stream: NID=0x%x\n", nid);
-        /* here we just clear the active flag; actual clean-ups will be done
-         * in purify_inactive_streams()
-         */
         p = get_hda_cvt_setup(codec, nid);
-        if (p)
-                p->active = 0;
+        if (p) {
+                /* here we just clear the active flag when do_now isn't set;
+                 * actual clean-ups will be done later in
+                 * purify_inactive_streams() called from snd_hda_codec_prpapre()
+                 */
+                if (do_now)
+                        really_cleanup_stream(codec, p);
+                else
+                        p->active = 0;
+        }
 }
-EXPORT_SYMBOL_HDA(snd_hda_codec_cleanup_stream);
+EXPORT_SYMBOL_HDA(__snd_hda_codec_cleanup_stream);
 
 static void really_cleanup_stream(struct hda_codec *codec,
                                   struct hda_cvt_setup *q)
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 3f7a479881e5..4303353feda9 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -963,7 +963,10 @@ void snd_hda_codec_cleanup(struct hda_codec *codec,
 void snd_hda_codec_setup_stream(struct hda_codec *codec, hda_nid_t nid,
                                 u32 stream_tag,
                                 int channel_id, int format);
-void snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid);
+void __snd_hda_codec_cleanup_stream(struct hda_codec *codec, hda_nid_t nid,
+                                    int do_now);
+#define snd_hda_codec_cleanup_stream(codec, nid) \
+        __snd_hda_codec_cleanup_stream(codec, nid, 0)
 unsigned int snd_hda_calc_stream_format(unsigned int rate,
                                         unsigned int channels,
                                         unsigned int format,
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
index d8da18a9e98b..803b298f7411 100644
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
@@ -596,4 +596,53 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld)
 }
 EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free);
 
+/* update PCM info based on ELD */
+void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
+                              struct hda_pcm_stream *codec_pars)
+{
+        int i;
+
+        pcm->rates = 0;
+        pcm->formats = 0;
+        pcm->maxbps = 0;
+        pcm->channels_min = -1;
+        pcm->channels_max = 0;
+        for (i = 0; i < eld->sad_count; i++) {
+                struct cea_sad *a = &eld->sad[i];
+                pcm->rates |= a->rates;
+                if (a->channels < pcm->channels_min)
+                        pcm->channels_min = a->channels;
+                if (a->channels > pcm->channels_max)
+                        pcm->channels_max = a->channels;
+                if (a->format == AUDIO_CODING_TYPE_LPCM) {
+                        if (a->sample_bits & AC_SUPPCM_BITS_16) {
+                                pcm->formats |= SNDRV_PCM_FMTBIT_S16_LE;
+                                if (pcm->maxbps < 16)
+                                        pcm->maxbps = 16;
+                        }
+                        if (a->sample_bits & AC_SUPPCM_BITS_20) {
+                                pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                                if (pcm->maxbps < 20)
+                                        pcm->maxbps = 20;
+                        }
+                        if (a->sample_bits & AC_SUPPCM_BITS_24) {
+                                pcm->formats |= SNDRV_PCM_FMTBIT_S32_LE;
+                                if (pcm->maxbps < 24)
+                                        pcm->maxbps = 24;
+                        }
+                }
+        }
+
+        if (!codec_pars)
+                return;
+
+        /* restrict the parameters by the values the codec provides */
+        pcm->rates &= codec_pars->rates;
+        pcm->formats &= codec_pars->formats;
+        pcm->channels_min = max(pcm->channels_min, codec_pars->channels_min);
+        pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);
+        pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);
+}
+EXPORT_SYMBOL_HDA(hdmi_eld_update_pcm_info);
+
 #endif /* CONFIG_PROC_FS */
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 7a97f126f6f7..28ab4aead48f 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -604,6 +604,8 @@ struct hdmi_eld {
 int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid);
 int snd_hdmi_get_eld(struct hdmi_eld *, struct hda_codec *, hda_nid_t);
 void snd_hdmi_show_eld(struct hdmi_eld *eld);
+void hdmi_eld_update_pcm_info(struct hdmi_eld *eld, struct hda_pcm_stream *pcm,
+                              struct hda_pcm_stream *codec_pars);
 
 #ifdef CONFIG_PROC_FS
 int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld,
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 350ee8ac4153..4ef5efaaaef1 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -656,7 +656,7 @@ static int change_cur_input(struct hda_codec *codec, unsigned int idx,
                 return 0;
         if (spec->cur_adc && spec->cur_adc != spec->adc_nid[idx]) {
                 /* stream is running, let's swap the current ADC */
-                snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
+                __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
                 spec->cur_adc = spec->adc_nid[idx];
                 snd_hda_codec_setup_stream(codec, spec->cur_adc,
                                            spec->cur_adc_stream_tag, 0,
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index f7e234e5ee96..31b5d9eeba68 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1733,7 +1733,7 @@ static void cxt5051_portc_automic(struct hda_codec *codec)
         new_adc = spec->adc_nids[spec->cur_adc_idx];
         if (spec->cur_adc && spec->cur_adc != new_adc) {
                 /* stream is running, let's swap the current ADC */
-                snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
+                __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
                 spec->cur_adc = new_adc;
                 snd_hda_codec_setup_stream(codec, new_adc,
                                            spec->cur_adc_stream_tag, 0,
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 522e0748ee99..2bc0f07cf33f 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -46,6 +46,7 @@ struct hdmi_spec {
          * export one pcm per pipe
          */
         struct hda_pcm  pcm_rec[MAX_HDMI_CVTS];
+        struct hda_pcm_stream codec_pcm_pars[MAX_HDMI_CVTS];
 
         /*
          * nvhdmi specific
@@ -766,6 +767,47 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t nid,
 }
 
 /*
+ * HDA PCM callbacks
+ */
+static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
+                         struct hda_codec *codec,
+                         struct snd_pcm_substream *substream)
+{
+        struct hdmi_spec *spec = codec->spec;
+        struct hdmi_eld *eld;
+        struct hda_pcm_stream *codec_pars;
+        unsigned int idx;
+
+        for (idx = 0; idx < spec->num_cvts; idx++)
+                if (hinfo->nid == spec->cvt[idx])
+                        break;
+        if (snd_BUG_ON(idx >= spec->num_cvts) ||
+            snd_BUG_ON(idx >= spec->num_pins))
+                return -EINVAL;
+
+        /* save the PCM info the codec provides */
+        codec_pars = &spec->codec_pcm_pars[idx];
+        if (!codec_pars->rates)
+                *codec_pars = *hinfo;
+
+        eld = &spec->sink_eld[idx];
+        if (eld->sad_count > 0) {
+                hdmi_eld_update_pcm_info(eld, hinfo, codec_pars);
+                if (hinfo->channels_min > hinfo->channels_max ||
+                    !hinfo->rates || !hinfo->formats)
+                        return -ENODEV;
+        } else {
+                /* fallback to the codec default */
+                hinfo->channels_min = codec_pars->channels_min;
+                hinfo->channels_max = codec_pars->channels_max;
+                hinfo->rates = codec_pars->rates;
+                hinfo->formats = codec_pars->formats;
+                hinfo->maxbps = codec_pars->maxbps;
+        }
+        return 0;
+}
+
+/*
  * HDA/HDMI auto parsing
  */
 
diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
index 5972d5e7d01f..d382d3c81c0f 100644
--- a/sound/pci/hda/patch_intelhdmi.c
+++ b/sound/pci/hda/patch_intelhdmi.c
@@ -80,6 +80,7 @@ static struct hda_pcm_stream intel_hdmi_pcm_playback = {
         .substreams = 1,
         .channels_min = 2,
         .ops = {
+                .open = hdmi_pcm_open,
                 .prepare = intel_hdmi_playback_pcm_prepare,
                 .cleanup = intel_hdmi_playback_pcm_cleanup,
         },
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
index 77e2b4028b9f..f636870dc718 100644
--- a/sound/pci/hda/patch_nvhdmi.c
+++ b/sound/pci/hda/patch_nvhdmi.c
@@ -347,10 +347,8 @@ static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo,
 static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_89 = {
         .substreams = 1,
         .channels_min = 2,
-        .rates = SUPPORTED_RATES,
-        .maxbps = SUPPORTED_MAXBPS,
-        .formats = SUPPORTED_FORMATS,
         .ops = {
+                .open = hdmi_pcm_open,
                 .prepare = nvhdmi_dig_playback_pcm_prepare_8ch_89,
                 .cleanup = nvhdmi_playback_pcm_cleanup,
         },
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 55d6e5b6bb7d..2cd1ae809e46 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -1037,7 +1037,7 @@ static void alc_dual_mic_adc_auto_switch(struct hda_codec *codec)
         new_adc = spec->adc_nids[spec->cur_adc_idx];
         if (spec->cur_adc && spec->cur_adc != new_adc) {
                 /* stream is running, let's swap the current ADC */
-                snd_hda_codec_cleanup_stream(codec, spec->cur_adc);
+                __snd_hda_codec_cleanup_stream(codec, spec->cur_adc, 1);
                 spec->cur_adc = new_adc;
                 snd_hda_codec_setup_stream(codec, new_adc,
                                            spec->cur_adc_stream_tag, 0,
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index a87046a96f2a..522249d5c2b4 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -95,6 +95,7 @@ struct wm8994_priv {
 
         struct wm8994_micdet micdet[2];
 
+        int revision;
         struct wm8994_pdata *pdata;
 };
 
@@ -3070,6 +3071,8 @@ static int wm8994_set_dai_sysclk(struct snd_soc_dai *dai,
 static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
+        struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
+
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
@@ -3082,11 +3085,16 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
 
         case SND_SOC_BIAS_STANDBY:
                 if (codec->bias_level == SND_SOC_BIAS_OFF) {
-                        /* Tweak DC servo configuration for improved
-                         * performance. */
-                        snd_soc_write(codec, 0x102, 0x3);
-                        snd_soc_write(codec, 0x56, 0x3);
-                        snd_soc_write(codec, 0x102, 0);
+                        /* Tweak DC servo and DSP configuration for
+                         * improved performance. */
+                        if (wm8994->revision < 4) {
+                                /* Tweak DC servo and DSP configuration for
+                                 * improved performance. */
+                                snd_soc_write(codec, 0x102, 0x3);
+                                snd_soc_write(codec, 0x56, 0x3);
+                                snd_soc_write(codec, 0x817, 0);
+                                snd_soc_write(codec, 0x102, 0);
+                        }
 
                         /* Discharge LINEOUT1 & 2 */
                         snd_soc_update_bits(codec, WM8994_ANTIPOP_1,
@@ -3919,7 +3927,6 @@ static int wm8994_codec_probe(struct platform_device *pdev)
         struct wm8994_priv *wm8994;
         struct snd_soc_codec *codec;
         int i;
-        u16 rev;
 
         if (wm8994_codec) {
                 dev_err(&pdev->dev, "Another WM8994 is registered\n");
@@ -3973,8 +3980,8 @@ static int wm8994_codec_probe(struct platform_device *pdev)
                         wm8994->reg_cache[i] = 0;
 
         /* Set revision-specific configuration */
-        rev = snd_soc_read(codec, WM8994_CHIP_REVISION);
-        switch (rev) {
+        wm8994->revision = snd_soc_read(codec, WM8994_CHIP_REVISION);
+        switch (wm8994->revision) {
         case 2:
         case 3:
                 wm8994->hubs.dcs_codes = -5;
diff --git a/sound/usb/format.c b/sound/usb/format.c
index 4387f54d73db..3a1375459c06 100644
--- a/sound/usb/format.c
+++ b/sound/usb/format.c
@@ -392,6 +392,10 @@ static int parse_audio_format_i(struct snd_usb_audio *chip,
                 /* fp->channels is already set in this case */
                 ret = parse_audio_format_rates_v2(chip, fp);
                 break;
+        default:
+                snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n",
+                           chip->dev->devnum, fp->iface, fp->altsetting, protocol);
+                return -EINVAL;
         }
 
         if (fp->channels < 1) {
@@ -452,6 +456,10 @@ static int parse_audio_format_ii(struct snd_usb_audio *chip,
                 ret = parse_audio_format_rates_v2(chip, fp);
                 break;
         }
+        default:
+                snd_printk(KERN_ERR "%d:%u:%d : invalid protocol version %d\n",
+                           chip->dev->devnum, fp->iface, fp->altsetting, protocol);
+                return -EINVAL;
         }
 
         return ret;