diff options
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 | ||||
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index a57cd5438b75..394d7d378dc7 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1077,6 +1077,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1077 | 1077 | ||
| 1078 | STAC92HD73* | 1078 | STAC92HD73* |
| 1079 | ref Reference board | 1079 | ref Reference board |
| 1080 | no-jd BIOS setup but without jack-detection | ||
| 1080 | dell-m6-amic Dell desktops/laptops with analog mics | 1081 | dell-m6-amic Dell desktops/laptops with analog mics |
| 1081 | dell-m6-dmic Dell desktops/laptops with digital mics | 1082 | dell-m6-dmic Dell desktops/laptops with digital mics |
| 1082 | dell-m6 Dell desktops/laptops with both type of mics | 1083 | dell-m6 Dell desktops/laptops with both type of mics |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 5fcaae676e2a..d7c622f944f6 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -69,6 +69,7 @@ enum { | |||
| 69 | }; | 69 | }; |
| 70 | 70 | ||
| 71 | enum { | 71 | enum { |
| 72 | STAC_92HD73XX_NO_JD, /* no jack-detection */ | ||
| 72 | STAC_92HD73XX_REF, | 73 | STAC_92HD73XX_REF, |
| 73 | STAC_DELL_M6_AMIC, | 74 | STAC_DELL_M6_AMIC, |
| 74 | STAC_DELL_M6_DMIC, | 75 | STAC_DELL_M6_DMIC, |
| @@ -1612,6 +1613,7 @@ static unsigned int *stac92hd73xx_brd_tbl[STAC_92HD73XX_MODELS] = { | |||
| 1612 | }; | 1613 | }; |
| 1613 | 1614 | ||
| 1614 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { | 1615 | static const char *stac92hd73xx_models[STAC_92HD73XX_MODELS] = { |
| 1616 | [STAC_92HD73XX_NO_JD] = "no-jd", | ||
| 1615 | [STAC_92HD73XX_REF] = "ref", | 1617 | [STAC_92HD73XX_REF] = "ref", |
| 1616 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", | 1618 | [STAC_DELL_M6_AMIC] = "dell-m6-amic", |
| 1617 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", | 1619 | [STAC_DELL_M6_DMIC] = "dell-m6-dmic", |
| @@ -4359,6 +4361,9 @@ again: | |||
| 4359 | return err; | 4361 | return err; |
| 4360 | } | 4362 | } |
| 4361 | 4363 | ||
| 4364 | if (spec->board_config == STAC_92HD73XX_NO_JD) | ||
| 4365 | spec->hp_detect = 0; | ||
| 4366 | |||
| 4362 | codec->patch_ops = stac92xx_patch_ops; | 4367 | codec->patch_ops = stac92xx_patch_ops; |
| 4363 | 4368 | ||
| 4364 | return 0; | 4369 | return 0; |
