diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-06-17 09:16:16 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-06-17 09:16:16 (GMT) |
| commit | a8b083a24b987eaf79f2de12a86648001f0f4865 (patch) | |
| tree | bb049f802d5032503a417c11ed8fc4a8edc37abe | |
| parent | da177dd0259eb74061a3a1f6ab037f5080c2a504 (diff) | |
| parent | e32aa85ab49203104019025eba83f03f88a3a0e3 (diff) | |
| download | linux-a8b083a24b987eaf79f2de12a86648001f0f4865.tar.xz | |
Merge branch 'for-linus' into for-next
* for-linus:
ALSA: hda - Add models for Dell headset jacks
| -rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 3 | ||||
| -rw-r--r-- | sound/pci/hda/patch_realtek.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index bb8b0dc..77d68e2 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt @@ -29,6 +29,8 @@ ALC269/270/275/276/280/282 alc271-dmic Enable ALC271X digital mic workaround inv-dmic Inverted internal mic workaround lenovo-dock Enables docking station I/O for some Lenovos + dell-headset-multi Headset jack, which can also be used as mic-in + dell-headset-dock Headset jack (without mic-in), and also dock I/O ALC662/663/272 ============== @@ -42,6 +44,7 @@ ALC662/663/272 asus-mode7 ASUS asus-mode8 ASUS inv-dmic Inverted internal mic workaround + dell-headset-multi Headset jack, which can also be used as mic-in ALC680 ====== diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f5b1e51..ad087ea 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3610,6 +3610,8 @@ static const struct hda_model_fixup alc269_fixup_models[] = { {.id = ALC269_FIXUP_INV_DMIC, .name = "inv-dmic"}, {.id = ALC269_FIXUP_LENOVO_DOCK, .name = "lenovo-dock"}, {.id = ALC269_FIXUP_HP_GPIO_LED, .name = "hp-gpio-led"}, + {.id = ALC269_FIXUP_DELL1_MIC_NO_PRESENCE, .name = "dell-headset-multi"}, + {.id = ALC269_FIXUP_DELL2_MIC_NO_PRESENCE, .name = "dell-headset-dock"}, {} }; @@ -4289,6 +4291,7 @@ static const struct hda_model_fixup alc662_fixup_models[] = { {.id = ALC662_FIXUP_ASUS_MODE7, .name = "asus-mode7"}, {.id = ALC662_FIXUP_ASUS_MODE8, .name = "asus-mode8"}, {.id = ALC662_FIXUP_INV_DMIC, .name = "inv-dmic"}, + {.id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE, .name = "dell-headset-multi"}, {} }; |