]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.drivers/alsa-post-ga-lenovo-x200-quirk
Move xen patchset to new version's subdir.
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / alsa-post-ga-lenovo-x200-quirk
diff --git a/src/patches/suse-2.6.27.31/patches.drivers/alsa-post-ga-lenovo-x200-quirk b/src/patches/suse-2.6.27.31/patches.drivers/alsa-post-ga-lenovo-x200-quirk
new file mode 100644 (file)
index 0000000..d853a65
--- /dev/null
@@ -0,0 +1,106 @@
+From 27e089888fb1a3d1d13892262f9d522b03985044 Mon Sep 17 00:00:00 2001
+From: Aristeu Sergio Rozanski Filho <aris@ruivo.org>
+Date: Thu, 12 Feb 2009 17:50:37 -0500
+Subject: ALSA: hda: add quirk for Lenovo X200 laptop dock
+Patch-mainline: 
+References: bnc#480753
+
+Currently the HP connector on X200 dock doesn't detect when a HP is connected
+nor allows sound to be played using it. This patch fixes the problem by adding
+a quirk for this specific model. It's possible that others have the same NID
+(0x19) to report when dock HP is connected, but I don't have access to any.
+Please Cc me in the reply since I'm not subscribed to alsa-devel@.
+
+Signed-off-by: Aristeu Rozanski <aris@redhat.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ Documentation/sound/alsa/ALSA-Configuration.txt |    1 
+ sound/pci/hda/patch_conexant.c                  |   40 ++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+--- a/Documentation/sound/alsa/ALSA-Configuration.txt
++++ b/Documentation/sound/alsa/ALSA-Configuration.txt
+@@ -1016,6 +1016,7 @@
+       Conexant 5051
+         laptop        Basic Laptop config (default)
+         hp            HP Spartan laptop
++        lenovo-x200   Lenovo X200 laptop
+       STAC9200
+         ref           Reference board
+--- a/sound/pci/hda/patch_conexant.c
++++ b/sound/pci/hda/patch_conexant.c
+@@ -1702,6 +1702,40 @@
+       { } /* end */
+ };
++static struct hda_verb cxt5051_lenovo_x200_init_verbs[] = {
++      /* Line in, Mic */
++      {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
++      {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
++      {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
++      {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
++      {0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
++      {0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x03},
++      /* SPK  */
++      {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
++      {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
++      /* HP, Amp  */
++      {0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
++      {0x16, AC_VERB_SET_CONNECT_SEL, 0x00},
++      /* Docking HP */
++      {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
++      {0x19, AC_VERB_SET_CONNECT_SEL, 0x00},
++      /* DAC1 */
++      {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
++      /* Record selector: Int mic */
++      {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
++      {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1) | 0x44},
++      {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0) | 0x44},
++      /* SPDIF route: PCM */
++      {0x1c, AC_VERB_SET_CONNECT_SEL, 0x0},
++      /* EAPD */
++      {0x1a, AC_VERB_SET_EAPD_BTLENABLE, 0x2}, /* default on */
++      {0x16, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
++      {0x17, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTB_EVENT},
++      {0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CXT5051_PORTC_EVENT},
++      {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN|CONEXANT_HP_EVENT},
++      { } /* end */
++};
++
+ /* initialize jack-sensing, too */
+ static int cxt5051_init(struct hda_codec *codec)
+ {
+@@ -1718,18 +1752,21 @@
+ enum {
+       CXT5051_LAPTOP,  /* Laptops w/ EAPD support */
+       CXT5051_HP,     /* no docking */
++      CXT5051_LENOVO_X200,    /* Lenovo X200 laptop */
+       CXT5051_MODELS
+ };
+ static const char *cxt5051_models[CXT5051_MODELS] = {
+       [CXT5051_LAPTOP]        = "laptop",
+       [CXT5051_HP]            = "hp",
++      [CXT5051_LENOVO_X200]   = "lenovo-x200",
+ };
+ static struct snd_pci_quirk cxt5051_cfg_tbl[] = {
+       SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board",
+                     CXT5051_LAPTOP),
+       SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP),
++      SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200),
+       {}
+ };
+@@ -1770,6 +1807,9 @@
+               codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;
+               spec->mixers[0] = cxt5051_hp_mixers;
+               break;
++      case CXT5051_LENOVO_X200:
++              spec->init_verbs[0] = cxt5051_lenovo_x200_init_verbs;
++              /* fallthru */
+       default:
+       case CXT5051_LAPTOP:
+               codec->patch_ops.unsol_event = cxt5051_hp_unsol_event;