Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09a99959 authored by Matt Ranostay's avatar Matt Ranostay Committed by Jaroslav Kysela
Browse files

[ALSA] hda: Add dynamic mono mixer support for STAC92xx codecs 



Allows for dynamically creating mono out mixer controls and well
as mono mux controls.

Signed-off-by: default avatarMatthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 90da78bf

sound/pci/hda/hda_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ get_alloc_amp_hash(struct hda_codec *codec, u32 key) 
/*

 * query AMP capabilities for the given widget and direction

 */

static u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)

u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction)

{

	struct hda_amp_info *info;

sound/pci/hda/hda_local.h

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ static inline u32 get_wcaps(struct hda_codec *codec, hda_nid_t nid) 
	return codec->wcaps[nid - codec->start_nid];

}



u32 query_amp_caps(struct hda_codec *codec, hda_nid_t nid, int direction);

int snd_hda_override_amp_caps(struct hda_codec *codec, hda_nid_t nid, int dir,

			      unsigned int caps);

sound/pci/hda/patch_sigmatel.c

+51 −10
Original line number Diff line number Diff line
@@ -756,7 +756,6 @@ static struct snd_kcontrol_new stac92hd73xx_10ch_mixer[] = { 


static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = {

	STAC_INPUT_SOURCE(2),

	STAC_MONO_MUX,



	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
@@ -768,15 +767,12 @@ static struct snd_kcontrol_new stac92hd71bxx_analog_mixer[] = { 


	HDA_CODEC_MUTE("Analog Loopback 1", 0x17, 0x3, HDA_INPUT),

	HDA_CODEC_MUTE("Analog Loopback 2", 0x17, 0x4, HDA_INPUT),



	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x14, 0x1, 0, HDA_INPUT),

	{ } /* end */

};



static struct snd_kcontrol_new stac92hd71bxx_mixer[] = {

	STAC_INPUT_SOURCE(2),

	STAC_ANALOG_LOOPBACK(0xFA0, 0x7A0, 2),

	STAC_MONO_MUX,



	HDA_CODEC_VOLUME_IDX("Capture Volume", 0x0, 0x1c, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE_IDX("Capture Switch", 0x0, 0x1c, 0x0, HDA_OUTPUT),
@@ -785,8 +781,6 @@ static struct snd_kcontrol_new stac92hd71bxx_mixer[] = { 
	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),



	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x14, 0x1, 0, HDA_INPUT),

	{ } /* end */

};
@@ -1157,7 +1151,7 @@ static struct snd_pci_quirk stac9200_cfg_tbl[] = { 


static unsigned int ref925x_pin_configs[8] = {

	0x40c003f0, 0x424503f2, 0x01813022, 0x02a19021,

	0x90a70320, 0x02214210, 0x400003f1, 0x9033032e,

	0x90a70320, 0x02214210, 0x01019020, 0x9033032e,

};



static unsigned int stac925x_MA6_pin_configs[8] = {
@@ -1561,7 +1555,7 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = { 


static unsigned int ref9205_pin_configs[12] = {

	0x40000100, 0x40000100, 0x01016011, 0x01014010,

	0x01813122, 0x01a19021, 0x40000100, 0x40000100,

	0x01813122, 0x01a19021, 0x01019020, 0x40000100,

	0x90a000f0, 0x90a000f0, 0x01441030, 0x01c41030

};
@@ -2018,6 +2012,7 @@ static int stac92xx_clfe_switch_put(struct snd_kcontrol *kcontrol, 
enum {

	STAC_CTL_WIDGET_VOL,

	STAC_CTL_WIDGET_MUTE,

	STAC_CTL_WIDGET_MONO_MUX,

	STAC_CTL_WIDGET_IO_SWITCH,

	STAC_CTL_WIDGET_CLFE_SWITCH

};
@@ -2025,6 +2020,7 @@ enum { 
static struct snd_kcontrol_new stac92xx_control_templates[] = {

	HDA_CODEC_VOLUME(NULL, 0, 0, 0),

	HDA_CODEC_MUTE(NULL, 0, 0, 0),

	STAC_MONO_MUX,

	STAC_CODEC_IO_SWITCH(NULL, 0),

	STAC_CODEC_CLFE_SWITCH(NULL, 0),

};
@@ -2388,7 +2384,9 @@ static int stac92xx_auto_create_mono_output_ctls(struct hda_codec *codec) 
		mono_mux->items[mono_mux->num_items].index = i;

		mono_mux->num_items++;

	}

	return 0;



	return stac92xx_add_control(spec, STAC_CTL_WIDGET_MONO_MUX,

				"Mono Mux", spec->mono_nid);

}



/* labels for dmic mux inputs */
@@ -2570,6 +2568,50 @@ static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out 
		spec->autocfg.line_outs = spec->autocfg.hp_outs;

		hp_speaker_swap = 1;

	}

	if (spec->autocfg.mono_out_pin) {

		int dir = (get_wcaps(codec, spec->autocfg.mono_out_pin)

				& AC_WCAP_OUT_AMP) ? HDA_OUTPUT : HDA_INPUT;

		u32 caps = query_amp_caps(codec,

				spec->autocfg.mono_out_pin, dir);

		hda_nid_t conn_list[1];



		/* get the mixer node and then the mono mux if it exists */

		if (snd_hda_get_connections(codec,

				spec->autocfg.mono_out_pin, conn_list, 1) &&

				snd_hda_get_connections(codec, conn_list[0],

				conn_list, 1)) {



				int wcaps = get_wcaps(codec, conn_list[0]);

				int wid_type = (wcaps & AC_WCAP_TYPE)

					>> AC_WCAP_TYPE_SHIFT;

				/* LR swap check, some stac925x have a mux that

 				 * changes the DACs output path instead of the

 				 * mono-mux path.

 				 */

				if (wid_type == AC_WID_AUD_SEL &&

						!(wcaps & AC_WCAP_LR_SWAP))

					spec->mono_nid = conn_list[0];

		}

		/* all mono outs have a least a mute/unmute switch */

		err = stac92xx_add_control(spec, STAC_CTL_WIDGET_MUTE,

			"Mono Playback Switch",

			HDA_COMPOSE_AMP_VAL(spec->autocfg.mono_out_pin,

					1, 0, dir));

		if (err < 0)

			return err;

		/* check to see if there is volume support for the amp */

		if ((caps & AC_AMPCAP_NUM_STEPS) >> AC_AMPCAP_NUM_STEPS_SHIFT) {

			err = stac92xx_add_control(spec, STAC_CTL_WIDGET_VOL,

				"Mono Playback Volume",

				HDA_COMPOSE_AMP_VAL(spec->autocfg.mono_out_pin,

					1, 0, dir));

			if (err < 0)

				return err;

		}



		stac92xx_auto_set_pinctl(codec, spec->autocfg.mono_out_pin,

					 AC_PINCTL_OUT_EN);

	}



	if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)

		return err;
@@ -3317,7 +3359,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) 


	spec->gpio_mask = spec->gpio_data = 0x00000001; /* GPIO0 High = EAPD */



	spec->mono_nid = 0x15;

	spec->mux_nids = stac92hd71bxx_mux_nids;

	spec->adc_nids = stac92hd71bxx_adc_nids;

	spec->dmic_nids = stac92hd71bxx_dmic_nids;