hda: dynamically create capture mux controls
Dynamically create capture mux volume controls when a output amp is detected.
---
Signed-off-by Matthew Ranostay <[email protected]>
pci/hda/patch_sigmatel.c +36 -16
@@ -794,7 +794,6 @@ static struct snd_kcontrol_new stac9200_mixer[] = {STAC_INPUT_SOURCE (1 ),HDA_CODEC_VOLUME ("Capture Volume" ,0x0a ,0 ,HDA_OUTPUT ), HDA_CODEC_MUTE("Capture Switch", 0x0a, 0, HDA_OUTPUT), - HDA_CODEC_VOLUME("Capture Mux Volume", 0x0c, 0, HDA_OUTPUT), { } /* end */ };
@@ -908,12 +907,9 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x0 ,0x1a ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x1 ,0x1b ,0x0 ,HDA_OUTPUT ), -/* analog pc-beep replaced with digital beep support */ /* HDA_CODEC_VOLUME("PC Beep Volume", 0x17, 0x2, HDA_INPUT),
@@ -931,11 +927,9 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x1c ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Capture Mux Volume" ,0x0 ,0x1a ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x1d ,0x0 ,HDA_OUTPUT ), HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1d, 0x0, HDA_OUTPUT), - HDA_CODEC_VOLUME_IDX("Capture Mux Volume", 0x1, 0x1b, 0x0, HDA_OUTPUT), { } /* end */ };
@@ -943,7 +937,6 @@ static struct snd_kcontrol_new stac925x_mixer[] = {STAC_INPUT_SOURCE (1 ),HDA_CODEC_VOLUME ("Capture Volume" ,0x09 ,0 ,HDA_OUTPUT ), HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT), - HDA_CODEC_VOLUME("Capture Mux Volume", 0x0f, 0, HDA_OUTPUT), { } /* end */ };
@@ -953,12 +946,9 @@ static struct snd_kcontrol_new stac9205_mixer[] = {HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x1b ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x1d ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Mux Capture Volume" ,0x0 ,0x19 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x1c ,0x0 ,HDA_INPUT ), HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x1e, 0x0, HDA_OUTPUT), - HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x1A, 0x0, HDA_OUTPUT), - { } /* end */ };
@@ -967,11 +957,9 @@ static struct snd_kcontrol_new stac922x_mixer[] = {STAC_INPUT_SOURCE (2 ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x17 ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x17 ,0x0 ,HDA_INPUT ), -HDA_CODEC_VOLUME_IDX ("Mux Capture Volume" ,0x0 ,0x12 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x18 ,0x0 ,HDA_INPUT ), HDA_CODEC_MUTE_IDX("Capture Switch", 0x1, 0x18, 0x0, HDA_INPUT), - HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x1, 0x13, 0x0, HDA_OUTPUT), { } /* end */ };
@@ -982,15 +970,12 @@ static struct snd_kcontrol_new stac927x_mixer[] = {HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x0 ,0x18 ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x0 ,0x1b ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Mux Capture Volume" ,0x0 ,0x15 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x1 ,0x19 ,0x0 ,HDA_INPUT ),HDA_CODEC_MUTE_IDX ("Capture Switch" ,0x1 ,0x1c ,0x0 ,HDA_OUTPUT ), -HDA_CODEC_VOLUME_IDX ("Mux Capture Volume" ,0x1 ,0x16 ,0x0 ,HDA_OUTPUT ),HDA_CODEC_VOLUME_IDX ("Capture Volume" ,0x2 ,0x1A ,0x0 ,HDA_INPUT ), HDA_CODEC_MUTE_IDX("Capture Switch", 0x2, 0x1d, 0x0, HDA_OUTPUT), - HDA_CODEC_VOLUME_IDX("Mux Capture Volume", 0x2, 0x17, 0x0, HDA_OUTPUT), { } /* end */ };
@@ -2351,7 +2336,8 @@ static struct snd_kcontrol_new stac92xx_control_templates[] = { };/* add dynamic controls */ -static int stac92xx_add_control (struct sigmatel_spec *spec,int type,const char *name,unsigned long val) +static int stac92xx_add_control_idx (struct sigmatel_spec *spec,int type, +int idx,const char *name,unsigned long val) {struct snd_kcontrol_new *knew;
@@ -2371,6 +2357,7 @@ static int stac92xx_add_control(struct sigmatel_spec *spec, int type, const char knew = &spec->kctl_alloc[spec->num_kctl_used]; *knew = stac92xx_control_templates[type]; + knew->index = idx; knew->name =kstrdup (name,GFP_KERNEL );if (! knew->name)return -ENOMEM ;
@@ -2379,6 +2366,14 @@ static int stac92xx_add_control(struct sigmatel_spec *spec, int type, const charreturn 0 ; } + +/* add dynamic controls */ +static int stac92xx_add_control (struct sigmatel_spec *spec,int type, +const char *name,unsigned long val) +{ +return stac92xx_add_control_idx (spec, type,0 , name, val); +} +/* flag inputs as additional dynamic lineouts */ static int stac92xx_add_dyn_out_pins (struct hda_codec *codec,struct auto_pin_cfg *cfg) {
@@ -2780,6 +2775,26 @@ static int stac92xx_auto_create_beep_ctls(struct hda_codec *codec,return 0 ; } +static int stac92xx_auto_create_mux_input_ctls (struct hda_codec *codec) +{ +struct sigmatel_spec *spec = codec->spec; +int wcaps, nid, i, err =0 ; + +for (i =0 ; i < spec->num_muxes; i++) { + nid = spec->mux_nids[i]; + wcaps =get_wcaps (codec, nid); + +if (wcaps &AC_WCAP_OUT_AMP ) { + err =stac92xx_add_control_idx (spec, +STAC_CTL_WIDGET_VOL , i,"Mux Capture Volume" , +HDA_COMPOSE_AMP_VAL (nid,3 ,0 ,HDA_OUTPUT )); +if (err <0 ) +return err; + } + } +return 0 ; +}; +/* labels for dmic mux inputs */ static const char *stac92xx_dmic_labels[5 ] = {"Analog Inputs" ,"Digital Mic 1" ,"Digital Mic 2" ,
@@ -3078,6 +3093,11 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_outif ((err =stac92xx_auto_create_dmic_input_ctls (codec, &spec->autocfg)) <0 )return err; +if (spec->num_muxes >0 ) { + err =stac92xx_auto_create_mux_input_ctls (codec); +if (err <0 ) +return err; + } spec->multiout.max_channels = spec->multiout.num_dacs *2 ;if (spec->multiout.max_channels >2 )
Takashi Iwai
AppliedAt Thu, 14 Aug 2008 15:05:43 -0400,
Quoted 5 lines · Matthew Ranostay
Dynamically create capture mux volume controls when a output amp is detected.
---
Signed-off-by Matthew Ranostay <[email protected]>
Applied this one, too. Thanks.
Takashi