Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Add spec->vmaster_mute_enum flag to generic parser

Browse Source 
Add a flag to indicate whether the vmaster mute hook enum is exposed
or not.  Conexant codecs may want not to expose the control depending
on the model.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-20 14:57:18 +01:00
parent 406b285da3
commit fd25a97a97
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/pci/hda/hda_generic.c
View File

@ -2966,7 +2966,8 @@ int snd_hda_gen_build_controls(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
if (spec->vmaster_mute.hook) if (spec->vmaster_mute.hook)
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute, true); snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,
spec->vmaster_mute_enum);
} }
free_kctls(spec); /* no longer needed */ free_kctls(spec); /* no longer needed */

1
sound/pci/hda/hda_generic.h
View File

@ -151,6 +151,7 @@ struct hda_gen_spec {
unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */ unsigned int multi_cap_vol:1; /* allow multiple capture xxx volumes */
unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */ unsigned int inv_dmic_split:1; /* inverted dmic w/a for conexant */
unsigned int own_eapd_ctl:1; /* set EAPD by own function */ unsigned int own_eapd_ctl:1; /* set EAPD by own function */
unsigned int vmaster_mute_enum:1; /* add vmaster mute mode enum */
/* for virtual master */ /* for virtual master */
hda_nid_t vmaster_nid; hda_nid_t vmaster_nid;

8
sound/pci/hda/patch_realtek.c
View File

@ -2678,8 +2678,10 @@ static void alc269_fixup_mic1_mute(struct hda_codec *codec,
const struct alc_fixup *fix, int action) const struct alc_fixup *fix, int action)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (action == ALC_FIXUP_ACT_PROBE) if (action == ALC_FIXUP_ACT_PROBE) {
spec->gen.vmaster_mute.hook = alc269_fixup_mic1_mute_hook; spec->gen.vmaster_mute.hook = alc269_fixup_mic1_mute_hook;
spec->gen.vmaster_mute_enum = 1;
}
} }
/* update mute-LED according to the speaker mute state via mic2 VREF pin */ /* update mute-LED according to the speaker mute state via mic2 VREF pin */
@ -2694,8 +2696,10 @@ static void alc269_fixup_mic2_mute(struct hda_codec *codec,
const struct alc_fixup *fix, int action) const struct alc_fixup *fix, int action)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
if (action == ALC_FIXUP_ACT_PROBE) if (action == ALC_FIXUP_ACT_PROBE) {
spec->gen.vmaster_mute.hook = alc269_fixup_mic2_mute_hook; spec->gen.vmaster_mute.hook = alc269_fixup_mic2_mute_hook;
spec->gen.vmaster_mute_enum = 1;
}
} }
static void alc271_hp_gate_mic_jack(struct hda_codec *codec, static void alc271_hp_gate_mic_jack(struct hda_codec *codec,