diff options
author | Vladimir Avdonin <vldmrrr@yahoo.com> | 2006-08-22 07:31:58 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:43:38 -0400 |
commit | bab282b912baf372d8f705357946ef691b621899 (patch) | |
tree | 104f1fb366f89dfe82670dc98b681da1b28bda32 | |
parent | a1c7a7d890634eaec106e5fb3a7d9c92b8f85b0d (diff) |
[ALSA] hda-codec - Fix for Acer laptops with ALC883 codec
Patch enables the internal speaker on acer laptops with ALC883.
Signed-off-by: Vladimir Avdonin <vldmrrr@yahoo.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index d7e95f144569..504ebbceafbc 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -820,6 +820,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
820 | 3stack-6ch 3-jack 6-channel | 820 | 3stack-6ch 3-jack 6-channel |
821 | 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O | 821 | 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O |
822 | 6stack-dig-demo 6-jack digital for Intel demo board | 822 | 6stack-dig-demo 6-jack digital for Intel demo board |
823 | acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) | ||
823 | auto auto-config reading BIOS (default) | 824 | auto auto-config reading BIOS (default) |
824 | 825 | ||
825 | ALC861/660 | 826 | ALC861/660 |
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 53aa57f5a1a1..65903812b307 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -111,6 +111,7 @@ enum { | |||
111 | ALC883_3ST_6ch, | 111 | ALC883_3ST_6ch, |
112 | ALC883_6ST_DIG, | 112 | ALC883_6ST_DIG, |
113 | ALC888_DEMO_BOARD, | 113 | ALC888_DEMO_BOARD, |
114 | ALC883_ACER, | ||
114 | ALC883_AUTO, | 115 | ALC883_AUTO, |
115 | ALC883_MODEL_LAST, | 116 | ALC883_MODEL_LAST, |
116 | }; | 117 | }; |
@@ -5069,6 +5070,9 @@ static struct hda_board_config alc883_cfg_tbl[] = { | |||
5069 | { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, | 5070 | { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, |
5070 | .config = ALC883_6ST_DIG }, /* Foxconn */ | 5071 | .config = ALC883_6ST_DIG }, /* Foxconn */ |
5071 | { .modelname = "6stack-dig-demo", .config = ALC888_DEMO_BOARD }, | 5072 | { .modelname = "6stack-dig-demo", .config = ALC888_DEMO_BOARD }, |
5073 | { .modelname = "acer", .config = ALC883_ACER }, | ||
5074 | { .pci_subvendor = 0x1025, .pci_subdevice = 0/*0x0102*/, | ||
5075 | .config = ALC883_ACER }, | ||
5072 | { .modelname = "auto", .config = ALC883_AUTO }, | 5076 | { .modelname = "auto", .config = ALC883_AUTO }, |
5073 | {} | 5077 | {} |
5074 | }; | 5078 | }; |
@@ -5139,6 +5143,23 @@ static struct alc_config_preset alc883_presets[] = { | |||
5139 | .channel_mode = alc883_sixstack_modes, | 5143 | .channel_mode = alc883_sixstack_modes, |
5140 | .input_mux = &alc883_capture_source, | 5144 | .input_mux = &alc883_capture_source, |
5141 | }, | 5145 | }, |
5146 | [ALC883_ACER] = { | ||
5147 | .mixers = { alc883_base_mixer, | ||
5148 | alc883_chmode_mixer }, | ||
5149 | /* On TravelMate laptops, GPIO 0 enables the internal speaker | ||
5150 | * and the headphone jack. Turn this on and rely on the | ||
5151 | * standard mute methods whenever the user wants to turn | ||
5152 | * these outputs off. | ||
5153 | */ | ||
5154 | .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs }, | ||
5155 | .num_dacs = ARRAY_SIZE(alc883_dac_nids), | ||
5156 | .dac_nids = alc883_dac_nids, | ||
5157 | .num_adc_nids = ARRAY_SIZE(alc883_adc_nids), | ||
5158 | .adc_nids = alc883_adc_nids, | ||
5159 | .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), | ||
5160 | .channel_mode = alc883_3ST_2ch_modes, | ||
5161 | .input_mux = &alc883_capture_source, | ||
5162 | }, | ||
5142 | }; | 5163 | }; |
5143 | 5164 | ||
5144 | 5165 | ||