]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
delete alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch for...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Jul 2014 19:09:08 +0000 (12:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Jul 2014 19:09:08 +0000 (12:09 -0700)
queue-3.10/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch [deleted file]
queue-3.10/series
queue-3.14/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch [deleted file]
queue-3.14/series

diff --git a/queue-3.10/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch b/queue-3.10/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch
deleted file mode 100644 (file)
index 4f35885..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-From 8b3dfdaf0c25a584cb31d04d2574115cf2d422ab Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 24 Jun 2014 13:55:25 +0200
-Subject: ALSA: hda - Adjust speaker HPF and add LED support for HP Spectre 13
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 8b3dfdaf0c25a584cb31d04d2574115cf2d422ab upstream.
-
-HP Spectre 13 has the IDT 92HD95 codec, and BIOS seems to set the
-default high-pass filter in some "safer" range, which results in the
-very soft tone from the built-in speakers in contrast to Windows.
-Also, the mute LED control is missing, since 92HD95 codec still has no
-HP-specific fixups for GPIO setups.
-
-This patch adds these missing features: the HPF is adjusted by the
-vendor-specific verb, and the LED is set up from a DMI string (but
-with the default polarity = 0 assumption due to the incomplete BIOS on
-the given machine).
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=74841
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/sound/alsa/HD-Audio-Models.txt |    5 ++
- sound/pci/hda/patch_sigmatel.c               |   58 ++++++++++++++++++++++++++-
- 2 files changed, 62 insertions(+), 1 deletion(-)
-
---- a/Documentation/sound/alsa/HD-Audio-Models.txt
-+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
-@@ -284,6 +284,11 @@ STAC92HD83*
-   hp-inv-led  HP with broken BIOS for inverted mute LED
-   auto                BIOS setup (default)
-+STAC92HD95
-+==========
-+  hp-led      LED support for HP laptops
-+  hp-bass     Bass HPF setup for HP Spectre 13
-+
- STAC9872
- ========
-   vaio                VAIO laptop without SPDIF
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -121,6 +121,12 @@ enum {
- };
- enum {
-+      STAC_92HD95_HP_LED,
-+      STAC_92HD95_HP_BASS,
-+      STAC_92HD95_MODELS
-+};
-+
-+enum {
-       STAC_925x_REF,
-       STAC_M1,
-       STAC_M1_2,
-@@ -3560,6 +3566,48 @@ static const struct snd_pci_quirk stac92
-       {} /* terminator */
- };
-+static void stac92hd95_fixup_hp_led(struct hda_codec *codec,
-+                                  const struct hda_fixup *fix, int action)
-+{
-+      struct sigmatel_spec *spec = codec->spec;
-+
-+      if (action != HDA_FIXUP_ACT_PRE_PROBE)
-+              return;
-+
-+      if (find_mute_led_cfg(codec, spec->default_polarity))
-+              codec_dbg(codec, "mute LED gpio %d polarity %d\n",
-+                              spec->gpio_led,
-+                              spec->gpio_led_polarity);
-+}
-+
-+static const struct hda_fixup stac92hd95_fixups[] = {
-+      [STAC_92HD95_HP_LED] = {
-+              .type = HDA_FIXUP_FUNC,
-+              .v.func = stac92hd95_fixup_hp_led,
-+      },
-+      [STAC_92HD95_HP_BASS] = {
-+              .type = HDA_FIXUP_VERBS,
-+              .v.verbs = (const struct hda_verb[]) {
-+                      {0x1a, 0x795, 0x00}, /* HPF to 100Hz */
-+                      {}
-+              },
-+              .chained = true,
-+              .chain_id = STAC_92HD95_HP_LED,
-+      },
-+};
-+
-+static const struct snd_pci_quirk stac92hd95_fixup_tbl[] = {
-+      SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1911, "HP Spectre 13", STAC_92HD95_HP_BASS),
-+      {} /* terminator */
-+};
-+
-+static const struct hda_model_fixup stac92hd95_models[] = {
-+      { .id = STAC_92HD95_HP_LED, .name = "hp-led" },
-+      { .id = STAC_92HD95_HP_BASS, .name = "hp-bass" },
-+      {}
-+};
-+
-+
- static int stac_parse_auto_config(struct hda_codec *codec)
- {
-       struct sigmatel_spec *spec = codec->spec;
-@@ -4045,10 +4093,16 @@ static int patch_stac92hd95(struct hda_c
-       spec->gen.beep_nid = 0x19; /* digital beep */
-       spec->pwr_nids = stac92hd95_pwr_nids;
-       spec->num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);
--      spec->default_polarity = -1; /* no default cfg */
-+      spec->default_polarity = 0;
-       codec->patch_ops = stac_patch_ops;
-+      snd_hda_pick_fixup(codec, stac92hd95_models, stac92hd95_fixup_tbl,
-+                         stac92hd95_fixups);
-+      snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
-+
-+      stac_setup_gpio(codec);
-+
-       err = stac_parse_auto_config(codec);
-       if (err < 0) {
-               stac_free(codec);
-@@ -4057,6 +4111,8 @@ static int patch_stac92hd95(struct hda_c
-       codec->proc_widget_hook = stac92hd_proc_hook;
-+      snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
-+
-       return 0;
- }
index b91771d1a98b596dffb1fab1452ca67359d9dd8e..8093597dced7a22516cdd2c8b3e66e5ce826b1be 100644 (file)
@@ -43,4 +43,3 @@ netfilter-ipt_ulog-fix-info-leaks.patch
 documentation-submittingpatches-describe-the-fixes-tag.patch
 tracing-try-again-for-saved-cmdline-if-failed-due-to-locking.patch
 tracing-fix-syscall_-regfunc-vs-copy_process-race.patch
-alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch
diff --git a/queue-3.14/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch b/queue-3.14/alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch
deleted file mode 100644 (file)
index ed9a2c2..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-From 8b3dfdaf0c25a584cb31d04d2574115cf2d422ab Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 24 Jun 2014 13:55:25 +0200
-Subject: ALSA: hda - Adjust speaker HPF and add LED support for HP Spectre 13
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 8b3dfdaf0c25a584cb31d04d2574115cf2d422ab upstream.
-
-HP Spectre 13 has the IDT 92HD95 codec, and BIOS seems to set the
-default high-pass filter in some "safer" range, which results in the
-very soft tone from the built-in speakers in contrast to Windows.
-Also, the mute LED control is missing, since 92HD95 codec still has no
-HP-specific fixups for GPIO setups.
-
-This patch adds these missing features: the HPF is adjusted by the
-vendor-specific verb, and the LED is set up from a DMI string (but
-with the default polarity = 0 assumption due to the incomplete BIOS on
-the given machine).
-
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=74841
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- Documentation/sound/alsa/HD-Audio-Models.txt |    5 ++
- sound/pci/hda/patch_sigmatel.c               |   58 ++++++++++++++++++++++++++-
- 2 files changed, 62 insertions(+), 1 deletion(-)
-
---- a/Documentation/sound/alsa/HD-Audio-Models.txt
-+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
-@@ -286,6 +286,11 @@ STAC92HD83*
-   hp-inv-led  HP with broken BIOS for inverted mute LED
-   auto                BIOS setup (default)
-+STAC92HD95
-+==========
-+  hp-led      LED support for HP laptops
-+  hp-bass     Bass HPF setup for HP Spectre 13
-+
- STAC9872
- ========
-   vaio                VAIO laptop without SPDIF
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -122,6 +122,12 @@ enum {
- };
- enum {
-+      STAC_92HD95_HP_LED,
-+      STAC_92HD95_HP_BASS,
-+      STAC_92HD95_MODELS
-+};
-+
-+enum {
-       STAC_925x_REF,
-       STAC_M1,
-       STAC_M1_2,
-@@ -4125,6 +4131,48 @@ static const struct snd_pci_quirk stac92
-       {} /* terminator */
- };
-+static void stac92hd95_fixup_hp_led(struct hda_codec *codec,
-+                                  const struct hda_fixup *fix, int action)
-+{
-+      struct sigmatel_spec *spec = codec->spec;
-+
-+      if (action != HDA_FIXUP_ACT_PRE_PROBE)
-+              return;
-+
-+      if (find_mute_led_cfg(codec, spec->default_polarity))
-+              codec_dbg(codec, "mute LED gpio %d polarity %d\n",
-+                              spec->gpio_led,
-+                              spec->gpio_led_polarity);
-+}
-+
-+static const struct hda_fixup stac92hd95_fixups[] = {
-+      [STAC_92HD95_HP_LED] = {
-+              .type = HDA_FIXUP_FUNC,
-+              .v.func = stac92hd95_fixup_hp_led,
-+      },
-+      [STAC_92HD95_HP_BASS] = {
-+              .type = HDA_FIXUP_VERBS,
-+              .v.verbs = (const struct hda_verb[]) {
-+                      {0x1a, 0x795, 0x00}, /* HPF to 100Hz */
-+                      {}
-+              },
-+              .chained = true,
-+              .chain_id = STAC_92HD95_HP_LED,
-+      },
-+};
-+
-+static const struct snd_pci_quirk stac92hd95_fixup_tbl[] = {
-+      SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1911, "HP Spectre 13", STAC_92HD95_HP_BASS),
-+      {} /* terminator */
-+};
-+
-+static const struct hda_model_fixup stac92hd95_models[] = {
-+      { .id = STAC_92HD95_HP_LED, .name = "hp-led" },
-+      { .id = STAC_92HD95_HP_BASS, .name = "hp-bass" },
-+      {}
-+};
-+
-+
- static int stac_parse_auto_config(struct hda_codec *codec)
- {
-       struct sigmatel_spec *spec = codec->spec;
-@@ -4577,10 +4625,16 @@ static int patch_stac92hd95(struct hda_c
-       spec->gen.beep_nid = 0x19; /* digital beep */
-       spec->pwr_nids = stac92hd95_pwr_nids;
-       spec->num_pwrs = ARRAY_SIZE(stac92hd95_pwr_nids);
--      spec->default_polarity = -1; /* no default cfg */
-+      spec->default_polarity = 0;
-       codec->patch_ops = stac_patch_ops;
-+      snd_hda_pick_fixup(codec, stac92hd95_models, stac92hd95_fixup_tbl,
-+                         stac92hd95_fixups);
-+      snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE);
-+
-+      stac_setup_gpio(codec);
-+
-       err = stac_parse_auto_config(codec);
-       if (err < 0) {
-               stac_free(codec);
-@@ -4589,6 +4643,8 @@ static int patch_stac92hd95(struct hda_c
-       codec->proc_widget_hook = stac92hd_proc_hook;
-+      snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);
-+
-       return 0;
- }
index abd3fc7085ffb56b60041294c67cdc98fd980a31..b2f451f4116c5c41926e5e39b6c0d9ddc9f7e504 100644 (file)
@@ -56,4 +56,3 @@ tracing-try-again-for-saved-cmdline-if-failed-due-to-locking.patch
 tracing-fix-syscall_-regfunc-vs-copy_process-race.patch
 alsa-usb-audio-fix-races-at-disconnection-and-pcm-closing.patch
 alsa-hda-hdmi-call-overridden-init-on-resume.patch
-alsa-hda-adjust-speaker-hpf-and-add-led-support-for-hp-spectre-13.patch