diff options
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index a9b26828a651..66c0876bf734 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -158,6 +158,7 @@ enum { | |||
158 | STAC_D965_5ST_NO_FP, | 158 | STAC_D965_5ST_NO_FP, |
159 | STAC_DELL_3ST, | 159 | STAC_DELL_3ST, |
160 | STAC_DELL_BIOS, | 160 | STAC_DELL_BIOS, |
161 | STAC_927X_VOLKNOB, | ||
161 | STAC_927X_MODELS | 162 | STAC_927X_MODELS |
162 | }; | 163 | }; |
163 | 164 | ||
@@ -907,6 +908,16 @@ static struct hda_verb d965_core_init[] = { | |||
907 | {} | 908 | {} |
908 | }; | 909 | }; |
909 | 910 | ||
911 | static struct hda_verb dell_3st_core_init[] = { | ||
912 | /* don't set delta bit */ | ||
913 | {0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f}, | ||
914 | /* unmute node 0x1b */ | ||
915 | {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000}, | ||
916 | /* select node 0x03 as DAC */ | ||
917 | {0x0b, AC_VERB_SET_CONNECT_SEL, 0x01}, | ||
918 | {} | ||
919 | }; | ||
920 | |||
910 | static struct hda_verb stac927x_core_init[] = { | 921 | static struct hda_verb stac927x_core_init[] = { |
911 | /* set master volume and direct control */ | 922 | /* set master volume and direct control */ |
912 | { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 923 | { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, |
@@ -915,6 +926,14 @@ static struct hda_verb stac927x_core_init[] = { | |||
915 | {} | 926 | {} |
916 | }; | 927 | }; |
917 | 928 | ||
929 | static struct hda_verb stac927x_volknob_core_init[] = { | ||
930 | /* don't set delta bit */ | ||
931 | {0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0x7f}, | ||
932 | /* enable analog pc beep path */ | ||
933 | {0x01, AC_VERB_SET_DIGI_CONVERT_2, 1 << 5}, | ||
934 | {} | ||
935 | }; | ||
936 | |||
918 | static struct hda_verb stac9205_core_init[] = { | 937 | static struct hda_verb stac9205_core_init[] = { |
919 | /* set master volume and direct control */ | 938 | /* set master volume and direct control */ |
920 | { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, | 939 | { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff}, |
@@ -1999,6 +2018,7 @@ static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { | |||
1999 | [STAC_D965_5ST_NO_FP] = d965_5st_no_fp_pin_configs, | 2018 | [STAC_D965_5ST_NO_FP] = d965_5st_no_fp_pin_configs, |
2000 | [STAC_DELL_3ST] = dell_3st_pin_configs, | 2019 | [STAC_DELL_3ST] = dell_3st_pin_configs, |
2001 | [STAC_DELL_BIOS] = NULL, | 2020 | [STAC_DELL_BIOS] = NULL, |
2021 | [STAC_927X_VOLKNOB] = NULL, | ||
2002 | }; | 2022 | }; |
2003 | 2023 | ||
2004 | static const char *stac927x_models[STAC_927X_MODELS] = { | 2024 | static const char *stac927x_models[STAC_927X_MODELS] = { |
@@ -2010,6 +2030,7 @@ static const char *stac927x_models[STAC_927X_MODELS] = { | |||
2010 | [STAC_D965_5ST_NO_FP] = "5stack-no-fp", | 2030 | [STAC_D965_5ST_NO_FP] = "5stack-no-fp", |
2011 | [STAC_DELL_3ST] = "dell-3stack", | 2031 | [STAC_DELL_3ST] = "dell-3stack", |
2012 | [STAC_DELL_BIOS] = "dell-bios", | 2032 | [STAC_DELL_BIOS] = "dell-bios", |
2033 | [STAC_927X_VOLKNOB] = "volknob", | ||
2013 | }; | 2034 | }; |
2014 | 2035 | ||
2015 | static struct snd_pci_quirk stac927x_cfg_tbl[] = { | 2036 | static struct snd_pci_quirk stac927x_cfg_tbl[] = { |
@@ -2045,6 +2066,8 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = { | |||
2045 | "Intel D965", STAC_D965_5ST), | 2066 | "Intel D965", STAC_D965_5ST), |
2046 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500, | 2067 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_INTEL, 0xff00, 0x2500, |
2047 | "Intel D965", STAC_D965_5ST), | 2068 | "Intel D965", STAC_D965_5ST), |
2069 | /* volume-knob fixes */ | ||
2070 | SND_PCI_QUIRK_VENDOR(0x10cf, "FSC", STAC_927X_VOLKNOB), | ||
2048 | {} /* terminator */ | 2071 | {} /* terminator */ |
2049 | }; | 2072 | }; |
2050 | 2073 | ||
@@ -5612,10 +5635,14 @@ static int patch_stac927x(struct hda_codec *codec) | |||
5612 | spec->dmic_nids = stac927x_dmic_nids; | 5635 | spec->dmic_nids = stac927x_dmic_nids; |
5613 | spec->num_dmics = STAC927X_NUM_DMICS; | 5636 | spec->num_dmics = STAC927X_NUM_DMICS; |
5614 | 5637 | ||
5615 | spec->init = d965_core_init; | 5638 | spec->init = dell_3st_core_init; |
5616 | spec->dmux_nids = stac927x_dmux_nids; | 5639 | spec->dmux_nids = stac927x_dmux_nids; |
5617 | spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids); | 5640 | spec->num_dmuxes = ARRAY_SIZE(stac927x_dmux_nids); |
5618 | break; | 5641 | break; |
5642 | case STAC_927X_VOLKNOB: | ||
5643 | spec->num_dmics = 0; | ||
5644 | spec->init = stac927x_volknob_core_init; | ||
5645 | break; | ||
5619 | default: | 5646 | default: |
5620 | spec->num_dmics = 0; | 5647 | spec->num_dmics = 0; |
5621 | spec->init = stac927x_core_init; | 5648 | spec->init = stac927x_core_init; |