summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-11-22 11:52:52 +0100
committerJaroslav Kysela <perex@suse.cz>2007-02-09 09:01:43 +0100
commit56bb0cab1c1698544e61409e3727f2b6bc205501 (patch)
treebb590ff7ea372f8d1e2214b50af7ac1a2f69d530
parent9fb62c9f23d437241051e27a11de568361a4745d (diff)
downloadop-kernel-dev-56bb0cab1c1698544e61409e3727f2b6bc205501.zip
op-kernel-dev-56bb0cab1c1698544e61409e3727f2b6bc205501.tar.gz
[ALSA] hda-codec - Add asus-laptop model for ALC861 (ALC660)
Added a new model 'asus-laptop' for ASUS F2*/F3* laptops with ALC861 (equivalent with ALC660) codec chip. Also fixed the model for PCI SSID 1043:1338. Corresponding to ALSA bug#2480. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt1
-rw-r--r--sound/pci/hda/patch_realtek.c40
2 files changed, 37 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index d853a30..15d102a 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -839,6 +839,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
uniwill-m31 Uniwill M31 laptop
toshiba Toshiba laptop support
asus Asus laptop support
+ asus-laptop ASUS F2/F3 laptops
auto auto-config reading BIOS (default)
CMI9880
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index aeb408c..60f1994 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -101,6 +101,7 @@ enum {
ALC861_UNIWILL_M31,
ALC861_TOSHIBA,
ALC861_ASUS,
+ ALC861_ASUS_LAPTOP,
ALC861_AUTO,
ALC861_MODEL_LAST,
};
@@ -6901,9 +6902,17 @@ static struct snd_kcontrol_new alc861_asus_mixer[] = {
.private_value = ARRAY_SIZE(alc861_asus_modes),
},
{ }
-};
+};
+
+/* additional mixer */
+static snd_kcontrol_new_t alc861_asus_laptop_mixer[] = {
+ HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_INPUT),
+ HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_INPUT),
+ HDA_CODEC_VOLUME("PC Beep Playback Volume", 0x23, 0x0, HDA_OUTPUT),
+ HDA_CODEC_MUTE("PC Beep Playback Switch", 0x23, 0x0, HDA_OUTPUT),
+ { }
+};
-
/*
* generic initialization of ADC, input mixers and output mixers
*/
@@ -7153,6 +7162,12 @@ static struct hda_verb alc861_asus_init_verbs[] = {
{ }
};
+/* additional init verbs for ASUS laptops */
+static struct hda_verb alc861_asus_laptop_init_verbs[] = {
+ { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x45 }, /* HP-out */
+ { 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2) }, /* mute line-in */
+ { }
+};
/*
* generic initialization of ADC, input mixers and output mixers
@@ -7530,8 +7545,11 @@ static struct hda_board_config alc861_cfg_tbl[] = {
{ .modelname = "asus", .config = ALC861_ASUS},
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1393,
.config = ALC861_ASUS },
+ { .modelname = "asus-laptop", .config = ALC861_ASUS_LAPTOP },
+ { .pci_subvendor = 0x1043, .pci_subdevice = 0x1335,
+ .config = ALC861_ASUS_LAPTOP }, /* ASUS F2/F3 */
{ .pci_subvendor = 0x1043, .pci_subdevice = 0x1338,
- .config = ALC861_ASUS },
+ .config = ALC861_ASUS_LAPTOP }, /* ASUS F2/F3 */
{ .modelname = "auto", .config = ALC861_AUTO },
{}
};
@@ -7626,7 +7644,21 @@ static struct alc_config_preset alc861_presets[] = {
.adc_nids = alc861_adc_nids,
.input_mux = &alc861_capture_source,
},
-};
+ [ALC861_ASUS_LAPTOP] = {
+ .mixers = { alc861_toshiba_mixer, alc861_asus_laptop_mixer },
+ .init_verbs = { alc861_asus_init_verbs,
+ alc861_asus_laptop_init_verbs },
+ .num_dacs = ARRAY_SIZE(alc861_dac_nids),
+ .dac_nids = alc861_dac_nids,
+ .dig_out_nid = ALC861_DIGOUT_NID,
+ .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
+ .channel_mode = alc883_3ST_2ch_modes,
+ .need_dac_fix = 1,
+ .num_adc_nids = ARRAY_SIZE(alc861_adc_nids),
+ .adc_nids = alc861_adc_nids,
+ .input_mux = &alc861_capture_source,
+ },
+};
static int patch_alc861(struct hda_codec *codec)
OpenPOWER on IntegriCloud