--- /dev/null
+From 08a43c1831432c8ea67e7d446515cd9014c495ab Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 21 Jan 2013 16:53:37 +0100
+Subject: ALSA: hda - Add Conexant CX20755/20756/20757 codec IDs
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 42c364ace52ae6b4699105b39f2559c256b6cd4c upstream.
+
+These are just compatible with other CX2075x codecs.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4612,6 +4612,12 @@ static const struct hda_codec_preset snd
+ .patch = patch_conexant_auto },
+ { .id = 0x14f15111, .name = "CX20753/4",
+ .patch = patch_conexant_auto },
++ { .id = 0x14f15113, .name = "CX20755",
++ .patch = patch_conexant_auto },
++ { .id = 0x14f15114, .name = "CX20756",
++ .patch = patch_conexant_auto },
++ { .id = 0x14f15115, .name = "CX20757",
++ .patch = patch_conexant_auto },
+ {} /* terminator */
+ };
+
+@@ -4635,6 +4641,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150b9"
+ MODULE_ALIAS("snd-hda-codec-id:14f1510f");
+ MODULE_ALIAS("snd-hda-codec-id:14f15110");
+ MODULE_ALIAS("snd-hda-codec-id:14f15111");
++MODULE_ALIAS("snd-hda-codec-id:14f15113");
++MODULE_ALIAS("snd-hda-codec-id:14f15114");
++MODULE_ALIAS("snd-hda-codec-id:14f15115");
+
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("Conexant HD-audio codec");
--- /dev/null
+From 7737238648b535686434fdb1717b10d4c4f7c6d8 Mon Sep 17 00:00:00 2001
+From: Felix Kaechele <felix@fetzig.org>
+Date: Wed, 26 Sep 2012 01:20:44 +0200
+Subject: ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
+
+From: Felix Kaechele <felix@fetzig.org>
+
+commit e4db0952e542090c605fd41d31d761f1b4624f4a upstream.
+
+The Lenovo IdeaPad U310 has an internal mic where the right channel
+is phase inverted.
+
+Signed-off-by: Felix Kaechele <felix@fetzig.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4477,6 +4477,7 @@ static const struct snd_pci_quirk cxt506
+ SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
++ SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC),
+ SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
+ {}
+ };
--- /dev/null
+From d2f11b9e87180966534b8dc0644aa8e6c97ac35e Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Thu, 21 Jun 2012 16:03:01 +0200
+Subject: ALSA: HDA: Add inverted internal mic quirk for Lenovo S205
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit b3c5dce81584391af8b6dedb0647e65c17aab3a2 upstream.
+
+The Lenovo Ideapad S205 has an internal mic where the right channel
+is phase inverted.
+
+BugLink: https://bugs.launchpad.net/bugs/884652
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4477,6 +4477,7 @@ static const struct snd_pci_quirk cxt506
+ SND_PCI_QUIRK(0x17aa, 0x21ce, "Lenovo T420", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC),
++ SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC),
+ {}
+ };
+
--- /dev/null
+From d59c4a70d3072020654cf8a55214f898163fb839 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 12 Dec 2012 12:10:01 +0100
+Subject: ALSA: hda - Add stereo-dmic fixup for Acer Aspire One 522
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 63a077e27648b4043b1ca1b4e29f0c42d99616b6 upstream.
+
+Acer Aspire One 522 has the infamous digital mic unit that needs the
+phase inversion fixup for stereo.
+
+Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=715737
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4473,6 +4473,7 @@ static const struct snd_pci_quirk cxt505
+ };
+
+ static const struct snd_pci_quirk cxt5066_fixups[] = {
++ SND_PCI_QUIRK(0x1025, 0x0543, "Acer Aspire One 522", CXT_FIXUP_STEREO_DMIC),
+ SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x215e, "Lenovo T410", CXT_PINCFG_LENOVO_TP410),
+ SND_PCI_QUIRK(0x17aa, 0x215f, "Lenovo T510", CXT_PINCFG_LENOVO_TP410),
--- /dev/null
+From 9712d74ae8182e8d364c6a8ad2cdcb404e04b714 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 6 Nov 2013 18:47:42 +0100
+Subject: ALSA: hda - Add support for CX20952
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 8f42d7698751a45cd9f7134a5da49bc5b6206179 upstream.
+
+It's a superset of the existing CX2075x codecs, so we can reuse the
+existing parser code.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4618,6 +4618,8 @@ static const struct hda_codec_preset snd
+ .patch = patch_conexant_auto },
+ { .id = 0x14f15115, .name = "CX20757",
+ .patch = patch_conexant_auto },
++ { .id = 0x14f151d7, .name = "CX20952",
++ .patch = patch_conexant_auto },
+ {} /* terminator */
+ };
+
+@@ -4644,6 +4646,7 @@ MODULE_ALIAS("snd-hda-codec-id:14f15111"
+ MODULE_ALIAS("snd-hda-codec-id:14f15113");
+ MODULE_ALIAS("snd-hda-codec-id:14f15114");
+ MODULE_ALIAS("snd-hda-codec-id:14f15115");
++MODULE_ALIAS("snd-hda-codec-id:14f151d7");
+
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("Conexant HD-audio codec");
--- /dev/null
+From fc9c1a6fcab38a410b2aa292936107924b7d5f5d Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 11 May 2012 08:39:24 +0200
+Subject: ALSA: hda/conexant - Correct vendor IDs for new codecs
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 2d825fd82eb765412a558a56e193b77117d56699 upstream.
+
+Never trust datasheet...
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4572,10 +4572,6 @@ static int patch_conexant_auto(struct hd
+ */
+
+ static const struct hda_codec_preset snd_hda_preset_conexant[] = {
+- { .id = 0x14f11510, .name = "CX20751/2",
+- .patch = patch_conexant_auto },
+- { .id = 0x14f11511, .name = "CX20753/4",
+- .patch = patch_conexant_auto },
+ { .id = 0x14f15045, .name = "CX20549 (Venice)",
+ .patch = patch_cxt5045 },
+ { .id = 0x14f15047, .name = "CX20551 (Waikiki)",
+@@ -4610,11 +4606,15 @@ static const struct hda_codec_preset snd
+ .patch = patch_conexant_auto },
+ { .id = 0x14f150b9, .name = "CX20665",
+ .patch = patch_conexant_auto },
++ { .id = 0x14f1510f, .name = "CX20751/2",
++ .patch = patch_conexant_auto },
++ { .id = 0x14f15110, .name = "CX20751/2",
++ .patch = patch_conexant_auto },
++ { .id = 0x14f15111, .name = "CX20753/4",
++ .patch = patch_conexant_auto },
+ {} /* terminator */
+ };
+
+-MODULE_ALIAS("snd-hda-codec-id:14f11510");
+-MODULE_ALIAS("snd-hda-codec-id:14f11511");
+ MODULE_ALIAS("snd-hda-codec-id:14f15045");
+ MODULE_ALIAS("snd-hda-codec-id:14f15047");
+ MODULE_ALIAS("snd-hda-codec-id:14f15051");
+@@ -4632,6 +4632,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150ab"
+ MODULE_ALIAS("snd-hda-codec-id:14f150ac");
+ MODULE_ALIAS("snd-hda-codec-id:14f150b8");
+ MODULE_ALIAS("snd-hda-codec-id:14f150b9");
++MODULE_ALIAS("snd-hda-codec-id:14f1510f");
++MODULE_ALIAS("snd-hda-codec-id:14f15110");
++MODULE_ALIAS("snd-hda-codec-id:14f15111");
+
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("Conexant HD-audio codec");
--- /dev/null
+From 810352f7bc7ee8788c89660bec3b7790e1c215bc Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Tue, 10 Apr 2012 13:05:29 +0200
+Subject: ALSA: hda - Fix oops caused by recent commit "Fix internal mic for Lenovo Ideapad U300s"
+
+From: David Henningsson <david.henningsson@canonical.com>
+
+commit 83b0c6ba999643ee8ad6329f26e1cdc870e1a920 upstream.
+
+Make sure we don't dereference the "quirk" pointer when it is null.
+
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: David Henningsson <david.henningsson@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Cc: Weng Meiling <wengmeiling.weng@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_conexant.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -4430,7 +4430,9 @@ static void apply_fixup(struct hda_codec
+ struct conexant_spec *spec = codec->spec;
+
+ quirk = snd_pci_quirk_lookup(codec->bus->pci, quirk);
+- if (quirk && table[quirk->value]) {
++ if (!quirk)
++ return;
++ if (table[quirk->value]) {
+ snd_printdd(KERN_INFO "hda_codec: applying pincfg for %s\n",
+ quirk->name);
+ apply_pincfg(codec, table[quirk->value]);
mac80211-introduce-ieee80211_hw_teardown_aggr_on_bar_fail.patch
pci-shpchp-use-per-slot-workqueues-to-avoid-deadlock.patch
thinkpad-acpi-fix-issuing-duplicated-key-events-for-brightness-up-down.patch
+alsa-hda-add-inverted-internal-mic-quirk-for-lenovo-s205.patch
+alsa-hda-add-inverted-internal-mic-quirk-for-lenovo-ideapad-u310.patch
+alsa-hda-fix-oops-caused-by-recent-commit-fix-internal-mic-for-lenovo-ideapad-u300s.patch
+alsa-hda-add-stereo-dmic-fixup-for-acer-aspire-one-522.patch
+alsa-hda-conexant-correct-vendor-ids-for-new-codecs.patch
+alsa-hda-add-conexant-cx20755-20756-20757-codec-ids.patch
+alsa-hda-add-support-for-cx20952.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
