Revert "Move xen patchset to new version's subdir."

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / alsa-hda-stac-hp-gpio-switch-fix

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac-hp-gpio-switch-fix b/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac-hp-gpio-switch-fix
deleted file mode 100644 (file)
index e11c918..0000000
--- a/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac-hp-gpio-switch-fix
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Matthew Ranostay <mranostay@embeddedalley.com>
-Subject: ALSA: hda: STAC_DELL_M6 EAPD
-Patch-mainline: 
-References: bnc#446025
-
-Add support for EAPD on system suspend and disabling EAPD on headphone jack
-detection for STAC_DELL_M6 laptops.
-
-This patch fixes the regressions, the silent output on HP of some Dell
-laptops (see Novell bnc#446025):
-       https://bugzilla.novell.com/show_bug.cgi?id=446025
-
-Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- sound/pci/hda/patch_sigmatel.c |   15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -137,6 +137,7 @@ struct sigmatel_spec {
-       unsigned int num_mixers;
- 
-       int board_config;
-+      unsigned int eapd_switch: 1;
-       unsigned int surr_switch: 1;
-       unsigned int line_switch: 1;
-       unsigned int mic_switch: 1;
-@@ -3906,7 +3907,7 @@ static void stac92xx_hp_detect(struct hd
-               for (i = 0; i < cfg->speaker_outs; i++)
-                       stac92xx_reset_pinctl(codec, cfg->speaker_pins[i],
-                                               AC_PINCTL_OUT_EN);
--              if (spec->eapd_mask)
-+              if (spec->eapd_mask && spec->eapd_switch)
-                       stac_gpio_set(codec, spec->gpio_mask,
-                               spec->gpio_dir, spec->gpio_data &
-                               ~spec->eapd_mask);
-@@ -3921,7 +3922,7 @@ static void stac92xx_hp_detect(struct hd
-               for (i = 0; i < cfg->speaker_outs; i++)
-                       stac92xx_set_pinctl(codec, cfg->speaker_pins[i],
-                                               AC_PINCTL_OUT_EN);
--              if (spec->eapd_mask)
-+              if (spec->eapd_mask && spec->eapd_switch)
-                       stac_gpio_set(codec, spec->gpio_mask,
-                               spec->gpio_dir, spec->gpio_data |
-                               spec->eapd_mask);
-@@ -4250,6 +4251,7 @@ again:
-               spec->num_smuxes = 0;
-               spec->mixer = &stac92hd73xx_6ch_mixer[DELL_M6_MIXER];
-               spec->amp_nids = &stac92hd73xx_amp_nids[DELL_M6_AMP];
-+              spec->eapd_switch = 0;
-               spec->num_amps = 1;
-               switch (codec->subsystem_id) {
-               case 0x1028025e: /* Analog Mics */
-@@ -4278,6 +4280,7 @@ again:
-       default:
-               spec->num_dmics = STAC92HD73XX_NUM_DMICS;
-               spec->num_smuxes = ARRAY_SIZE(stac92hd73xx_smux_nids);
-+              spec->eapd_switch = 1;
-       }
-       if (spec->board_config > STAC_92HD73XX_REF) {
-               /* GPIO0 High = Enable EAPD */
-@@ -4423,7 +4426,13 @@ static int stac92hd71xx_resume(struct hd
- 
- static int stac92hd71xx_suspend(struct hda_codec *codec, pm_message_t state)
- {
-+      struct sigmatel_spec *spec = codec->spec;
-+
-       stac92hd71xx_set_power_state(codec, AC_PWRST_D3);
-+      if (spec->eapd_mask)
-+              stac_gpio_set(codec, spec->gpio_mask,
-+                              spec->gpio_dir, spec->gpio_data &
-+                              ~spec->eapd_mask);
-       return 0;
- };
- 
-@@ -4810,6 +4819,7 @@ static int patch_stac927x(struct hda_cod
-       spec->num_pwrs = 0;
-       spec->aloopback_mask = 0x40;
-       spec->aloopback_shift = 0;
-+      spec->eapd_switch = 1;
- 
-       err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
-       if (!err) {
-@@ -4890,6 +4900,7 @@ static int patch_stac9205(struct hda_cod
- 
-       spec->aloopback_mask = 0x40;
-       spec->aloopback_shift = 0;
-+      spec->eapd_switch = 1;
-       spec->multiout.dac_nids = spec->dac_nids;
-       
-       switch (spec->board_config){