openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda - Use new inputs[] field to parse input-pins for AD codecs 

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2010-08-30 13:04:44 +02:00
parent d7b1ae9d88
commit 9e042e7132
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sound/pci/hda/patch_analog.c
View File

@ -2880,7 +2880,7 @@ static int ad1988_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin,
/* create input playback/capture controls for the given pin */ /* create input playback/capture controls for the given pin */
static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin, static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin,
const char *ctlname, int boost) const char *ctlname, int ctlidx, int boost)
{ {
char name[32]; char name[32];
int err, idx; int err, idx;
@ -2913,16 +2913,23 @@ static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec,
const struct auto_pin_cfg *cfg) const struct auto_pin_cfg *cfg)
{ {
struct hda_input_mux *imux = &spec->private_imux; struct hda_input_mux *imux = &spec->private_imux;
int i, err; int i, err, type, type_idx = 0;
for (i = 0; i < AUTO_PIN_LAST; i++) { for (i = 0; i < cfg->num_inputs; i++) {
err = new_analog_input(spec, cfg->input_pins[i], type = cfg->inputs[i].type;
auto_pin_cfg_labels[i], if (i > 0 && type != cfg->inputs[i - 1].type)
i <= AUTO_PIN_FRONT_MIC); type_idx++;
else
type_idx = 0;
err = new_analog_input(spec, cfg->inputs[i].pin,
auto_pin_cfg_labels[type], type_idx,
type <= AUTO_PIN_FRONT_MIC);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = auto_pin_cfg_labels[i]; imux->items[imux->num_items].label =
imux->items[imux->num_items].index = ad1988_pin_to_adc_idx(cfg->input_pins[i]); snd_hda_get_input_pin_label(cfg, i);
imux->items[imux->num_items].index =
ad1988_pin_to_adc_idx(cfg->inputs[i].pin);
imux->num_items++; imux->num_items++;
} }
imux->items[imux->num_items].label = "Mix"; imux->items[imux->num_items].label = "Mix";
@ -2994,12 +3001,11 @@ static void ad1988_auto_init_extra_out(struct hda_codec *codec)
static void ad1988_auto_init_analog_input(struct hda_codec *codec) static void ad1988_auto_init_analog_input(struct hda_codec *codec)
{ {
struct ad198x_spec *spec = codec->spec; struct ad198x_spec *spec = codec->spec;
const struct auto_pin_cfg *cfg = &spec->autocfg;
int i, idx; int i, idx;
for (i = 0; i < AUTO_PIN_LAST; i++) { for (i = 0; i < cfg->num_inputs; i++) {
hda_nid_t nid = spec->autocfg.input_pins[i]; hda_nid_t nid = cfg->inputs[i].pin;
if (! nid)
continue;
switch (nid) { switch (nid) {
case 0x15: /* port-C */ case 0x15: /* port-C */
snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0); snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0);