diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-23 02:25:25 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-23 02:37:31 -0500 |
commit | 829e87e04cb5052f5748aba2788eee13ea7c2773 (patch) | |
tree | 541e17791fdfbc72386d88b2323f58b17ff84242 /sound/pci/hda/patch_cirrus.c | |
parent | 2ba509a6baac097cc8ae4f9741a09ba7c1c0d916 (diff) |
ALSA: hda - Move static ADC setup for CS4206 to init verbs
It's constant, so better to be put in the static init array.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index ed981723cdd5..3fb02ecd82a5 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c | |||
@@ -1089,9 +1089,6 @@ static void init_input(struct hda_codec *codec) | |||
1089 | if (spec->mic_detect) | 1089 | if (spec->mic_detect) |
1090 | cs_automic(codec, NULL); | 1090 | cs_automic(codec, NULL); |
1091 | 1091 | ||
1092 | coef = 0x000a; /* ADC1/2 - Digital and Analog Soft Ramp */ | ||
1093 | cs_vendor_coef_set(codec, IDX_ADC_CFG, coef); | ||
1094 | |||
1095 | coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG); | 1092 | coef = cs_vendor_coef_get(codec, IDX_BEEP_CFG); |
1096 | if (is_active_pin(codec, CS_DMIC2_PIN_NID)) | 1093 | if (is_active_pin(codec, CS_DMIC2_PIN_NID)) |
1097 | coef |= 1 << 4; /* DMIC2 2 chan on, GPIO1 off */ | 1094 | coef |= 1 << 4; /* DMIC2 2 chan on, GPIO1 off */ |
@@ -1121,6 +1118,9 @@ static const struct hda_verb cs_coef_init_verbs[] = { | |||
1121 | | 0x1000 /* Enable DACs High Pass Filter */ | 1118 | | 0x1000 /* Enable DACs High Pass Filter */ |
1122 | | 0x0400 /* Disable Coefficient Auto increment */ | 1119 | | 0x0400 /* Disable Coefficient Auto increment */ |
1123 | )}, | 1120 | )}, |
1121 | /* ADC1/2 - Digital and Analog Soft Ramp */ | ||
1122 | {0x11, AC_VERB_SET_COEF_INDEX, IDX_ADC_CFG}, | ||
1123 | {0x11, AC_VERB_SET_PROC_COEF, 0x000a}, | ||
1124 | /* Beep */ | 1124 | /* Beep */ |
1125 | {0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG}, | 1125 | {0x11, AC_VERB_SET_COEF_INDEX, IDX_BEEP_CFG}, |
1126 | {0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */ | 1126 | {0x11, AC_VERB_SET_PROC_COEF, 0x0007}, /* Enable Beep thru DAC1/2/3 */ |