Merge remote-tracking branch 'asoc/topic/blackfin' into for-3.7

7 files changed, 59 insertions, 52 deletions

diff --git a/sound/core/sgbuf.c b/sound/core/sgbuf.c
index 4e7ec2b49873..d0f00356fc11 100644
--- a/sound/core/sgbuf.c
+++ b/sound/core/sgbuf.c
@@ -101,7 +101,7 @@ void *snd_malloc_sgbuf_pages(struct device *device,
                 if (snd_dma_alloc_pages_fallback(SNDRV_DMA_TYPE_DEV, device,
                                                  chunk, &tmpb) < 0) {
                         if (!sgbuf->pages)
-                                return NULL;
+                                goto _failed;
                         if (!res_size)
                                 goto _failed;
                         size = sgbuf->pages * PAGE_SIZE;
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 4f502a2bdc3c..0a436626182b 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -326,7 +326,10 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
         for (page = blk->first_page; page <= blk->last_page; page++, idx++) {
                 unsigned long ofs = idx << PAGE_SHIFT;
                 dma_addr_t addr;
-                addr = snd_pcm_sgbuf_get_addr(substream, ofs);
+                if (ofs >= runtime->dma_bytes)
+                        addr = emu->silent_page.addr;
+                else
+                        addr = snd_pcm_sgbuf_get_addr(substream, ofs);
                 if (! is_valid_page(emu, addr)) {
                         printk(KERN_ERR "emu: failure page = %d\n", idx);
                         mutex_unlock(&hdr->block_mutex);
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index 647218d69f68..4f7d2dfcef7b 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -332,13 +332,12 @@ int snd_hda_parse_pin_defcfg(struct hda_codec *codec,
         if (cfg->dig_outs)
                 snd_printd("   dig-out=0x%x/0x%x\n",
                            cfg->dig_out_pins[0], cfg->dig_out_pins[1]);
-        snd_printd("   inputs:");
+        snd_printd("   inputs:\n");
         for (i = 0; i < cfg->num_inputs; i++) {
-                snd_printd(" %s=0x%x",
+                snd_printd("     %s=0x%x\n",
                             hda_get_autocfg_input_label(codec, cfg, i),
                             cfg->inputs[i].pin);
         }
-        snd_printd("\n");
         if (cfg->dig_in_pin)
                 snd_printd("   dig-in=0x%x\n", cfg->dig_in_pin);
 
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 14361184ae1e..5e22a8f43d2e 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -2967,12 +2967,10 @@ static const char * const cxt5066_models[CXT5066_MODELS] = {
 };
 
 static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
-        SND_PCI_QUIRK(0x1025, 0x054c, "Acer Aspire 3830TG", CXT5066_AUTO),
         SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
         SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x1028, 0x0401, "Dell Vostro 1014", CXT5066_DELL_VOSTRO),
-        SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),
         SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x1028, 0x050f, "Dell Inspiron", CXT5066_IDEAPAD),
         SND_PCI_QUIRK(0x1028, 0x0510, "Dell Vostro", CXT5066_IDEAPAD),
@@ -2988,14 +2986,10 @@ static const struct snd_pci_quirk cxt5066_cfg_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21c6, "Thinkpad Edge 13", CXT5066_ASUS),
-        SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T510", CXT5066_AUTO),
-        SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520 & W520", CXT5066_AUTO),
         SND_PCI_QUIRK(0x17aa, 0x21da, "Lenovo X220", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x21db, "Lenovo X220-tablet", CXT5066_THINKPAD),
         SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo U350", CXT5066_ASUS),
         SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo G560", CXT5066_ASUS),
-        SND_PCI_QUIRK(0x17aa, 0x3938, "Lenovo G565", CXT5066_AUTO),
-        SND_PCI_QUIRK(0x1b0a, 0x2092, "CyberpowerPC Gamer Xplorer N57001", CXT5066_AUTO),
         {}
 };
 
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 69b928449789..8f23374fa642 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -877,8 +877,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
         struct hdmi_eld *eld;
         struct hdmi_spec_per_cvt *per_cvt = NULL;
 
-        hinfo->nid = 0; /* clear the leftover value */
-
         /* Validate hinfo */
         pin_idx = hinfo_to_pin_index(spec, hinfo);
         if (snd_BUG_ON(pin_idx < 0))
@@ -1163,6 +1161,14 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
         return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);
 }
 
+static int generic_hdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
+                                             struct hda_codec *codec,
+                                             struct snd_pcm_substream *substream)
+{
+        snd_hda_codec_cleanup_stream(codec, hinfo->nid);
+        return 0;
+}
+
 static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
                           struct hda_codec *codec,
                           struct snd_pcm_substream *substream)
@@ -1202,6 +1208,7 @@ static const struct hda_pcm_ops generic_ops = {
         .open = hdmi_pcm_open,
         .close = hdmi_pcm_close,
         .prepare = generic_hdmi_playback_pcm_prepare,
+        .cleanup = generic_hdmi_playback_pcm_cleanup,
 };
 
 static int generic_hdmi_build_pcms(struct hda_codec *codec)
@@ -1220,7 +1227,6 @@ static int generic_hdmi_build_pcms(struct hda_codec *codec)
                 pstr = &info->stream[SNDRV_PCM_STREAM_PLAYBACK];
                 pstr->substreams = 1;
                 pstr->ops = generic_ops;
-                pstr->nid = 1; /* FIXME: just for avoiding a debug WARNING */
                 /* other pstr fields are set in open */
         }
 
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 344b221d2102..4f81dd44c837 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6099,6 +6099,8 @@ static const struct alc_fixup alc269_fixups[] = {
         [ALC269_FIXUP_PCM_44K] = {
                 .type = ALC_FIXUP_FUNC,
                 .v.func = alc269_fixup_pcm_44k,
+                .chained = true,
+                .chain_id = ALC269_FIXUP_QUANTA_MUTE
         },
         [ALC269_FIXUP_STEREO_DMIC] = {
                 .type = ALC_FIXUP_FUNC,
@@ -6206,9 +6208,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x17aa, 0x21b8, "Thinkpad Edge 14", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x17aa, 0x21ca, "Thinkpad L412", ALC269_FIXUP_SKU_IGNORE),
         SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),
+        SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),
+        SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),
+        SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),
         SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),
-        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_QUANTA_MUTE),
-        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Lenovo Ideapd", ALC269_FIXUP_PCM_44K),
+        SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),
         SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
 
 #if 0
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index d542d4063771..16b9c9efd19a 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -59,62 +59,63 @@ static struct snd_soc_ops bf5xx_ad1836_ops = {
 #define BF5XX_AD1836_DAIFMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_IF | \
                                 SND_SOC_DAIFMT_CBM_CFM)
 
-static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
-        {
-                .name = "ad1836",
-                .stream_name = "AD1836",
-                .cpu_dai_name = "bfin-tdm.0",
-                .codec_dai_name = "ad1836-hifi",
-                .platform_name = "bfin-tdm-pcm-audio",
-                .codec_name = "spi0.4",
-                .ops = &bf5xx_ad1836_ops,
-                .dai_fmt = BF5XX_AD1836_DAIFMT,
-        },
-        {
-                .name = "ad1836",
-                .stream_name = "AD1836",
-                .cpu_dai_name = "bfin-tdm.1",
-                .codec_dai_name = "ad1836-hifi",
-                .platform_name = "bfin-tdm-pcm-audio",
-                .codec_name = "spi0.4",
-                .ops = &bf5xx_ad1836_ops,
-                .dai_fmt = BF5XX_AD1836_DAIFMT,
-        },
+static struct snd_soc_dai_link bf5xx_ad1836_dai = {
+        .name = "ad1836",
+        .stream_name = "AD1836",
+        .codec_dai_name = "ad1836-hifi",
+        .platform_name = "bfin-tdm-pcm-audio",
+        .ops = &bf5xx_ad1836_ops,
+        .dai_fmt = BF5XX_AD1836_DAIFMT,
 };
 
 static struct snd_soc_card bf5xx_ad1836 = {
         .name = "bfin-ad1836",
         .owner = THIS_MODULE,
-        .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dai_link = &bf5xx_ad1836_dai,
         .num_links = 1,
 };
 
-static struct platform_device *bfxx_ad1836_snd_device;
-
-static int __init bf5xx_ad1836_init(void)
+static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev)
 {
+        struct snd_soc_card *card = &bf5xx_ad1836;
+        const char **link_name;
         int ret;
 
-        bfxx_ad1836_snd_device = platform_device_alloc("soc-audio", -1);
-        if (!bfxx_ad1836_snd_device)
-                return -ENOMEM;
+        link_name = pdev->dev.platform_data;
+        if (!link_name) {
+                dev_err(&pdev->dev, "No platform data supplied\n");
+                return -EINVAL;
+        }
+        bf5xx_ad1836_dai.cpu_dai_name = link_name[0];
+        bf5xx_ad1836_dai.codec_name = link_name[1];
 
-        platform_set_drvdata(bfxx_ad1836_snd_device, &bf5xx_ad1836);
-        ret = platform_device_add(bfxx_ad1836_snd_device);
+        card->dev = &pdev->dev;
+        platform_set_drvdata(pdev, card);
 
+        ret = snd_soc_register_card(card);
         if (ret)
-                platform_device_put(bfxx_ad1836_snd_device);
-
+                dev_err(&pdev->dev, "Failed to register card\n");
         return ret;
 }
 
-static void __exit bf5xx_ad1836_exit(void)
+static int __devexit bf5xx_ad1836_driver_remove(struct platform_device *pdev)
 {
-        platform_device_unregister(bfxx_ad1836_snd_device);
+        struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_card(card);
+        return 0;
 }
 
-module_init(bf5xx_ad1836_init);
-module_exit(bf5xx_ad1836_exit);
+static struct platform_driver bf5xx_ad1836_driver = {
+        .driver = {
+                .name = "bfin-snd-ad1836",
+                .owner = THIS_MODULE,
+                .pm = &snd_soc_pm_ops,
+        },
+        .probe = bf5xx_ad1836_driver_probe,
+        .remove = __devexit_p(bf5xx_ad1836_driver_remove),
+};
+module_platform_driver(bf5xx_ad1836_driver);
 
 /* Module information */
 MODULE_AUTHOR("Barry Song");