diff options
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 4926 | 
1 files changed, 655 insertions, 4271 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index f7ff3f7ccb8..06275f8807a 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -20,461 +20,80 @@   */  #include <linux/init.h> -#include <linux/delay.h>  #include <linux/slab.h> -#include <linux/pci.h> +#include <linux/module.h>  #include <sound/core.h>  #include "hda_codec.h"  #include "hda_local.h" +#include "hda_auto_parser.h"  #include "hda_beep.h" +#include "hda_jack.h" +#include "hda_generic.h" -struct ad198x_spec { -	struct snd_kcontrol_new *mixers[5]; -	int num_mixers; -	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */ -	const struct hda_verb *init_verbs[5];	/* initialization verbs -						 * don't forget NULL termination! -						 */ -	unsigned int num_init_verbs; - -	/* playback */ -	struct hda_multi_out multiout;	/* playback set-up -					 * max_channels, dacs must be set -					 * dig_out_nid and hp_nid are optional -					 */ -	unsigned int cur_eapd; -	unsigned int need_dac_fix; - -	/* capture */ -	unsigned int num_adc_nids; -	hda_nid_t *adc_nids; -	hda_nid_t dig_in_nid;		/* digital-in NID; optional */ - -	/* capture source */ -	const struct hda_input_mux *input_mux; -	hda_nid_t *capsrc_nids; -	unsigned int cur_mux[3]; - -	/* channel model */ -	const struct hda_channel_mode *channel_mode; -	int num_channel_mode; - -	/* PCM information */ -	struct hda_pcm pcm_rec[3];	/* used in alc_build_pcms() */ - -	unsigned int spdif_route; - -	/* dynamic controls, init_verbs and input_mux */ -	struct auto_pin_cfg autocfg; -	struct snd_array kctls; -	struct hda_input_mux private_imux; -	hda_nid_t private_dac_nids[AUTO_CFG_MAX_OUTS]; - -	unsigned int jack_present: 1; -	unsigned int inv_jack_detect: 1;/* inverted jack-detection */ -	unsigned int inv_eapd: 1;	/* inverted EAPD implementation */ -	unsigned int analog_beep: 1;	/* analog beep input present */ - -#ifdef CONFIG_SND_HDA_POWER_SAVE -	struct hda_loopback_check loopback; -#endif -	/* for virtual master */ -	hda_nid_t vmaster_nid; -	const char **slave_vols; -	const char **slave_sws; -}; - -/* - * input MUX handling (common part) - */ -static int ad198x_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) -{ -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	struct ad198x_spec *spec = codec->spec; - -	return snd_hda_input_mux_info(spec->input_mux, uinfo); -} - -static int ad198x_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	struct ad198x_spec *spec = codec->spec; -	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); - -	ucontrol->value.enumerated.item[0] = spec->cur_mux[adc_idx]; -	return 0; -} -static int ad198x_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) -{ -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	struct ad198x_spec *spec = codec->spec; -	unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); - -	return snd_hda_input_mux_put(codec, spec->input_mux, ucontrol, -				     spec->capsrc_nids[adc_idx], -				     &spec->cur_mux[adc_idx]); -} - -/* - * initialization (common callbacks) - */ -static int ad198x_init(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	int i; - -	for (i = 0; i < spec->num_init_verbs; i++) -		snd_hda_sequence_write(codec, spec->init_verbs[i]); -	return 0; -} +struct ad198x_spec { +	struct hda_gen_spec gen; -static const char *ad_slave_vols[] = { -	"Front Playback Volume", -	"Surround Playback Volume", -	"Center Playback Volume", -	"LFE Playback Volume", -	"Side Playback Volume", -	"Headphone Playback Volume", -	"Mono Playback Volume", -	"Speaker Playback Volume", -	"IEC958 Playback Volume", -	NULL -}; +	/* for auto parser */ +	int smux_paths[4]; +	unsigned int cur_smux; +	hda_nid_t eapd_nid; -static const char *ad_slave_sws[] = { -	"Front Playback Switch", -	"Surround Playback Switch", -	"Center Playback Switch", -	"LFE Playback Switch", -	"Side Playback Switch", -	"Headphone Playback Switch", -	"Mono Playback Switch", -	"Speaker Playback Switch", -	"IEC958 Playback Switch", -	NULL +	unsigned int beep_amp;	/* beep amp value, set via set_beep_amp() */  }; -static void ad198x_free_kctls(struct hda_codec *codec);  #ifdef CONFIG_SND_HDA_INPUT_BEEP  /* additional beep mixers; the actual parameters are overwritten at build */ -static struct snd_kcontrol_new ad_beep_mixer[] = { +static const struct snd_kcontrol_new ad_beep_mixer[] = {  	HDA_CODEC_VOLUME("Beep Playback Volume", 0, 0, HDA_OUTPUT),  	HDA_CODEC_MUTE_BEEP("Beep Playback Switch", 0, 0, HDA_OUTPUT),  	{ } /* end */  }; -static struct snd_kcontrol_new ad_beep2_mixer[] = { -	HDA_CODEC_VOLUME("Digital Beep Playback Volume", 0, 0, HDA_OUTPUT), -	HDA_CODEC_MUTE_BEEP("Digital Beep Playback Switch", 0, 0, HDA_OUTPUT), -	{ } /* end */ -}; -  #define set_beep_amp(spec, nid, idx, dir) \  	((spec)->beep_amp = HDA_COMPOSE_AMP_VAL(nid, 1, idx, dir)) /* mono */  #else  #define set_beep_amp(spec, nid, idx, dir) /* NOP */  #endif -static int ad198x_build_controls(struct hda_codec *codec) +#ifdef CONFIG_SND_HDA_INPUT_BEEP +static int create_beep_ctls(struct hda_codec *codec)  {  	struct ad198x_spec *spec = codec->spec; -	struct snd_kcontrol *kctl; -	unsigned int i; -	int err; - -	for (i = 0; i < spec->num_mixers; i++) { -		err = snd_hda_add_new_ctls(codec, spec->mixers[i]); -		if (err < 0) -			return err; -	} -	if (spec->multiout.dig_out_nid) { -		err = snd_hda_create_spdif_out_ctls(codec, spec->multiout.dig_out_nid); -		if (err < 0) -			return err; -		err = snd_hda_create_spdif_share_sw(codec, -						    &spec->multiout); -		if (err < 0) -			return err; -		spec->multiout.share_spdif = 1; -	}  -	if (spec->dig_in_nid) { -		err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid); -		if (err < 0) -			return err; -	} - -	/* create beep controls if needed */ -#ifdef CONFIG_SND_HDA_INPUT_BEEP -	if (spec->beep_amp) { -		struct snd_kcontrol_new *knew; -		knew = spec->analog_beep ? ad_beep2_mixer : ad_beep_mixer; -		for ( ; knew->name; knew++) { -			struct snd_kcontrol *kctl; -			kctl = snd_ctl_new1(knew, codec); -			if (!kctl) -				return -ENOMEM; -			kctl->private_value = spec->beep_amp; -			err = snd_hda_ctl_add(codec, 0, kctl); -			if (err < 0) -				return err; -		} -	} -#endif - -	/* if we have no master control, let's create it */ -	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { -		unsigned int vmaster_tlv[4]; -		snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid, -					HDA_OUTPUT, vmaster_tlv); -		err = snd_hda_add_vmaster(codec, "Master Playback Volume", -					  vmaster_tlv, -					  (spec->slave_vols ? -					   spec->slave_vols : ad_slave_vols)); -		if (err < 0) -			return err; -	} -	if (!snd_hda_find_mixer_ctl(codec, "Master Playback Switch")) { -		err = snd_hda_add_vmaster(codec, "Master Playback Switch", -					  NULL, -					  (spec->slave_sws ? -					   spec->slave_sws : ad_slave_sws)); -		if (err < 0) -			return err; -	} - -	ad198x_free_kctls(codec); /* no longer needed */ +	const struct snd_kcontrol_new *knew; -	/* assign Capture Source enums to NID */ -	kctl = snd_hda_find_mixer_ctl(codec, "Capture Source"); -	if (!kctl) -		kctl = snd_hda_find_mixer_ctl(codec, "Input Source"); -	for (i = 0; kctl && i < kctl->count; i++) { -		err = snd_hda_add_nid(codec, kctl, i, spec->capsrc_nids[i]); -		if (err < 0) -			return err; -	} +	if (!spec->beep_amp) +		return 0; -	/* assign IEC958 enums to NID */ -	kctl = snd_hda_find_mixer_ctl(codec, -			SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source"); -	if (kctl) { -		err = snd_hda_add_nid(codec, kctl, 0, -				      spec->multiout.dig_out_nid); +	for (knew = ad_beep_mixer ; knew->name; knew++) { +		int err; +		struct snd_kcontrol *kctl; +		kctl = snd_ctl_new1(knew, codec); +		if (!kctl) +			return -ENOMEM; +		kctl->private_value = spec->beep_amp; +		err = snd_hda_ctl_add(codec, 0, kctl);  		if (err < 0)  			return err;  	} -  	return 0;  } - -#ifdef CONFIG_SND_HDA_POWER_SAVE -static int ad198x_check_power_status(struct hda_codec *codec, hda_nid_t nid) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_check_amp_list_power(codec, &spec->loopback, nid); -} +#else +#define create_beep_ctls(codec)		0  #endif -/* - * Analog playback callbacks - */ -static int ad198x_playback_pcm_open(struct hda_pcm_stream *hinfo, -				    struct hda_codec *codec, -				    struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream, -					     hinfo); -} - -static int ad198x_playback_pcm_prepare(struct hda_pcm_stream *hinfo, -				       struct hda_codec *codec, -				       unsigned int stream_tag, -				       unsigned int format, -				       struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag, -						format, substream); -} - -static int ad198x_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, -				       struct hda_codec *codec, -				       struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); -} - -/* - * Digital out - */ -static int ad198x_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, -					struct hda_codec *codec, -					struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_dig_open(codec, &spec->multiout); -} - -static int ad198x_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, -					 struct hda_codec *codec, -					 struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_dig_close(codec, &spec->multiout); -} - -static int ad198x_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo, -					   struct hda_codec *codec, -					   unsigned int stream_tag, -					   unsigned int format, -					   struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag, -					     format, substream); -} - -static int ad198x_dig_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, -					   struct hda_codec *codec, -					   struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	return snd_hda_multi_out_dig_cleanup(codec, &spec->multiout); -} - -/* - * Analog capture - */ -static int ad198x_capture_pcm_prepare(struct hda_pcm_stream *hinfo, -				      struct hda_codec *codec, -				      unsigned int stream_tag, -				      unsigned int format, -				      struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	snd_hda_codec_setup_stream(codec, spec->adc_nids[substream->number], -				   stream_tag, 0, format); -	return 0; -} - -static int ad198x_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, -				      struct hda_codec *codec, -				      struct snd_pcm_substream *substream) -{ -	struct ad198x_spec *spec = codec->spec; -	snd_hda_codec_cleanup_stream(codec, spec->adc_nids[substream->number]); -	return 0; -} - - -/* - */ -static struct hda_pcm_stream ad198x_pcm_analog_playback = { -	.substreams = 1, -	.channels_min = 2, -	.channels_max = 6, /* changed later */ -	.nid = 0, /* fill later */ -	.ops = { -		.open = ad198x_playback_pcm_open, -		.prepare = ad198x_playback_pcm_prepare, -		.cleanup = ad198x_playback_pcm_cleanup -	}, -}; - -static struct hda_pcm_stream ad198x_pcm_analog_capture = { -	.substreams = 1, -	.channels_min = 2, -	.channels_max = 2, -	.nid = 0, /* fill later */ -	.ops = { -		.prepare = ad198x_capture_pcm_prepare, -		.cleanup = ad198x_capture_pcm_cleanup -	}, -}; - -static struct hda_pcm_stream ad198x_pcm_digital_playback = { -	.substreams = 1, -	.channels_min = 2, -	.channels_max = 2, -	.nid = 0, /* fill later */ -	.ops = { -		.open = ad198x_dig_playback_pcm_open, -		.close = ad198x_dig_playback_pcm_close, -		.prepare = ad198x_dig_playback_pcm_prepare, -		.cleanup = ad198x_dig_playback_pcm_cleanup -	}, -}; - -static struct hda_pcm_stream ad198x_pcm_digital_capture = { -	.substreams = 1, -	.channels_min = 2, -	.channels_max = 2, -	/* NID is set in alc_build_pcms */ -}; - -static int ad198x_build_pcms(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	struct hda_pcm *info = spec->pcm_rec; - -	codec->num_pcms = 1; -	codec->pcm_info = info; - -	info->name = "AD198x Analog"; -	info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_analog_playback; -	info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->multiout.max_channels; -	info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dac_nids[0]; -	info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_analog_capture; -	info->stream[SNDRV_PCM_STREAM_CAPTURE].substreams = spec->num_adc_nids; -	info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0]; - -	if (spec->multiout.dig_out_nid) { -		info++; -		codec->num_pcms++; -		info->name = "AD198x Digital"; -		info->pcm_type = HDA_PCM_TYPE_SPDIF; -		info->stream[SNDRV_PCM_STREAM_PLAYBACK] = ad198x_pcm_digital_playback; -		info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = spec->multiout.dig_out_nid; -		if (spec->dig_in_nid) { -			info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad198x_pcm_digital_capture; -			info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->dig_in_nid; -		} -	} - -	return 0; -} - -static inline void ad198x_shutup(struct hda_codec *codec) -{ -	snd_hda_shutup_pins(codec); -} - -static void ad198x_free_kctls(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; - -	if (spec->kctls.list) { -		struct snd_kcontrol_new *kctl = spec->kctls.list; -		int i; -		for (i = 0; i < spec->kctls.used; i++) -			kfree(kctl[i].name); -	} -	snd_array_free(&spec->kctls); -}  static void ad198x_power_eapd_write(struct hda_codec *codec, hda_nid_t front,  				hda_nid_t hp)  { -	struct ad198x_spec *spec = codec->spec; -	snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE, -			    !spec->inv_eapd ? 0x00 : 0x02); -	snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE, -			    !spec->inv_eapd ? 0x00 : 0x02); +	if (snd_hda_query_pin_caps(codec, front) & AC_PINCAP_EAPD) +		snd_hda_codec_write(codec, front, 0, AC_VERB_SET_EAPD_BTLENABLE, +			    !codec->inv_eapd ? 0x00 : 0x02); +	if (snd_hda_query_pin_caps(codec, hp) & AC_PINCAP_EAPD) +		snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_EAPD_BTLENABLE, +			    !codec->inv_eapd ? 0x00 : 0x02);  }  static void ad198x_power_eapd(struct hda_codec *codec) @@ -489,6 +108,10 @@ static void ad198x_power_eapd(struct hda_codec *codec)  	case 0x11d4184a:  	case 0x11d4194a:  	case 0x11d4194b: +	case 0x11d41988: +	case 0x11d4198b: +	case 0x11d4989a: +	case 0x11d4989b:  		ad198x_power_eapd_write(codec, 0x12, 0x11);  		break;  	case 0x11d41981: @@ -498,975 +121,404 @@ static void ad198x_power_eapd(struct hda_codec *codec)  	case 0x11d41986:  		ad198x_power_eapd_write(codec, 0x1b, 0x1a);  		break; -	case 0x11d41988: -	case 0x11d4198b: -	case 0x11d4989a: -	case 0x11d4989b: -		ad198x_power_eapd_write(codec, 0x29, 0x22); -		break;  	}  } -static void ad198x_free(struct hda_codec *codec) +static void ad198x_shutup(struct hda_codec *codec)  { -	struct ad198x_spec *spec = codec->spec; - -	if (!spec) -		return; - -	ad198x_shutup(codec); -	ad198x_free_kctls(codec); -	kfree(spec); -	snd_hda_detach_beep_device(codec); +	snd_hda_shutup_pins(codec); +	ad198x_power_eapd(codec);  } -#ifdef SND_HDA_NEEDS_RESUME -static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) +#ifdef CONFIG_PM +static int ad198x_suspend(struct hda_codec *codec)  {  	ad198x_shutup(codec); -	ad198x_power_eapd(codec);  	return 0;  }  #endif -static struct hda_codec_ops ad198x_patch_ops = { -	.build_controls = ad198x_build_controls, -	.build_pcms = ad198x_build_pcms, -	.init = ad198x_init, -	.free = ad198x_free, -#ifdef CONFIG_SND_HDA_POWER_SAVE -	.check_power_status = ad198x_check_power_status, -#endif -#ifdef SND_HDA_NEEDS_RESUME -	.suspend = ad198x_suspend, -#endif -	.reboot_notify = ad198x_shutup, -}; - - -/* - * EAPD control - * the private value = nid - */ -#define ad198x_eapd_info	snd_ctl_boolean_mono_info - -static int ad198x_eapd_get(struct snd_kcontrol *kcontrol, -			   struct snd_ctl_elem_value *ucontrol) +/* follow EAPD via vmaster hook */ +static void ad_vmaster_eapd_hook(void *private_data, int enabled)  { -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); +	struct hda_codec *codec = private_data;  	struct ad198x_spec *spec = codec->spec; -	if (spec->inv_eapd) -		ucontrol->value.integer.value[0] = ! spec->cur_eapd; -	else -		ucontrol->value.integer.value[0] = spec->cur_eapd; -	return 0; -} -static int ad198x_eapd_put(struct snd_kcontrol *kcontrol, -			   struct snd_ctl_elem_value *ucontrol) -{ -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	struct ad198x_spec *spec = codec->spec; -	hda_nid_t nid = kcontrol->private_value & 0xff; -	unsigned int eapd; -	eapd = !!ucontrol->value.integer.value[0]; -	if (spec->inv_eapd) -		eapd = !eapd; -	if (eapd == spec->cur_eapd) -		return 0; -	spec->cur_eapd = eapd; -	snd_hda_codec_write_cache(codec, nid, -				  0, AC_VERB_SET_EAPD_BTLENABLE, -				  eapd ? 0x02 : 0x00); -	return 1; +	if (!spec->eapd_nid) +		return; +	if (codec->inv_eapd) +		enabled = !enabled; +	snd_hda_codec_update_cache(codec, spec->eapd_nid, 0, +				   AC_VERB_SET_EAPD_BTLENABLE, +				   enabled ? 0x02 : 0x00);  } -static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol, -			       struct snd_ctl_elem_info *uinfo); -static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol, -			      struct snd_ctl_elem_value *ucontrol); -static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol, -			      struct snd_ctl_elem_value *ucontrol); - -  /* - * AD1986A specific - */ - -#define AD1986A_SPDIF_OUT	0x02 -#define AD1986A_FRONT_DAC	0x03 -#define AD1986A_SURR_DAC	0x04 -#define AD1986A_CLFE_DAC	0x05 -#define AD1986A_ADC		0x06 - -static hda_nid_t ad1986a_dac_nids[3] = { -	AD1986A_FRONT_DAC, AD1986A_SURR_DAC, AD1986A_CLFE_DAC -}; -static hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC }; -static hda_nid_t ad1986a_capsrc_nids[1] = { 0x12 }; - -static struct hda_input_mux ad1986a_capture_source = { -	.num_items = 7, -	.items = { -		{ "Mic", 0x0 }, -		{ "CD", 0x1 }, -		{ "Aux", 0x3 }, -		{ "Line", 0x4 }, -		{ "Mix", 0x5 }, -		{ "Mono", 0x6 }, -		{ "Phone", 0x7 }, -	}, -}; - - -static struct hda_bind_ctls ad1986a_bind_pcm_vol = { -	.ops = &snd_hda_bind_vol, -	.values = { -		HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT), -		0 -	}, -}; - -static struct hda_bind_ctls ad1986a_bind_pcm_sw = { -	.ops = &snd_hda_bind_sw, -	.values = { -		HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(AD1986A_SURR_DAC, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(AD1986A_CLFE_DAC, 3, 0, HDA_OUTPUT), -		0 -	}, -}; - -/* - * mixers + * Automatic parse of I/O pins from the BIOS configuration   */ -static struct snd_kcontrol_new ad1986a_mixers[] = { -	/* -	 * bind volumes/mutes of 3 DACs as a single PCM control for simplicity -	 */ -	HDA_BIND_VOL("PCM Playback Volume", &ad1986a_bind_pcm_vol), -	HDA_BIND_SW("PCM Playback Switch", &ad1986a_bind_pcm_sw), -	HDA_CODEC_VOLUME("Front Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x1b, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x1c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Surround Playback Switch", 0x1c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x1d, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x1d, 2, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x1d, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x1d, 2, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -/* additional mixers for 3stack mode */ -static struct snd_kcontrol_new ad1986a_3st_mixers[] = { -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Channel Mode", -		.info = ad198x_ch_mode_info, -		.get = ad198x_ch_mode_get, -		.put = ad198x_ch_mode_put, -	}, -	{ } /* end */ -}; -/* laptop model - 2ch only */ -static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC }; - -/* master controls both pins 0x1a and 0x1b */ -static struct hda_bind_ctls ad1986a_laptop_master_vol = { -	.ops = &snd_hda_bind_vol, -	.values = { -		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT), -		0, -	}, -}; +static int ad198x_auto_build_controls(struct hda_codec *codec) +{ +	int err; -static struct hda_bind_ctls ad1986a_laptop_master_sw = { -	.ops = &snd_hda_bind_sw, -	.values = { -		HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT), -		0, -	}, -}; +	err = snd_hda_gen_build_controls(codec); +	if (err < 0) +		return err; +	err = create_beep_ctls(codec); +	if (err < 0) +		return err; +	return 0; +} -static struct snd_kcontrol_new ad1986a_laptop_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), -	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol), -	HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), -	/*  -	   HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT), -	   HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), */ -	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ } /* end */ +static const struct hda_codec_ops ad198x_auto_patch_ops = { +	.build_controls = ad198x_auto_build_controls, +	.build_pcms = snd_hda_gen_build_pcms, +	.init = snd_hda_gen_init, +	.free = snd_hda_gen_free, +	.unsol_event = snd_hda_jack_unsol_event, +#ifdef CONFIG_PM +	.check_power_status = snd_hda_gen_check_power_status, +	.suspend = ad198x_suspend, +#endif +	.reboot_notify = ad198x_shutup,  }; -/* laptop-eapd model - 2ch only */ -static struct hda_input_mux ad1986a_laptop_eapd_capture_source = { -	.num_items = 3, -	.items = { -		{ "Mic", 0x0 }, -		{ "Internal Mic", 0x4 }, -		{ "Mix", 0x5 }, -	}, -}; +static int ad198x_parse_auto_config(struct hda_codec *codec, bool indep_hp) +{ +	struct ad198x_spec *spec = codec->spec; +	struct auto_pin_cfg *cfg = &spec->gen.autocfg; +	int err; -static struct hda_input_mux ad1986a_automic_capture_source = { -	.num_items = 2, -	.items = { -		{ "Mic", 0x0 }, -		{ "Mix", 0x5 }, -	}, -}; +	codec->spdif_status_reset = 1; +	codec->no_trigger_sense = 1; +	codec->no_sticky_stream = 1; -static struct snd_kcontrol_new ad1986a_laptop_master_mixers[] = { -	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol), -	HDA_BIND_SW("Master Playback Switch", &ad1986a_laptop_master_sw), -	{ } /* end */ -}; +	spec->gen.indep_hp = indep_hp; +	spec->gen.add_stereo_mix_input = 1; -static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x0f, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "External Amplifier", -		.subdevice = HDA_SUBDEV_NID_FLAG | 0x1b, -		.info = ad198x_eapd_info, -		.get = ad198x_eapd_get, -		.put = ad198x_eapd_put, -		.private_value = 0x1b, /* port-D */ -	}, -	{ } /* end */ -}; +	err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0); +	if (err < 0) +		return err; +	err = snd_hda_gen_parse_auto_config(codec, cfg); +	if (err < 0) +		return err; -static struct snd_kcontrol_new ad1986a_laptop_intmic_mixers[] = { -	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0, HDA_OUTPUT), -	{ } /* end */ -}; +	codec->patch_ops = ad198x_auto_patch_ops; -/* re-connect the mic boost input according to the jack sensing */ -static void ad1986a_automic(struct hda_codec *codec) -{ -	unsigned int present; -	present = snd_hda_jack_detect(codec, 0x1f); -	/* 0 = 0x1f, 2 = 0x1d, 4 = mixed */ -	snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_CONNECT_SEL, -			    present ? 0 : 2); +	return 0;  } -#define AD1986A_MIC_EVENT		0x36 +/* + * AD1986A specific + */ -static void ad1986a_automic_unsol_event(struct hda_codec *codec, -					    unsigned int res) +static int alloc_ad_spec(struct hda_codec *codec)  { -	if ((res >> 26) != AD1986A_MIC_EVENT) -		return; -	ad1986a_automic(codec); -} +	struct ad198x_spec *spec; -static int ad1986a_automic_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1986a_automic(codec); +	spec = kzalloc(sizeof(*spec), GFP_KERNEL); +	if (!spec) +		return -ENOMEM; +	codec->spec = spec; +	snd_hda_gen_spec_init(&spec->gen);  	return 0;  } -/* laptop-automute - 2ch only */ +/* + * AD1986A fixup codes + */ -static void ad1986a_update_hp(struct hda_codec *codec) +/* Lenovo N100 seems to report the reversed bit for HP jack-sensing */ +static void ad_fixup_inv_jack_detect(struct hda_codec *codec, +				     const struct hda_fixup *fix, int action)  {  	struct ad198x_spec *spec = codec->spec; -	unsigned int mute; -	if (spec->jack_present) -		mute = HDA_AMP_MUTE; /* mute internal speaker */ -	else -		/* unmute internal speaker if necessary */ -		mute = snd_hda_codec_amp_read(codec, 0x1a, 0, HDA_OUTPUT, 0); -	snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, mute); +	if (action == HDA_FIXUP_ACT_PRE_PROBE) { +		codec->inv_jack_detect = 1; +		spec->gen.keep_eapd_on = 1; +		spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook; +		spec->eapd_nid = 0x1b; +	}  } -static void ad1986a_hp_automute(struct hda_codec *codec) +/* Toshiba Satellite L40 implements EAPD in a standard way unlike others */ +static void ad1986a_fixup_eapd(struct hda_codec *codec, +			       const struct hda_fixup *fix, int action)  {  	struct ad198x_spec *spec = codec->spec; -	spec->jack_present = snd_hda_jack_detect(codec, 0x1a); -	if (spec->inv_jack_detect) -		spec->jack_present = !spec->jack_present; -	ad1986a_update_hp(codec); -} - -#define AD1986A_HP_EVENT		0x37 - -static void ad1986a_hp_unsol_event(struct hda_codec *codec, unsigned int res) -{ -	if ((res >> 26) != AD1986A_HP_EVENT) -		return; -	ad1986a_hp_automute(codec); -} - -static int ad1986a_hp_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1986a_hp_automute(codec); -	return 0; -} - -/* bind hp and internal speaker mute (with plug check) */ -static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol, -				    struct snd_ctl_elem_value *ucontrol) -{ -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	long *valp = ucontrol->value.integer.value; -	int change; - -	change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0, -					  HDA_AMP_MUTE, -					  valp[0] ? 0 : HDA_AMP_MUTE); -	change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0, -					   HDA_AMP_MUTE, -					   valp[1] ? 0 : HDA_AMP_MUTE); -	if (change) -		ad1986a_update_hp(codec); -	return change; -} - -static struct snd_kcontrol_new ad1986a_automute_master_mixers[] = { -	HDA_BIND_VOL("Master Playback Volume", &ad1986a_laptop_master_vol), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Master Playback Switch", -		.subdevice = HDA_SUBDEV_AMP_FLAG, -		.info = snd_hda_mixer_amp_switch_info, -		.get = snd_hda_mixer_amp_switch_get, -		.put = ad1986a_hp_master_sw_put, -		.private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT), -	}, -	{ } /* end */ -}; - - -/* - * initialization verbs - */ -static struct hda_verb ad1986a_init_verbs[] = { -	/* Front, Surround, CLFE DAC; mute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Downmix - off */ -	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* HP, Line-Out, Surround, CLFE selectors */ -	{0x0a, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Mono selector */ -	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Mic selector: Mic 1/2 pin */ -	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Line-in selector: Line-in */ -	{0x10, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Mic 1/2 swap */ -	{0x11, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Record selector: mic */ -	{0x12, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Mic, Phone, CD, Aux, Line-In amp; mute as default */ -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* PC beep */ -	{0x18, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* HP, Line-Out, Surround, CLFE, Mono pins; mute as default */ -	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* HP Pin */ -	{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 }, -	/* Front, Surround, CLFE Pins */ -	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* Mono Pin */ -	{0x1e, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* Mic Pin */ -	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 }, -	/* Line, Aux, CD, Beep-In Pin */ -	{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{0x22, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{0x23, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{ } /* end */ -}; - -static struct hda_verb ad1986a_ch2_init[] = { -	/* Surround out -> Line In */ -	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, - 	/* Line-in selectors */ -	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x1 }, -	/* CLFE -> Mic in */ -	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, -	/* Mic selector, mix C/LFE (backmic) and Mic (frontmic) */ -	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 }, -	{ } /* end */ -}; - -static struct hda_verb ad1986a_ch4_init[] = { -	/* Surround out -> Surround */ -	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 }, -	/* CLFE -> Mic in */ -	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, -	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x4 }, -	{ } /* end */ -}; - -static struct hda_verb ad1986a_ch6_init[] = { -	/* Surround out -> Surround out */ -	{ 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{ 0x10, AC_VERB_SET_CONNECT_SEL, 0x0 }, -	/* CLFE -> CLFE */ -	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x0 }, -	{ } /* end */ -}; - -static struct hda_channel_mode ad1986a_modes[3] = { -	{ 2, ad1986a_ch2_init }, -	{ 4, ad1986a_ch4_init }, -	{ 6, ad1986a_ch6_init }, -}; - -/* eapd initialization */ -static struct hda_verb ad1986a_eapd_init_verbs[] = { -	{0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, -	{} -}; - -static struct hda_verb ad1986a_automic_verbs[] = { -	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x1f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	/*{0x20, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},*/ -	{0x0f, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x1f, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_MIC_EVENT}, -	{} -}; - -/* Ultra initialization */ -static struct hda_verb ad1986a_ultra_init[] = { -	/* eapd initialization */ -	{ 0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, -	/* CLFE -> Mic in */ -	{ 0x0f, AC_VERB_SET_CONNECT_SEL, 0x2 }, -	{ 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 }, -	{ 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080 }, -	{ } /* end */ -}; - -/* pin sensing on HP jack */ -static struct hda_verb ad1986a_hp_init_verbs[] = { -	{0x1a, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1986A_HP_EVENT}, -	{} -}; - -static void ad1986a_samsung_p50_unsol_event(struct hda_codec *codec, -					    unsigned int res) -{ -	switch (res >> 26) { -	case AD1986A_HP_EVENT: -		ad1986a_hp_automute(codec); -		break; -	case AD1986A_MIC_EVENT: -		ad1986a_automic(codec); -		break; +	if (action == HDA_FIXUP_ACT_PRE_PROBE) { +		codec->inv_eapd = 0; +		spec->gen.keep_eapd_on = 1; +		spec->eapd_nid = 0x1b;  	}  } -static int ad1986a_samsung_p50_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1986a_hp_automute(codec); -	ad1986a_automic(codec); -	return 0; -} - - -/* models */  enum { -	AD1986A_6STACK, -	AD1986A_3STACK, -	AD1986A_LAPTOP, -	AD1986A_LAPTOP_EAPD, -	AD1986A_LAPTOP_AUTOMUTE, -	AD1986A_ULTRA, -	AD1986A_SAMSUNG, -	AD1986A_SAMSUNG_P50, -	AD1986A_MODELS -}; - -static const char *ad1986a_models[AD1986A_MODELS] = { -	[AD1986A_6STACK]	= "6stack", -	[AD1986A_3STACK]	= "3stack", -	[AD1986A_LAPTOP]	= "laptop", -	[AD1986A_LAPTOP_EAPD]	= "laptop-eapd", -	[AD1986A_LAPTOP_AUTOMUTE] = "laptop-automute", -	[AD1986A_ULTRA]		= "ultra", -	[AD1986A_SAMSUNG]	= "samsung", -	[AD1986A_SAMSUNG_P50]	= "samsung-p50", +	AD1986A_FIXUP_INV_JACK_DETECT, +	AD1986A_FIXUP_ULTRA, +	AD1986A_FIXUP_SAMSUNG, +	AD1986A_FIXUP_3STACK, +	AD1986A_FIXUP_LAPTOP, +	AD1986A_FIXUP_LAPTOP_IMIC, +	AD1986A_FIXUP_EAPD, +}; + +static const struct hda_fixup ad1986a_fixups[] = { +	[AD1986A_FIXUP_INV_JACK_DETECT] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad_fixup_inv_jack_detect, +	}, +	[AD1986A_FIXUP_ULTRA] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x1b, 0x90170110 }, /* speaker */ +			{ 0x1d, 0x90a7013e }, /* int mic */ +			{} +		}, +	}, +	[AD1986A_FIXUP_SAMSUNG] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x1b, 0x90170110 }, /* speaker */ +			{ 0x1d, 0x90a7013e }, /* int mic */ +			{ 0x20, 0x411111f0 }, /* N/A */ +			{ 0x24, 0x411111f0 }, /* N/A */ +			{} +		}, +	}, +	[AD1986A_FIXUP_3STACK] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x1a, 0x02214021 }, /* headphone */ +			{ 0x1b, 0x01014011 }, /* front */ +			{ 0x1c, 0x01813030 }, /* line-in */ +			{ 0x1d, 0x01a19020 }, /* rear mic */ +			{ 0x1e, 0x411111f0 }, /* N/A */ +			{ 0x1f, 0x02a190f0 }, /* mic */ +			{ 0x20, 0x411111f0 }, /* N/A */ +			{} +		}, +	}, +	[AD1986A_FIXUP_LAPTOP] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x1a, 0x02214021 }, /* headphone */ +			{ 0x1b, 0x90170110 }, /* speaker */ +			{ 0x1c, 0x411111f0 }, /* N/A */ +			{ 0x1d, 0x411111f0 }, /* N/A */ +			{ 0x1e, 0x411111f0 }, /* N/A */ +			{ 0x1f, 0x02a191f0 }, /* mic */ +			{ 0x20, 0x411111f0 }, /* N/A */ +			{} +		}, +	}, +	[AD1986A_FIXUP_LAPTOP_IMIC] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x1d, 0x90a7013e }, /* int mic */ +			{} +		}, +		.chained_before = 1, +		.chain_id = AD1986A_FIXUP_LAPTOP, +	}, +	[AD1986A_FIXUP_EAPD] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1986a_fixup_eapd, +	},  }; -static struct snd_pci_quirk ad1986a_cfg_tbl[] = { -	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1153, "ASUS M9", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x11f7, "ASUS U5A", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1213, "ASUS A6J", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1263, "ASUS U5F", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1297, "ASUS Z62F", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS V1j", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1302, "ASUS W3j", AD1986A_LAPTOP_EAPD), -	SND_PCI_QUIRK(0x1043, 0x1443, "ASUS VX1", AD1986A_LAPTOP), -	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8J", AD1986A_3STACK), -	SND_PCI_QUIRK(0x1043, 0x817f, "ASUS P5", AD1986A_3STACK), -	SND_PCI_QUIRK(0x1043, 0x818f, "ASUS P5", AD1986A_LAPTOP), -	SND_PCI_QUIRK(0x1043, 0x81b3, "ASUS P5", AD1986A_3STACK), -	SND_PCI_QUIRK(0x1043, 0x81cb, "ASUS M2N", AD1986A_3STACK), -	SND_PCI_QUIRK(0x1043, 0x8234, "ASUS M2N", AD1986A_3STACK), -	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_3STACK), -	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba Satellite L40-10Q", AD1986A_3STACK), -	SND_PCI_QUIRK(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK), -	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP), -	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung P50", AD1986A_SAMSUNG_P50), -	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA), -	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_SAMSUNG), -	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK), -	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_LAPTOP), -	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_3STACK), -	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_LAPTOP_AUTOMUTE), -	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP), +static const struct snd_pci_quirk ad1986a_fixup_tbl[] = { +	SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC), +	SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD), +	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK), +	SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK), +	SND_PCI_QUIRK(0x10de, 0xcb84, "ASUS A8N-VM", AD1986A_FIXUP_3STACK), +	SND_PCI_QUIRK(0x1179, 0xff40, "Toshiba Satellite L40", AD1986A_FIXUP_EAPD), +	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_FIXUP_LAPTOP), +	SND_PCI_QUIRK_MASK(0x144d, 0xff00, 0xc000, "Samsung", AD1986A_FIXUP_SAMSUNG), +	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_FIXUP_ULTRA), +	SND_PCI_QUIRK(0x17aa, 0x2066, "Lenovo N100", AD1986A_FIXUP_INV_JACK_DETECT), +	SND_PCI_QUIRK(0x17aa, 0x1011, "Lenovo M55", AD1986A_FIXUP_3STACK), +	SND_PCI_QUIRK(0x17aa, 0x1017, "Lenovo A60", AD1986A_FIXUP_3STACK),  	{}  }; -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1986a_loopbacks[] = { -	{ 0x13, HDA_OUTPUT, 0 }, /* Mic */ -	{ 0x14, HDA_OUTPUT, 0 }, /* Phone */ -	{ 0x15, HDA_OUTPUT, 0 }, /* CD */ -	{ 0x16, HDA_OUTPUT, 0 }, /* Aux */ -	{ 0x17, HDA_OUTPUT, 0 }, /* Line */ -	{ } /* end */ +static const struct hda_model_fixup ad1986a_fixup_models[] = { +	{ .id = AD1986A_FIXUP_3STACK, .name = "3stack" }, +	{ .id = AD1986A_FIXUP_LAPTOP, .name = "laptop" }, +	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-imic" }, +	{ .id = AD1986A_FIXUP_LAPTOP_IMIC, .name = "laptop-eapd" }, /* alias */ +	{}  }; -#endif - -static int is_jack_available(struct hda_codec *codec, hda_nid_t nid) -{ -	unsigned int conf = snd_hda_codec_get_pincfg(codec, nid); -	return get_defcfg_connect(conf) != AC_JACK_PORT_NONE; -} +/* + */  static int patch_ad1986a(struct hda_codec *codec)  { +	int err;  	struct ad198x_spec *spec; -	int err, board_config; +	static hda_nid_t preferred_pairs[] = { +		0x1a, 0x03, +		0x1b, 0x03, +		0x1c, 0x04, +		0x1d, 0x05, +		0x1e, 0x03, +		0 +	}; -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; +	err = alloc_ad_spec(codec); +	if (err < 0) +		return err; +	spec = codec->spec; -	codec->spec = spec; +	/* AD1986A has the inverted EAPD implementation */ +	codec->inv_eapd = 1; -	err = snd_hda_attach_beep_device(codec, 0x19); -	if (err < 0) { -		ad198x_free(codec); -		return err; -	} +	spec->gen.mixer_nid = 0x07; +	spec->gen.beep_nid = 0x19;  	set_beep_amp(spec, 0x18, 0, HDA_OUTPUT); -	spec->multiout.max_channels = 6; -	spec->multiout.num_dacs = ARRAY_SIZE(ad1986a_dac_nids); -	spec->multiout.dac_nids = ad1986a_dac_nids; -	spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT; -	spec->num_adc_nids = 1; -	spec->adc_nids = ad1986a_adc_nids; -	spec->capsrc_nids = ad1986a_capsrc_nids; -	spec->input_mux = &ad1986a_capture_source; -	spec->num_mixers = 1; -	spec->mixers[0] = ad1986a_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1986a_init_verbs; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1986a_loopbacks; -#endif -	spec->vmaster_nid = 0x1b; -	spec->inv_eapd = 1; /* AD1986A has the inverted EAPD implementation */ - -	codec->patch_ops = ad198x_patch_ops; - -	/* override some parameters */ -	board_config = snd_hda_check_board_config(codec, AD1986A_MODELS, -						  ad1986a_models, -						  ad1986a_cfg_tbl); -	switch (board_config) { -	case AD1986A_3STACK: -		spec->num_mixers = 2; -		spec->mixers[1] = ad1986a_3st_mixers; -		spec->num_init_verbs = 2; -		spec->init_verbs[1] = ad1986a_ch2_init; -		spec->channel_mode = ad1986a_modes; -		spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes); -		spec->need_dac_fix = 1; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		break; -	case AD1986A_LAPTOP: -		spec->mixers[0] = ad1986a_laptop_mixers; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		break; -	case AD1986A_LAPTOP_EAPD: -		spec->num_mixers = 3; -		spec->mixers[0] = ad1986a_laptop_master_mixers; -		spec->mixers[1] = ad1986a_laptop_eapd_mixers; -		spec->mixers[2] = ad1986a_laptop_intmic_mixers; -		spec->num_init_verbs = 2; -		spec->init_verbs[1] = ad1986a_eapd_init_verbs; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		if (!is_jack_available(codec, 0x25)) -			spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1986a_laptop_eapd_capture_source; -		break; -	case AD1986A_SAMSUNG: -		spec->num_mixers = 2; -		spec->mixers[0] = ad1986a_laptop_master_mixers; -		spec->mixers[1] = ad1986a_laptop_eapd_mixers; -		spec->num_init_verbs = 3; -		spec->init_verbs[1] = ad1986a_eapd_init_verbs; -		spec->init_verbs[2] = ad1986a_automic_verbs; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		if (!is_jack_available(codec, 0x25)) -			spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1986a_automic_capture_source; -		codec->patch_ops.unsol_event = ad1986a_automic_unsol_event; -		codec->patch_ops.init = ad1986a_automic_init; -		break; -	case AD1986A_SAMSUNG_P50: -		spec->num_mixers = 2; -		spec->mixers[0] = ad1986a_automute_master_mixers; -		spec->mixers[1] = ad1986a_laptop_eapd_mixers; -		spec->num_init_verbs = 4; -		spec->init_verbs[1] = ad1986a_eapd_init_verbs; -		spec->init_verbs[2] = ad1986a_automic_verbs; -		spec->init_verbs[3] = ad1986a_hp_init_verbs; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		if (!is_jack_available(codec, 0x25)) -			spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1986a_automic_capture_source; -		codec->patch_ops.unsol_event = ad1986a_samsung_p50_unsol_event; -		codec->patch_ops.init = ad1986a_samsung_p50_init; -		break; -	case AD1986A_LAPTOP_AUTOMUTE: -		spec->num_mixers = 3; -		spec->mixers[0] = ad1986a_automute_master_mixers; -		spec->mixers[1] = ad1986a_laptop_eapd_mixers; -		spec->mixers[2] = ad1986a_laptop_intmic_mixers; -		spec->num_init_verbs = 3; -		spec->init_verbs[1] = ad1986a_eapd_init_verbs; -		spec->init_verbs[2] = ad1986a_hp_init_verbs; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		if (!is_jack_available(codec, 0x25)) -			spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1986a_laptop_eapd_capture_source; -		codec->patch_ops.unsol_event = ad1986a_hp_unsol_event; -		codec->patch_ops.init = ad1986a_hp_init; -		/* Lenovo N100 seems to report the reversed bit -		 * for HP jack-sensing -		 */ -		spec->inv_jack_detect = 1; -		break; -	case AD1986A_ULTRA: -		spec->mixers[0] = ad1986a_laptop_eapd_mixers; -		spec->num_init_verbs = 2; -		spec->init_verbs[1] = ad1986a_ultra_init; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1986a_laptop_dac_nids; -		spec->multiout.dig_out_nid = 0; -		break; -	} -  	/* AD1986A has a hardware problem that it can't share a stream  	 * with multiple output pins.  The copy of front to surrounds  	 * causes noisy or silent outputs at a certain timing, e.g.  	 * changing the volume.  	 * So, let's disable the shared stream.  	 */ -	spec->multiout.no_share_stream = 1; +	spec->gen.multiout.no_share_stream = 1; +	/* give fixed DAC/pin pairs */ +	spec->gen.preferred_dacs = preferred_pairs; -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	/* AD1986A can't manage the dynamic pin on/off smoothly */ +	spec->gen.auto_mute_via_amp = 1; + +	snd_hda_pick_fixup(codec, ad1986a_fixup_models, ad1986a_fixup_tbl, +			   ad1986a_fixups); +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); + +	err = ad198x_parse_auto_config(codec, false); +	if (err < 0) { +		snd_hda_gen_free(codec); +		return err; +	} + +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);  	return 0;  } +  /*   * AD1983 specific   */ -#define AD1983_SPDIF_OUT	0x02 -#define AD1983_DAC		0x03 -#define AD1983_ADC		0x04 - -static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC }; -static hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC }; -static hda_nid_t ad1983_capsrc_nids[1] = { 0x15 }; - -static struct hda_input_mux ad1983_capture_source = { -	.num_items = 4, -	.items = { -		{ "Mic", 0x0 }, -		{ "Line", 0x1 }, -		{ "Mix", 0x2 }, -		{ "Mix Mono", 0x3 }, -	}, -}; -  /* - * SPDIF playback route + * SPDIF mux control for AD1983 auto-parser   */ -static int ad1983_spdif_route_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) +static int ad1983_auto_smux_enum_info(struct snd_kcontrol *kcontrol, +				      struct snd_ctl_elem_info *uinfo)  { -	static char *texts[] = { "PCM", "ADC" }; - -	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; -	uinfo->count = 1; -	uinfo->value.enumerated.items = 2; -	if (uinfo->value.enumerated.item > 1) -		uinfo->value.enumerated.item = 1; -	strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); -	return 0; +	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); +	struct ad198x_spec *spec = codec->spec; +	static const char * const texts2[] = { "PCM", "ADC" }; +	static const char * const texts3[] = { "PCM", "ADC1", "ADC2" }; +	hda_nid_t dig_out = spec->gen.multiout.dig_out_nid; +	int num_conns = snd_hda_get_num_conns(codec, dig_out); + +	if (num_conns == 2) +		return snd_hda_enum_helper_info(kcontrol, uinfo, 2, texts2); +	else if (num_conns == 3) +		return snd_hda_enum_helper_info(kcontrol, uinfo, 3, texts3); +	else +		return -EINVAL;  } -static int ad1983_spdif_route_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int ad1983_auto_smux_enum_get(struct snd_kcontrol *kcontrol, +				     struct snd_ctl_elem_value *ucontrol)  {  	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);  	struct ad198x_spec *spec = codec->spec; -	ucontrol->value.enumerated.item[0] = spec->spdif_route; +	ucontrol->value.enumerated.item[0] = spec->cur_smux;  	return 0;  } -static int ad1983_spdif_route_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) +static int ad1983_auto_smux_enum_put(struct snd_kcontrol *kcontrol, +				     struct snd_ctl_elem_value *ucontrol)  {  	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);  	struct ad198x_spec *spec = codec->spec; +	unsigned int val = ucontrol->value.enumerated.item[0]; +	hda_nid_t dig_out = spec->gen.multiout.dig_out_nid; +	int num_conns = snd_hda_get_num_conns(codec, dig_out); -	if (ucontrol->value.enumerated.item[0] > 1) +	if (val >= num_conns)  		return -EINVAL; -	if (spec->spdif_route != ucontrol->value.enumerated.item[0]) { -		spec->spdif_route = ucontrol->value.enumerated.item[0]; -		snd_hda_codec_write_cache(codec, spec->multiout.dig_out_nid, 0, -					  AC_VERB_SET_CONNECT_SEL, -					  spec->spdif_route); -		return 1; -	} -	return 0; +	if (spec->cur_smux == val) +		return 0; +	spec->cur_smux = val; +	snd_hda_codec_write_cache(codec, dig_out, 0, +				  AC_VERB_SET_CONNECT_SEL, val); +	return 1;  } -static struct snd_kcontrol_new ad1983_mixers[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ +static struct snd_kcontrol_new ad1983_auto_smux_mixer = { +	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, +	.name = "IEC958 Playback Source", +	.info = ad1983_auto_smux_enum_info, +	.get = ad1983_auto_smux_enum_get, +	.put = ad1983_auto_smux_enum_put,  }; -static struct hda_verb ad1983_init_verbs[] = { -	/* Front, HP, Mono; mute as default */ -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Beep, PCM, Mic, Line-In: mute */ -	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Front, HP selectors; from Mix */ -	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01}, -	{0x06, AC_VERB_SET_CONNECT_SEL, 0x01}, -	/* Mono selector; from Mix */ -	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x03}, -	/* Mic selector; Mic */ -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Line-in selector: Line-in */ -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Mic boost: 0dB */ -	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000}, -	/* Record selector: mic */ -	{0x15, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* SPDIF route: PCM */ -	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Front Pin */ -	{0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* HP Pin */ -	{0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 }, -	/* Mono Pin */ -	{0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* Mic Pin */ -	{0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 }, -	/* Line Pin */ -	{0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	{ } /* end */ -}; +static int ad1983_add_spdif_mux_ctl(struct hda_codec *codec) +{ +	struct ad198x_spec *spec = codec->spec; +	hda_nid_t dig_out = spec->gen.multiout.dig_out_nid; +	int num_conns; -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1983_loopbacks[] = { -	{ 0x12, HDA_OUTPUT, 0 }, /* Mic */ -	{ 0x13, HDA_OUTPUT, 0 }, /* Line */ -	{ } /* end */ -}; -#endif +	if (!dig_out) +		return 0; +	num_conns = snd_hda_get_num_conns(codec, dig_out); +	if (num_conns != 2 && num_conns != 3) +		return 0; +	if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &ad1983_auto_smux_mixer)) +		return -ENOMEM; +	return 0; +}  static int patch_ad1983(struct hda_codec *codec)  {  	struct ad198x_spec *spec; +	static hda_nid_t conn_0c[] = { 0x08 }; +	static hda_nid_t conn_0d[] = { 0x09 };  	int err; -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; - -	codec->spec = spec; - -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); +	err = alloc_ad_spec(codec); +	if (err < 0)  		return err; -	} -	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); - -	spec->multiout.max_channels = 2; -	spec->multiout.num_dacs = ARRAY_SIZE(ad1983_dac_nids); -	spec->multiout.dac_nids = ad1983_dac_nids; -	spec->multiout.dig_out_nid = AD1983_SPDIF_OUT; -	spec->num_adc_nids = 1; -	spec->adc_nids = ad1983_adc_nids; -	spec->capsrc_nids = ad1983_capsrc_nids; -	spec->input_mux = &ad1983_capture_source; -	spec->num_mixers = 1; -	spec->mixers[0] = ad1983_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1983_init_verbs; -	spec->spdif_route = 0; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1983_loopbacks; -#endif -	spec->vmaster_nid = 0x05; +	spec = codec->spec; -	codec->patch_ops = ad198x_patch_ops; +	spec->gen.mixer_nid = 0x0e; +	spec->gen.beep_nid = 0x10; +	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	/* limit the loopback routes not to confuse the parser */ +	snd_hda_override_conn_list(codec, 0x0c, ARRAY_SIZE(conn_0c), conn_0c); +	snd_hda_override_conn_list(codec, 0x0d, ARRAY_SIZE(conn_0d), conn_0d); +	err = ad198x_parse_auto_config(codec, false); +	if (err < 0) +		goto error; +	err = ad1983_add_spdif_mux_ctl(codec); +	if (err < 0) +		goto error;  	return 0; + + error: +	snd_hda_gen_free(codec); +	return err;  } @@ -1474,454 +526,89 @@ static int patch_ad1983(struct hda_codec *codec)   * AD1981 HD specific   */ -#define AD1981_SPDIF_OUT	0x02 -#define AD1981_DAC		0x03 -#define AD1981_ADC		0x04 - -static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC }; -static hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC }; -static hda_nid_t ad1981_capsrc_nids[1] = { 0x15 }; - -/* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */ -static struct hda_input_mux ad1981_capture_source = { -	.num_items = 7, -	.items = { -		{ "Front Mic", 0x0 }, -		{ "Line", 0x1 }, -		{ "Mix", 0x2 }, -		{ "Mix Mono", 0x3 }, -		{ "CD", 0x4 }, -		{ "Mic", 0x6 }, -		{ "Aux", 0x7 }, -	}, -}; - -static struct snd_kcontrol_new ad1981_mixers[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x06, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x06, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x07, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x07, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Aux Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Aux Playback Switch", 0x1b, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Front Mic Boost", 0x08, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x18, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	/* identical with AD1983 */ -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -static struct hda_verb ad1981_init_verbs[] = { -	/* Front, HP, Mono; mute as default */ -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Beep, PCM, Front Mic, Line, Rear Mic, Aux, CD-In: mute */ -	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Front, HP selectors; from Mix */ -	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01}, -	{0x06, AC_VERB_SET_CONNECT_SEL, 0x01}, -	/* Mono selector; from Mix */ -	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x03}, -	/* Mic Mixer; select Front Mic */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000}, -	{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* Mic boost: 0dB */ -	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	/* Record selector: Front mic */ -	{0x15, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	/* SPDIF route: PCM */ -	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Front Pin */ -	{0x05, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* HP Pin */ -	{0x06, AC_VERB_SET_PIN_WIDGET_CONTROL, 0xc0 }, -	/* Mono Pin */ -	{0x07, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 }, -	/* Front & Rear Mic Pins */ -	{0x08, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 }, -	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 }, -	/* Line Pin */ -	{0x09, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x20 }, -	/* Digital Beep */ -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x00}, -	/* Line-Out as Input: disabled */ -	{0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -	{ } /* end */ -}; - -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1981_loopbacks[] = { -	{ 0x12, HDA_OUTPUT, 0 }, /* Front Mic */ -	{ 0x13, HDA_OUTPUT, 0 }, /* Line */ -	{ 0x1b, HDA_OUTPUT, 0 }, /* Aux */ -	{ 0x1c, HDA_OUTPUT, 0 }, /* Mic */ -	{ 0x1d, HDA_OUTPUT, 0 }, /* CD */ -	{ } /* end */ -}; -#endif - -/* - * Patch for HP nx6320 - * - * nx6320 uses EAPD in the reverse way - EAPD-on means the internal - * speaker output enabled _and_ mute-LED off. - */ - -#define AD1981_HP_EVENT		0x37 -#define AD1981_MIC_EVENT	0x38 - -static struct hda_verb ad1981_hp_init_verbs[] = { -	{0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, /* default off */ -	/* pin sensing on HP and Mic jacks */ -	{0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT}, -	{0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT}, -	{} -}; - -/* turn on/off EAPD (+ mute HP) as a master switch */ -static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol, -				   struct snd_ctl_elem_value *ucontrol) +static void ad1981_fixup_hp_eapd(struct hda_codec *codec, +				 const struct hda_fixup *fix, int action)  { -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);  	struct ad198x_spec *spec = codec->spec; -	if (! ad198x_eapd_put(kcontrol, ucontrol)) -		return 0; -	/* change speaker pin appropriately */ -	snd_hda_codec_write(codec, 0x05, 0, -			    AC_VERB_SET_PIN_WIDGET_CONTROL, -			    spec->cur_eapd ? PIN_OUT : 0); -	/* toggle HP mute appropriately */ -	snd_hda_codec_amp_stereo(codec, 0x06, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, -				 spec->cur_eapd ? 0 : HDA_AMP_MUTE); -	return 1; -} - -/* bind volumes of both NID 0x05 and 0x06 */ -static struct hda_bind_ctls ad1981_hp_bind_master_vol = { -	.ops = &snd_hda_bind_vol, -	.values = { -		HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT), -		HDA_COMPOSE_AMP_VAL(0x06, 3, 0, HDA_OUTPUT), -		0 -	}, -}; - -/* mute internal speaker if HP is plugged */ -static void ad1981_hp_automute(struct hda_codec *codec) -{ -	unsigned int present; - -	present = snd_hda_jack_detect(codec, 0x06); -	snd_hda_codec_amp_stereo(codec, 0x05, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); -} - -/* toggle input of built-in and mic jack appropriately */ -static void ad1981_hp_automic(struct hda_codec *codec) -{ -	static struct hda_verb mic_jack_on[] = { -		{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -		{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000}, -		{} -	}; -	static struct hda_verb mic_jack_off[] = { -		{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080}, -		{0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000}, -		{} -	}; -	unsigned int present; - -	present = snd_hda_jack_detect(codec, 0x08); -	if (present) -		snd_hda_sequence_write(codec, mic_jack_on); -	else -		snd_hda_sequence_write(codec, mic_jack_off); -} - -/* unsolicited event for HP jack sensing */ -static void ad1981_hp_unsol_event(struct hda_codec *codec, -				  unsigned int res) -{ -	res >>= 26; -	switch (res) { -	case AD1981_HP_EVENT: -		ad1981_hp_automute(codec); -		break; -	case AD1981_MIC_EVENT: -		ad1981_hp_automic(codec); -		break; +	if (action == HDA_FIXUP_ACT_PRE_PROBE) { +		spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook; +		spec->eapd_nid = 0x05;  	}  } -static struct hda_input_mux ad1981_hp_capture_source = { -	.num_items = 3, -	.items = { -		{ "Mic", 0x0 }, -		{ "Docking-Station", 0x1 }, -		{ "Mix", 0x2 }, -	}, -}; - -static struct snd_kcontrol_new ad1981_hp_mixers[] = { -	HDA_BIND_VOL("Master Playback Volume", &ad1981_hp_bind_master_vol), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.subdevice = HDA_SUBDEV_NID_FLAG | 0x05, -		.name = "Master Playback Switch", -		.info = ad198x_eapd_info, -		.get = ad198x_eapd_get, -		.put = ad1981_hp_master_sw_put, -		.private_value = 0x05, -	}, -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT), -#if 0 -	/* FIXME: analog mic/line loopback doesn't work with my tests... -	 *        (although recording is OK) -	 */ -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Docking-Station Playback Volume", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Docking-Station Playback Switch", 0x13, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT), -	/* FIXME: does this laptop have analog CD connection? */ -	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT), -#endif -	HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Boost", 0x18, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ } /* end */ -}; - -/* initialize jack-sensing, too */ -static int ad1981_hp_init(struct hda_codec *codec) +/* set the upper-limit for mixer amp to 0dB for avoiding the possible + * damage by overloading + */ +static void ad1981_fixup_amp_override(struct hda_codec *codec, +				      const struct hda_fixup *fix, int action)  { -	ad198x_init(codec); -	ad1981_hp_automute(codec); -	ad1981_hp_automic(codec); -	return 0; +	if (action == HDA_FIXUP_ACT_PRE_PROBE) +		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT, +					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | +					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | +					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | +					  (1 << AC_AMPCAP_MUTE_SHIFT));  } -/* configuration for Toshiba Laptops */ -static struct hda_verb ad1981_toshiba_init_verbs[] = { -	{0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x01 }, /* default on */ -	/* pin sensing on HP and Mic jacks */ -	{0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT}, -	{0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT}, -	{} -}; - -static struct snd_kcontrol_new ad1981_toshiba_mixers[] = { -	HDA_CODEC_VOLUME("Amp Volume", 0x1a, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Amp Switch", 0x1a, 0x0, HDA_OUTPUT), -	{ } +enum { +	AD1981_FIXUP_AMP_OVERRIDE, +	AD1981_FIXUP_HP_EAPD,  }; -/* configuration for Lenovo Thinkpad T60 */ -static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Master Playback Switch", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, +static const struct hda_fixup ad1981_fixups[] = { +	[AD1981_FIXUP_AMP_OVERRIDE] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1981_fixup_amp_override,  	}, -	/* identical with AD1983 */ -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -static struct hda_input_mux ad1981_thinkpad_capture_source = { -	.num_items = 3, -	.items = { -		{ "Mic", 0x0 }, -		{ "Mix", 0x2 }, -		{ "CD", 0x4 }, +	[AD1981_FIXUP_HP_EAPD] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1981_fixup_hp_eapd, +		.chained = true, +		.chain_id = AD1981_FIXUP_AMP_OVERRIDE,  	},  }; -/* models */ -enum { -	AD1981_BASIC, -	AD1981_HP, -	AD1981_THINKPAD, -	AD1981_TOSHIBA, -	AD1981_MODELS -}; - -static const char *ad1981_models[AD1981_MODELS] = { -	[AD1981_HP]		= "hp", -	[AD1981_THINKPAD]	= "thinkpad", -	[AD1981_BASIC]		= "basic", -	[AD1981_TOSHIBA]	= "toshiba" -}; - -static struct snd_pci_quirk ad1981_cfg_tbl[] = { -	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD), -	SND_PCI_QUIRK(0x1014, 0x05b7, "Lenovo Z60m", AD1981_THINKPAD), -	/* All HP models */ -	SND_PCI_QUIRK_VENDOR(0x103c, "HP nx", AD1981_HP), -	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA), -	/* Lenovo Thinkpad T60/X60/Z6xx */ -	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1981_THINKPAD), +static const struct snd_pci_quirk ad1981_fixup_tbl[] = { +	SND_PCI_QUIRK_VENDOR(0x1014, "Lenovo", AD1981_FIXUP_AMP_OVERRIDE), +	SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1981_FIXUP_HP_EAPD), +	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo", AD1981_FIXUP_AMP_OVERRIDE),  	/* HP nx6320 (reversed SSID, H/W bug) */ -	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_HP), +	SND_PCI_QUIRK(0x30b0, 0x103c, "HP nx6320", AD1981_FIXUP_HP_EAPD),  	{}  };  static int patch_ad1981(struct hda_codec *codec)  {  	struct ad198x_spec *spec; -	int err, board_config; +	int err; -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) +	err = alloc_ad_spec(codec); +	if (err < 0)  		return -ENOMEM; +	spec = codec->spec; -	codec->spec = spec; - -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); -		return err; -	} +	spec->gen.mixer_nid = 0x0e; +	spec->gen.beep_nid = 0x10;  	set_beep_amp(spec, 0x0d, 0, HDA_OUTPUT); -	spec->multiout.max_channels = 2; -	spec->multiout.num_dacs = ARRAY_SIZE(ad1981_dac_nids); -	spec->multiout.dac_nids = ad1981_dac_nids; -	spec->multiout.dig_out_nid = AD1981_SPDIF_OUT; -	spec->num_adc_nids = 1; -	spec->adc_nids = ad1981_adc_nids; -	spec->capsrc_nids = ad1981_capsrc_nids; -	spec->input_mux = &ad1981_capture_source; -	spec->num_mixers = 1; -	spec->mixers[0] = ad1981_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1981_init_verbs; -	spec->spdif_route = 0; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1981_loopbacks; -#endif -	spec->vmaster_nid = 0x05; - -	codec->patch_ops = ad198x_patch_ops; - -	/* override some parameters */ -	board_config = snd_hda_check_board_config(codec, AD1981_MODELS, -						  ad1981_models, -						  ad1981_cfg_tbl); -	switch (board_config) { -	case AD1981_HP: -		spec->mixers[0] = ad1981_hp_mixers; -		spec->num_init_verbs = 2; -		spec->init_verbs[1] = ad1981_hp_init_verbs; -		spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1981_hp_capture_source; - -		codec->patch_ops.init = ad1981_hp_init; -		codec->patch_ops.unsol_event = ad1981_hp_unsol_event; -		/* set the upper-limit for mixer amp to 0dB for avoiding the -		 * possible damage by overloading -		 */ -		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT, -					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | -					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | -					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | -					  (1 << AC_AMPCAP_MUTE_SHIFT)); -		break; -	case AD1981_THINKPAD: -		spec->mixers[0] = ad1981_thinkpad_mixers; -		spec->input_mux = &ad1981_thinkpad_capture_source; -		/* set the upper-limit for mixer amp to 0dB for avoiding the -		 * possible damage by overloading -		 */ -		snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT, -					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | -					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | -					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | -					  (1 << AC_AMPCAP_MUTE_SHIFT)); -		break; -	case AD1981_TOSHIBA: -		spec->mixers[0] = ad1981_hp_mixers; -		spec->mixers[1] = ad1981_toshiba_mixers; -		spec->num_init_verbs = 2; -		spec->init_verbs[1] = ad1981_toshiba_init_verbs; -		spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1981_hp_capture_source; -		codec->patch_ops.init = ad1981_hp_init; -		codec->patch_ops.unsol_event = ad1981_hp_unsol_event; -		break; -	} +	snd_hda_pick_fixup(codec, NULL, ad1981_fixup_tbl, ad1981_fixups); +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	err = ad198x_parse_auto_config(codec, false); +	if (err < 0) +		goto error; +	err = ad1983_add_spdif_mux_ctl(codec); +	if (err < 0) +		goto error; + +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);  	return 0; + + error: +	snd_hda_gen_free(codec); +	return err;  } @@ -2010,85 +697,7 @@ static int patch_ad1981(struct hda_codec *codec)   *      E/F quad mic array   */ - -/* models */ -enum { -	AD1988_6STACK, -	AD1988_6STACK_DIG, -	AD1988_3STACK, -	AD1988_3STACK_DIG, -	AD1988_LAPTOP, -	AD1988_LAPTOP_DIG, -	AD1988_AUTO, -	AD1988_MODEL_LAST, -}; - -/* reivision id to check workarounds */ -#define AD1988A_REV2		0x100200 - -#define is_rev2(codec) \ -	((codec)->vendor_id == 0x11d41988 && \ -	 (codec)->revision_id == AD1988A_REV2) - -/* - * mixers - */ - -static hda_nid_t ad1988_6stack_dac_nids[4] = { -	0x04, 0x06, 0x05, 0x0a -}; - -static hda_nid_t ad1988_3stack_dac_nids[3] = { -	0x04, 0x05, 0x0a -}; - -/* for AD1988A revision-2, DAC2-4 are swapped */ -static hda_nid_t ad1988_6stack_dac_nids_rev2[4] = { -	0x04, 0x05, 0x0a, 0x06 -}; - -static hda_nid_t ad1988_3stack_dac_nids_rev2[3] = { -	0x04, 0x0a, 0x06 -}; - -static hda_nid_t ad1988_adc_nids[3] = { -	0x08, 0x09, 0x0f -}; - -static hda_nid_t ad1988_capsrc_nids[3] = { -	0x0c, 0x0d, 0x0e -}; - -#define AD1988_SPDIF_OUT		0x02 -#define AD1988_SPDIF_OUT_HDMI	0x0b -#define AD1988_SPDIF_IN		0x07 - -static hda_nid_t ad1989b_slave_dig_outs[] = { -	AD1988_SPDIF_OUT, AD1988_SPDIF_OUT_HDMI, 0 -}; - -static struct hda_input_mux ad1988_6stack_capture_source = { -	.num_items = 5, -	.items = { -		{ "Front Mic", 0x1 },	/* port-B */ -		{ "Line", 0x2 },	/* port-C */ -		{ "Mic", 0x4 },		/* port-E */ -		{ "CD", 0x5 }, -		{ "Mix", 0x9 }, -	}, -}; - -static struct hda_input_mux ad1988_laptop_capture_source = { -	.num_items = 3, -	.items = { -		{ "Mic/Line", 0x1 },	/* port-B */ -		{ "CD", 0x5 }, -		{ "Mix", 0x9 }, -	}, -}; - -/* - */ +#ifdef ENABLE_AD_STATIC_QUIRKS  static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,  			       struct snd_ctl_elem_info *uinfo)  { @@ -2119,1129 +728,213 @@ static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,  		spec->multiout.num_dacs = spec->multiout.max_channels / 2;  	return err;  } +#endif /* ENABLE_AD_STATIC_QUIRKS */ -/* 6-stack mode */ -static struct snd_kcontrol_new ad1988_6stack_mixers1[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x06, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1988_6stack_mixers1_rev2[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x05, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0a, 2, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1988_6stack_mixers2[] = { -	HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT), -	HDA_BIND_MUTE("Surround Playback Switch", 0x2a, 2, HDA_INPUT), -	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x27, 1, 2, HDA_INPUT), -	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x27, 2, 2, HDA_INPUT), -	HDA_BIND_MUTE("Side Playback Switch", 0x28, 2, HDA_INPUT), -	HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT), -	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT), - -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT), - -	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT), - -	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT), - -	{ } /* end */ -}; - -/* 3-stack mode */ -static struct snd_kcontrol_new ad1988_3stack_mixers1[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1988_3stack_mixers1_rev2[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1988_3stack_mixers2[] = { -	HDA_BIND_MUTE("Front Playback Switch", 0x29, 2, HDA_INPUT), -	HDA_BIND_MUTE("Surround Playback Switch", 0x2c, 2, HDA_INPUT), -	HDA_BIND_MUTE_MONO("Center Playback Switch", 0x26, 1, 2, HDA_INPUT), -	HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x26, 2, 2, HDA_INPUT), -	HDA_BIND_MUTE("Headphone Playback Switch", 0x22, 2, HDA_INPUT), -	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT), - -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x4, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x4, HDA_INPUT), - -	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT), - -	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Channel Mode", -		.info = ad198x_ch_mode_info, -		.get = ad198x_ch_mode_get, -		.put = ad198x_ch_mode_put, -	}, - -	{ } /* end */ -}; - -/* laptop mode */ -static struct snd_kcontrol_new ad1988_laptop_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x29, 0x0, HDA_INPUT), -	HDA_BIND_MUTE("Mono Playback Switch", 0x1e, 2, HDA_INPUT), - -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x6, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x1, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x1, HDA_INPUT), - -	HDA_CODEC_VOLUME("Analog Mix Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Analog Mix Playback Switch", 0x21, 0x0, HDA_OUTPUT), - -	HDA_CODEC_VOLUME("Mic Boost", 0x39, 0x0, HDA_OUTPUT), - -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "External Amplifier", -		.subdevice = HDA_SUBDEV_NID_FLAG | 0x12, -		.info = ad198x_eapd_info, -		.get = ad198x_eapd_get, -		.put = ad198x_eapd_put, -		.private_value = 0x12, /* port-D */ -	}, - -	{ } /* end */ -}; - -/* capture */ -static struct snd_kcontrol_new ad1988_capture_mixers[] = { -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 2, 0x0e, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 2, 0x0e, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 3, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ } /* end */ -}; - -static int ad1988_spdif_playback_source_info(struct snd_kcontrol *kcontrol, -					     struct snd_ctl_elem_info *uinfo) +static int ad1988_auto_smux_enum_info(struct snd_kcontrol *kcontrol, +				      struct snd_ctl_elem_info *uinfo)  { -	static char *texts[] = { -		"PCM", "ADC1", "ADC2", "ADC3" +	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); +	static const char * const texts[] = { +		"PCM", "ADC1", "ADC2", "ADC3",  	}; -	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; -	uinfo->count = 1; -	uinfo->value.enumerated.items = 4; -	if (uinfo->value.enumerated.item >= 4) -		uinfo->value.enumerated.item = 3; -	strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); -	return 0; +	int num_conns = snd_hda_get_num_conns(codec, 0x0b) + 1; +	if (num_conns > 4) +		num_conns = 4; +	return snd_hda_enum_helper_info(kcontrol, uinfo, num_conns, texts);  } -static int ad1988_spdif_playback_source_get(struct snd_kcontrol *kcontrol, -					    struct snd_ctl_elem_value *ucontrol) +static int ad1988_auto_smux_enum_get(struct snd_kcontrol *kcontrol, +				     struct snd_ctl_elem_value *ucontrol)  {  	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	unsigned int sel; - -	sel = snd_hda_codec_read(codec, 0x1d, 0, AC_VERB_GET_AMP_GAIN_MUTE, -				 AC_AMP_GET_INPUT); -	if (!(sel & 0x80)) -		ucontrol->value.enumerated.item[0] = 0; -	else { -		sel = snd_hda_codec_read(codec, 0x0b, 0, -					 AC_VERB_GET_CONNECT_SEL, 0); -		if (sel < 3) -			sel++; -		else -			sel = 0; -		ucontrol->value.enumerated.item[0] = sel; -	} +	struct ad198x_spec *spec = codec->spec; + +	ucontrol->value.enumerated.item[0] = spec->cur_smux;  	return 0;  } -static int ad1988_spdif_playback_source_put(struct snd_kcontrol *kcontrol, -					    struct snd_ctl_elem_value *ucontrol) +static int ad1988_auto_smux_enum_put(struct snd_kcontrol *kcontrol, +				     struct snd_ctl_elem_value *ucontrol)  {  	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	unsigned int val, sel; -	int change; +	struct ad198x_spec *spec = codec->spec; +	unsigned int val = ucontrol->value.enumerated.item[0]; +	struct nid_path *path; +	int num_conns = snd_hda_get_num_conns(codec, 0x0b) + 1; -	val = ucontrol->value.enumerated.item[0]; -	if (val > 3) +	if (val >= num_conns)  		return -EINVAL; -	if (!val) { -		sel = snd_hda_codec_read(codec, 0x1d, 0, -					 AC_VERB_GET_AMP_GAIN_MUTE, -					 AC_AMP_GET_INPUT); -		change = sel & 0x80; -		if (change) { -			snd_hda_codec_write_cache(codec, 0x1d, 0, -						  AC_VERB_SET_AMP_GAIN_MUTE, -						  AMP_IN_UNMUTE(0)); -			snd_hda_codec_write_cache(codec, 0x1d, 0, -						  AC_VERB_SET_AMP_GAIN_MUTE, -						  AMP_IN_MUTE(1)); -		} -	} else { -		sel = snd_hda_codec_read(codec, 0x1d, 0, -					 AC_VERB_GET_AMP_GAIN_MUTE, -					 AC_AMP_GET_INPUT | 0x01); -		change = sel & 0x80; -		if (change) { -			snd_hda_codec_write_cache(codec, 0x1d, 0, -						  AC_VERB_SET_AMP_GAIN_MUTE, -						  AMP_IN_MUTE(0)); -			snd_hda_codec_write_cache(codec, 0x1d, 0, -						  AC_VERB_SET_AMP_GAIN_MUTE, -						  AMP_IN_UNMUTE(1)); -		} -		sel = snd_hda_codec_read(codec, 0x0b, 0, -					 AC_VERB_GET_CONNECT_SEL, 0) + 1; -		change |= sel != val; -		if (change) -			snd_hda_codec_write_cache(codec, 0x0b, 0, -						  AC_VERB_SET_CONNECT_SEL, -						  val - 1); -	} -	return change; -} - -static struct snd_kcontrol_new ad1988_spdif_out_mixers[] = { -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "IEC958 Playback Source", -		.subdevice = HDA_SUBDEV_NID_FLAG | 0x1b, -		.info = ad1988_spdif_playback_source_info, -		.get = ad1988_spdif_playback_source_get, -		.put = ad1988_spdif_playback_source_put, -	}, -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1988_spdif_in_mixers[] = { -	HDA_CODEC_VOLUME("IEC958 Capture Volume", 0x1c, 0x0, HDA_INPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1989_spdif_out_mixers[] = { -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("HDMI Playback Volume", 0x1d, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -/* - * initialization verbs - */ - -/* - * for 6-stack (+dig) - */ -static struct hda_verb ad1988_6stack_init_verbs[] = { -	/* Front, Surround, CLFE, side DAC; unmute as default */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-A front headphon path */ -	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */ -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	/* Port-D line-out path */ -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Port-F surround path */ -	{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x2a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Port-G CLFE path */ -	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x27, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Port-H side path */ -	{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x28, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x25, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Mono out path */ -	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */ -	/* Port-B front mic-in path */ -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Port-C line-in path */ -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Port-E mic-in path */ -	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x34, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Analog CD Input */ -	{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */ - -	{ } -}; - -static struct hda_verb ad1988_capture_init_verbs[] = { -	/* mute analog mix */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, -	/* select ADCs - front-mic */ -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1}, - -	{ } -}; - -static struct hda_verb ad1988_spdif_init_verbs[] = { -	/* SPDIF out sel */ -	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */ -	{0x0b, AC_VERB_SET_CONNECT_SEL, 0x0}, /* ADC1 */ -	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	/* SPDIF out pin */ -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ - -	{ } -}; - -static struct hda_verb ad1988_spdif_in_init_verbs[] = { -	/* unmute SPDIF input pin */ -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{ } -}; - -/* AD1989 has no ADC -> SPDIF route */ -static struct hda_verb ad1989_spdif_init_verbs[] = { -	/* SPDIF-1 out pin */ -	{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	/* SPDIF-2/HDMI out pin */ -	{0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{0x1d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	{ } -}; - -/* - * verbs for 3stack (+dig) - */ -static struct hda_verb ad1988_3stack_ch2_init[] = { -	/* set port-C to line-in */ -	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, -	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, -	/* set port-E to mic-in */ -	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, -	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, -	{ } /* end */ -}; - -static struct hda_verb ad1988_3stack_ch6_init[] = { -	/* set port-C to surround out */ -	{ 0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{ 0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, -	/* set port-E to CLFE out */ -	{ 0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, -	{ 0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, -	{ } /* end */ -}; - -static struct hda_channel_mode ad1988_3stack_modes[2] = { -	{ 2, ad1988_3stack_ch2_init }, -	{ 6, ad1988_3stack_ch6_init }, -}; - -static struct hda_verb ad1988_3stack_init_verbs[] = { -	/* Front, Surround, CLFE, side DAC; unmute as default */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-A front headphon path */ -	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */ -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	/* Port-D line-out path */ -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Mono out path */ -	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */ -	/* Port-B front mic-in path */ -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Port-C line-in/surround path - 6ch mode as default */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x31, AC_VERB_SET_CONNECT_SEL, 0x0}, /* output sel: DAC 0x05 */ -	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* Port-E mic-in/CLFE path - 6ch mode as default */ -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x32, AC_VERB_SET_CONNECT_SEL, 0x1}, /* output sel: DAC 0x0a */ -	{0x34, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* mute analog mix */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, -	/* select ADCs - front-mic */ -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */ -	{ } -}; - -/* - * verbs for laptop mode (+dig) - */ -static struct hda_verb ad1988_laptop_hp_on[] = { -	/* unmute port-A and mute port-D */ -	{ 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, -	{ 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, -	{ } /* end */ -}; -static struct hda_verb ad1988_laptop_hp_off[] = { -	/* mute port-A and unmute port-D */ -	{ 0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, -	{ 0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, -	{ } /* end */ -}; - -#define AD1988_HP_EVENT	0x01 - -static struct hda_verb ad1988_laptop_init_verbs[] = { -	/* Front, Surround, CLFE, side DAC; unmute as default */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-A front headphon path */ -	{0x37, AC_VERB_SET_CONNECT_SEL, 0x01}, /* DAC1:04h */ -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	/* unsolicited event for pin-sense */ -	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1988_HP_EVENT }, -	/* Port-D line-out path + EAPD */ -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x00}, /* EAPD-off */ -	/* Mono out path */ -	{0x36, AC_VERB_SET_CONNECT_SEL, 0x1}, /* DAC1:04h */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, 0xb01f}, /* unmute, 0dB */ -	/* Port-B mic-in path */ -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Port-C docking station - try to output */ -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x33, AC_VERB_SET_CONNECT_SEL, 0x0}, -	/* mute analog mix */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, -	/* select ADCs - mic */ -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x1}, -	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */ -	{ } -}; - -static void ad1988_laptop_unsol_event(struct hda_codec *codec, unsigned int res) -{ -	if ((res >> 26) != AD1988_HP_EVENT) -		return; -	if (snd_hda_jack_detect(codec, 0x11)) -		snd_hda_sequence_write(codec, ad1988_laptop_hp_on); -	else -		snd_hda_sequence_write(codec, ad1988_laptop_hp_off); -}  - -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1988_loopbacks[] = { -	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */ -	{ 0x20, HDA_INPUT, 1 }, /* Line */ -	{ 0x20, HDA_INPUT, 4 }, /* Mic */ -	{ 0x20, HDA_INPUT, 6 }, /* CD */ -	{ } /* end */ -}; -#endif - -/* - * Automatic parse of I/O pins from the BIOS configuration - */ - -enum { -	AD_CTL_WIDGET_VOL, -	AD_CTL_WIDGET_MUTE, -	AD_CTL_BIND_MUTE, -}; -static struct snd_kcontrol_new ad1988_control_templates[] = { -	HDA_CODEC_VOLUME(NULL, 0, 0, 0), -	HDA_CODEC_MUTE(NULL, 0, 0, 0), -	HDA_BIND_MUTE(NULL, 0, 0, 0), -}; - -/* add dynamic controls */ -static int add_control(struct ad198x_spec *spec, int type, const char *name, -		       unsigned long val) -{ -	struct snd_kcontrol_new *knew; - -	snd_array_init(&spec->kctls, sizeof(*knew), 32); -	knew = snd_array_new(&spec->kctls); -	if (!knew) -		return -ENOMEM; -	*knew = ad1988_control_templates[type]; -	knew->name = kstrdup(name, GFP_KERNEL); -	if (! knew->name) -		return -ENOMEM; -	if (get_amp_nid_(val)) -		knew->subdevice = HDA_SUBDEV_AMP_FLAG; -	knew->private_value = val; -	return 0; -} - -#define AD1988_PIN_CD_NID		0x18 -#define AD1988_PIN_BEEP_NID		0x10 - -static hda_nid_t ad1988_mixer_nids[8] = { -	/* A     B     C     D     E     F     G     H */ -	0x22, 0x2b, 0x2c, 0x29, 0x26, 0x2a, 0x27, 0x28 -}; +	if (spec->cur_smux == val) +		return 0; -static inline hda_nid_t ad1988_idx_to_dac(struct hda_codec *codec, int idx) -{ -	static hda_nid_t idx_to_dac[8] = { -		/* A     B     C     D     E     F     G     H */ -		0x04, 0x06, 0x05, 0x04, 0x0a, 0x06, 0x05, 0x0a -	}; -	static hda_nid_t idx_to_dac_rev2[8] = { -		/* A     B     C     D     E     F     G     H */ -		0x04, 0x05, 0x0a, 0x04, 0x06, 0x05, 0x0a, 0x06 -	}; -	if (is_rev2(codec)) -		return idx_to_dac_rev2[idx]; -	else -		return idx_to_dac[idx]; +	mutex_lock(&codec->control_mutex); +	codec->cached_write = 1; +	path = snd_hda_get_path_from_idx(codec, +					 spec->smux_paths[spec->cur_smux]); +	if (path) +		snd_hda_activate_path(codec, path, false, true); +	path = snd_hda_get_path_from_idx(codec, spec->smux_paths[val]); +	if (path) +		snd_hda_activate_path(codec, path, true, true); +	spec->cur_smux = val; +	codec->cached_write = 0; +	mutex_unlock(&codec->control_mutex); +	snd_hda_codec_flush_cache(codec); /* flush the updates */ +	return 1;  } -static hda_nid_t ad1988_boost_nids[8] = { -	0x38, 0x39, 0x3a, 0x3d, 0x3c, 0x3b, 0, 0 +static struct snd_kcontrol_new ad1988_auto_smux_mixer = { +	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, +	.name = "IEC958 Playback Source", +	.info = ad1988_auto_smux_enum_info, +	.get = ad1988_auto_smux_enum_get, +	.put = ad1988_auto_smux_enum_put,  }; -static int ad1988_pin_idx(hda_nid_t nid) -{ -	static hda_nid_t ad1988_io_pins[8] = { -		0x11, 0x14, 0x15, 0x12, 0x17, 0x16, 0x24, 0x25 -	}; -	int i; -	for (i = 0; i < ARRAY_SIZE(ad1988_io_pins); i++) -		if (ad1988_io_pins[i] == nid) -			return i; -	return 0; /* should be -1 */ -} - -static int ad1988_pin_to_loopback_idx(hda_nid_t nid) -{ -	static int loopback_idx[8] = { -		2, 0, 1, 3, 4, 5, 1, 4 -	}; -	switch (nid) { -	case AD1988_PIN_CD_NID: -		return 6; -	default: -		return loopback_idx[ad1988_pin_idx(nid)]; -	} -} - -static int ad1988_pin_to_adc_idx(hda_nid_t nid) -{ -	static int adc_idx[8] = { -		0, 1, 2, 8, 4, 3, 6, 7 -	}; -	switch (nid) { -	case AD1988_PIN_CD_NID: -		return 5; -	default: -		return adc_idx[ad1988_pin_idx(nid)]; -	} -} - -/* fill in the dac_nids table from the parsed pin configuration */ -static int ad1988_auto_fill_dac_nids(struct hda_codec *codec, -				     const struct auto_pin_cfg *cfg) +static int ad1988_auto_init(struct hda_codec *codec)  {  	struct ad198x_spec *spec = codec->spec; -	int i, idx; - -	spec->multiout.dac_nids = spec->private_dac_nids; - -	/* check the pins hardwired to audio widget */ -	for (i = 0; i < cfg->line_outs; i++) { -		idx = ad1988_pin_idx(cfg->line_out_pins[i]); -		spec->multiout.dac_nids[i] = ad1988_idx_to_dac(codec, idx); -	} -	spec->multiout.num_dacs = cfg->line_outs; -	return 0; -} - -/* add playback controls from the parsed DAC table */ -static int ad1988_auto_create_multi_out_ctls(struct ad198x_spec *spec, -					     const struct auto_pin_cfg *cfg) -{ -	char name[32]; -	static const char *chname[4] = { "Front", "Surround", NULL /*CLFE*/, "Side" }; -	hda_nid_t nid;  	int i, err; -	for (i = 0; i < cfg->line_outs; i++) { -		hda_nid_t dac = spec->multiout.dac_nids[i]; -		if (! dac) -			continue; -		nid = ad1988_mixer_nids[ad1988_pin_idx(cfg->line_out_pins[i])]; -		if (i == 2) { -			/* Center/LFE */ -			err = add_control(spec, AD_CTL_WIDGET_VOL, -					  "Center Playback Volume", -					  HDA_COMPOSE_AMP_VAL(dac, 1, 0, HDA_OUTPUT)); -			if (err < 0) -				return err; -			err = add_control(spec, AD_CTL_WIDGET_VOL, -					  "LFE Playback Volume", -					  HDA_COMPOSE_AMP_VAL(dac, 2, 0, HDA_OUTPUT)); -			if (err < 0) -				return err; -			err = add_control(spec, AD_CTL_BIND_MUTE, -					  "Center Playback Switch", -					  HDA_COMPOSE_AMP_VAL(nid, 1, 2, HDA_INPUT)); -			if (err < 0) -				return err; -			err = add_control(spec, AD_CTL_BIND_MUTE, -					  "LFE Playback Switch", -					  HDA_COMPOSE_AMP_VAL(nid, 2, 2, HDA_INPUT)); -			if (err < 0) -				return err; -		} else { -			sprintf(name, "%s Playback Volume", chname[i]); -			err = add_control(spec, AD_CTL_WIDGET_VOL, name, -					  HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT)); -			if (err < 0) -				return err; -			sprintf(name, "%s Playback Switch", chname[i]); -			err = add_control(spec, AD_CTL_BIND_MUTE, name, -					  HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT)); -			if (err < 0) -				return err; -		} -	} -	return 0; -} - -/* add playback controls for speaker and HP outputs */ -static int ad1988_auto_create_extra_out(struct hda_codec *codec, hda_nid_t pin, -					const char *pfx) -{ -	struct ad198x_spec *spec = codec->spec; -	hda_nid_t nid; -	int i, idx, err; -	char name[32]; - -	if (! pin) -		return 0; - -	idx = ad1988_pin_idx(pin); -	nid = ad1988_idx_to_dac(codec, idx); -	/* check whether the corresponding DAC was already taken */ -	for (i = 0; i < spec->autocfg.line_outs; i++) { -		hda_nid_t pin = spec->autocfg.line_out_pins[i]; -		hda_nid_t dac = ad1988_idx_to_dac(codec, ad1988_pin_idx(pin)); -		if (dac == nid) -			break; -	} -	if (i >= spec->autocfg.line_outs) { -		/* specify the DAC as the extra output */ -		if (!spec->multiout.hp_nid) -			spec->multiout.hp_nid = nid; -		else -			spec->multiout.extra_out_nid[0] = nid; -		/* control HP volume/switch on the output mixer amp */ -		sprintf(name, "%s Playback Volume", pfx); -		err = add_control(spec, AD_CTL_WIDGET_VOL, name, -				  HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT)); -		if (err < 0) -			return err; -	} -	nid = ad1988_mixer_nids[idx]; -	sprintf(name, "%s Playback Switch", pfx); -	if ((err = add_control(spec, AD_CTL_BIND_MUTE, name, -			       HDA_COMPOSE_AMP_VAL(nid, 3, 2, HDA_INPUT))) < 0) -		return err; -	return 0; -} - -/* create input playback/capture controls for the given pin */ -static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin, -			    const char *ctlname, int ctlidx, int boost) -{ -	char name[32]; -	int err, idx; - -	sprintf(name, "%s Playback Volume", ctlname); -	idx = ad1988_pin_to_loopback_idx(pin); -	if ((err = add_control(spec, AD_CTL_WIDGET_VOL, name, -			       HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) < 0) -		return err; -	sprintf(name, "%s Playback Switch", ctlname); -	if ((err = add_control(spec, AD_CTL_WIDGET_MUTE, name, -			       HDA_COMPOSE_AMP_VAL(0x20, 3, idx, HDA_INPUT))) < 0) +	err = snd_hda_gen_init(codec); +	if (err < 0)  		return err; -	if (boost) { -		hda_nid_t bnid; -		idx = ad1988_pin_idx(pin); -		bnid = ad1988_boost_nids[idx]; -		if (bnid) { -			sprintf(name, "%s Boost", ctlname); -			return add_control(spec, AD_CTL_WIDGET_VOL, name, -					   HDA_COMPOSE_AMP_VAL(bnid, 3, idx, HDA_OUTPUT)); +	if (!spec->gen.autocfg.dig_outs) +		return 0; -		} +	for (i = 0; i < 4; i++) { +		struct nid_path *path; +		path = snd_hda_get_path_from_idx(codec, spec->smux_paths[i]); +		if (path) +			snd_hda_activate_path(codec, path, path->active, false);  	} -	return 0; -} - -/* create playback/capture controls for input pins */ -static int ad1988_auto_create_analog_input_ctls(struct hda_codec *codec, -						const struct auto_pin_cfg *cfg) -{ -	struct ad198x_spec *spec = codec->spec; -	struct hda_input_mux *imux = &spec->private_imux; -	int i, err, type, type_idx; - -	for (i = 0; i < cfg->num_inputs; i++) { -		const char *label; -		type = cfg->inputs[i].type; -		label = hda_get_autocfg_input_label(codec, cfg, i); -		snd_hda_add_imux_item(imux, label, -				      ad1988_pin_to_adc_idx(cfg->inputs[i].pin), -				      &type_idx); -		err = new_analog_input(spec, cfg->inputs[i].pin, -				       label, type_idx, -				       type == AUTO_PIN_MIC); -		if (err < 0) -			return err; -	} -	snd_hda_add_imux_item(imux, "Mix", 9, NULL); - -	if ((err = add_control(spec, AD_CTL_WIDGET_VOL, -			       "Analog Mix Playback Volume", -			       HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) < 0) -		return err; -	if ((err = add_control(spec, AD_CTL_WIDGET_MUTE, -			       "Analog Mix Playback Switch", -			       HDA_COMPOSE_AMP_VAL(0x21, 3, 0x0, HDA_OUTPUT))) < 0) -		return err;  	return 0;  } -static void ad1988_auto_set_output_and_unmute(struct hda_codec *codec, -					      hda_nid_t nid, int pin_type, -					      int dac_idx) -{ -	/* set as output */ -	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, pin_type); -	snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); -	switch (nid) { -	case 0x11: /* port-A - DAC 04 */ -		snd_hda_codec_write(codec, 0x37, 0, AC_VERB_SET_CONNECT_SEL, 0x01); -		break; -	case 0x14: /* port-B - DAC 06 */ -		snd_hda_codec_write(codec, 0x30, 0, AC_VERB_SET_CONNECT_SEL, 0x02); -		break; -	case 0x15: /* port-C - DAC 05 */ -		snd_hda_codec_write(codec, 0x31, 0, AC_VERB_SET_CONNECT_SEL, 0x00); -		break; -	case 0x17: /* port-E - DAC 0a */ -		snd_hda_codec_write(codec, 0x32, 0, AC_VERB_SET_CONNECT_SEL, 0x01); -		break; -	case 0x13: /* mono - DAC 04 */ -		snd_hda_codec_write(codec, 0x36, 0, AC_VERB_SET_CONNECT_SEL, 0x01); -		break; -	} -} - -static void ad1988_auto_init_multi_out(struct hda_codec *codec) +static int ad1988_add_spdif_mux_ctl(struct hda_codec *codec)  {  	struct ad198x_spec *spec = codec->spec; -	int i; +	int i, num_conns; +	/* we create four static faked paths, since AD codecs have odd +	 * widget connections regarding the SPDIF out source +	 */ +	static struct nid_path fake_paths[4] = { +		{ +			.depth = 3, +			.path = { 0x02, 0x1d, 0x1b }, +			.idx = { 0, 0, 0 }, +			.multi = { 0, 0, 0 }, +		}, +		{ +			.depth = 4, +			.path = { 0x08, 0x0b, 0x1d, 0x1b }, +			.idx = { 0, 0, 1, 0 }, +			.multi = { 0, 1, 0, 0 }, +		}, +		{ +			.depth = 4, +			.path = { 0x09, 0x0b, 0x1d, 0x1b }, +			.idx = { 0, 1, 1, 0 }, +			.multi = { 0, 1, 0, 0 }, +		}, +		{ +			.depth = 4, +			.path = { 0x0f, 0x0b, 0x1d, 0x1b }, +			.idx = { 0, 2, 1, 0 }, +			.multi = { 0, 1, 0, 0 }, +		}, +	}; -	for (i = 0; i < spec->autocfg.line_outs; i++) { -		hda_nid_t nid = spec->autocfg.line_out_pins[i]; -		ad1988_auto_set_output_and_unmute(codec, nid, PIN_OUT, i); -	} -} +	/* SPDIF source mux appears to be present only on AD1988A */ +	if (!spec->gen.autocfg.dig_outs || +	    get_wcaps_type(get_wcaps(codec, 0x1d)) != AC_WID_AUD_MIX) +		return 0; -static void ad1988_auto_init_extra_out(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	hda_nid_t pin; - -	pin = spec->autocfg.speaker_pins[0]; -	if (pin) /* connect to front */ -		ad1988_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0); -	pin = spec->autocfg.hp_pins[0]; -	if (pin) /* connect to front */ -		ad1988_auto_set_output_and_unmute(codec, pin, PIN_HP, 0); -} +	num_conns = snd_hda_get_num_conns(codec, 0x0b) + 1; +	if (num_conns != 3 && num_conns != 4) +		return 0; -static void ad1988_auto_init_analog_input(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	const struct auto_pin_cfg *cfg = &spec->autocfg; -	int i, idx; - -	for (i = 0; i < cfg->num_inputs; i++) { -		hda_nid_t nid = cfg->inputs[i].pin; -		switch (nid) { -		case 0x15: /* port-C */ -			snd_hda_codec_write(codec, 0x33, 0, AC_VERB_SET_CONNECT_SEL, 0x0); -			break; -		case 0x17: /* port-E */ -			snd_hda_codec_write(codec, 0x34, 0, AC_VERB_SET_CONNECT_SEL, 0x0); -			break; -		} -		snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, -				    i == AUTO_PIN_MIC ? PIN_VREF80 : PIN_IN); -		if (nid != AD1988_PIN_CD_NID) -			snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, -					    AMP_OUT_MUTE); -		idx = ad1988_pin_idx(nid); -		if (ad1988_boost_nids[idx]) -			snd_hda_codec_write(codec, ad1988_boost_nids[idx], 0, -					    AC_VERB_SET_AMP_GAIN_MUTE, -					    AMP_OUT_ZERO); +	for (i = 0; i < num_conns; i++) { +		struct nid_path *path = snd_array_new(&spec->gen.paths); +		if (!path) +			return -ENOMEM; +		*path = fake_paths[i]; +		if (!i) +			path->active = 1; +		spec->smux_paths[i] = snd_hda_get_path_idx(codec, path);  	} -} - -/* parse the BIOS configuration and set up the alc_spec */ -/* return 1 if successful, 0 if the proper config is not found, or a negative error code */ -static int ad1988_parse_auto_config(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	int err; - -	if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0) -		return err; -	if ((err = ad1988_auto_fill_dac_nids(codec, &spec->autocfg)) < 0) -		return err; -	if (! spec->autocfg.line_outs) -		return 0; /* can't find valid BIOS pin config */ -	if ((err = ad1988_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 || -	    (err = ad1988_auto_create_extra_out(codec, -						spec->autocfg.speaker_pins[0], -						"Speaker")) < 0 || -	    (err = ad1988_auto_create_extra_out(codec, spec->autocfg.hp_pins[0], -						"Headphone")) < 0 || -	    (err = ad1988_auto_create_analog_input_ctls(codec, &spec->autocfg)) < 0) -		return err; -	spec->multiout.max_channels = spec->multiout.num_dacs * 2; - -	if (spec->autocfg.dig_outs) -		spec->multiout.dig_out_nid = AD1988_SPDIF_OUT; -	if (spec->autocfg.dig_in_pin) -		spec->dig_in_nid = AD1988_SPDIF_IN; - -	if (spec->kctls.list) -		spec->mixers[spec->num_mixers++] = spec->kctls.list; - -	spec->init_verbs[spec->num_init_verbs++] = ad1988_6stack_init_verbs; - -	spec->input_mux = &spec->private_imux; +	if (!snd_hda_gen_add_kctl(&spec->gen, NULL, &ad1988_auto_smux_mixer)) +		return -ENOMEM; -	return 1; -} +	codec->patch_ops.init = ad1988_auto_init; -/* init callback for auto-configuration model -- overriding the default init */ -static int ad1988_auto_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1988_auto_init_multi_out(codec); -	ad1988_auto_init_extra_out(codec); -	ad1988_auto_init_analog_input(codec);  	return 0;  } -  /*   */ -static const char *ad1988_models[AD1988_MODEL_LAST] = { -	[AD1988_6STACK]		= "6stack", -	[AD1988_6STACK_DIG]	= "6stack-dig", -	[AD1988_3STACK]		= "3stack", -	[AD1988_3STACK_DIG]	= "3stack-dig", -	[AD1988_LAPTOP]		= "laptop", -	[AD1988_LAPTOP_DIG]	= "laptop-dig", -	[AD1988_AUTO]		= "auto", +enum { +	AD1988_FIXUP_6STACK_DIG, +}; + +static const struct hda_fixup ad1988_fixups[] = { +	[AD1988_FIXUP_6STACK_DIG] = { +		.type = HDA_FIXUP_PINS, +		.v.pins = (const struct hda_pintbl[]) { +			{ 0x11, 0x02214130 }, /* front-hp */ +			{ 0x12, 0x01014010 }, /* line-out */ +			{ 0x14, 0x02a19122 }, /* front-mic */ +			{ 0x15, 0x01813021 }, /* line-in */ +			{ 0x16, 0x01011012 }, /* line-out */ +			{ 0x17, 0x01a19020 }, /* mic */ +			{ 0x1b, 0x0145f1f0 }, /* SPDIF */ +			{ 0x24, 0x01016011 }, /* line-out */ +			{ 0x25, 0x01012013 }, /* line-out */ +			{ } +		} +	},  }; -static struct snd_pci_quirk ad1988_cfg_tbl[] = { -	SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG), -	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG), -	SND_PCI_QUIRK(0x1043, 0x8277, "Asus P5K-E/WIFI-AP", AD1988_6STACK_DIG), -	SND_PCI_QUIRK(0x1043, 0x8311, "Asus P5Q-Premium/Pro", AD1988_6STACK_DIG), +static const struct hda_model_fixup ad1988_fixup_models[] = { +	{ .id = AD1988_FIXUP_6STACK_DIG, .name = "6stack-dig" },  	{}  };  static int patch_ad1988(struct hda_codec *codec)  {  	struct ad198x_spec *spec; -	int err, board_config; - -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; - -	codec->spec = spec; - -	if (is_rev2(codec)) -		snd_printk(KERN_INFO "patch_analog: AD1988A rev.2 is detected, enable workarounds\n"); - -	board_config = snd_hda_check_board_config(codec, AD1988_MODEL_LAST, -						  ad1988_models, ad1988_cfg_tbl); -	if (board_config < 0) { -		printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n", -		       codec->chip_name); -		board_config = AD1988_AUTO; -	} - -	if (board_config == AD1988_AUTO) { -		/* automatic parse from the BIOS config */ -		err = ad1988_parse_auto_config(codec); -		if (err < 0) { -			ad198x_free(codec); -			return err; -		} else if (! err) { -			printk(KERN_INFO "hda_codec: Cannot set up configuration from BIOS.  Using 6-stack mode...\n"); -			board_config = AD1988_6STACK; -		} -	} +	int err; -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); +	err = alloc_ad_spec(codec); +	if (err < 0)  		return err; -	} -	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); +	spec = codec->spec; -	switch (board_config) { -	case AD1988_6STACK: -	case AD1988_6STACK_DIG: -		spec->multiout.max_channels = 8; -		spec->multiout.num_dacs = 4; -		if (is_rev2(codec)) -			spec->multiout.dac_nids = ad1988_6stack_dac_nids_rev2; -		else -			spec->multiout.dac_nids = ad1988_6stack_dac_nids; -		spec->input_mux = &ad1988_6stack_capture_source; -		spec->num_mixers = 2; -		if (is_rev2(codec)) -			spec->mixers[0] = ad1988_6stack_mixers1_rev2; -		else -			spec->mixers[0] = ad1988_6stack_mixers1; -		spec->mixers[1] = ad1988_6stack_mixers2; -		spec->num_init_verbs = 1; -		spec->init_verbs[0] = ad1988_6stack_init_verbs; -		if (board_config == AD1988_6STACK_DIG) { -			spec->multiout.dig_out_nid = AD1988_SPDIF_OUT; -			spec->dig_in_nid = AD1988_SPDIF_IN; -		} -		break; -	case AD1988_3STACK: -	case AD1988_3STACK_DIG: -		spec->multiout.max_channels = 6; -		spec->multiout.num_dacs = 3; -		if (is_rev2(codec)) -			spec->multiout.dac_nids = ad1988_3stack_dac_nids_rev2; -		else -			spec->multiout.dac_nids = ad1988_3stack_dac_nids; -		spec->input_mux = &ad1988_6stack_capture_source; -		spec->channel_mode = ad1988_3stack_modes; -		spec->num_channel_mode = ARRAY_SIZE(ad1988_3stack_modes); -		spec->num_mixers = 2; -		if (is_rev2(codec)) -			spec->mixers[0] = ad1988_3stack_mixers1_rev2; -		else -			spec->mixers[0] = ad1988_3stack_mixers1; -		spec->mixers[1] = ad1988_3stack_mixers2; -		spec->num_init_verbs = 1; -		spec->init_verbs[0] = ad1988_3stack_init_verbs; -		if (board_config == AD1988_3STACK_DIG) -			spec->multiout.dig_out_nid = AD1988_SPDIF_OUT; -		break; -	case AD1988_LAPTOP: -	case AD1988_LAPTOP_DIG: -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		spec->multiout.dac_nids = ad1988_3stack_dac_nids; -		spec->input_mux = &ad1988_laptop_capture_source; -		spec->num_mixers = 1; -		spec->mixers[0] = ad1988_laptop_mixers; -		spec->inv_eapd = 1; /* inverted EAPD */ -		spec->num_init_verbs = 1; -		spec->init_verbs[0] = ad1988_laptop_init_verbs; -		if (board_config == AD1988_LAPTOP_DIG) -			spec->multiout.dig_out_nid = AD1988_SPDIF_OUT; -		break; -	} +	spec->gen.mixer_nid = 0x20; +	spec->gen.mixer_merge_nid = 0x21; +	spec->gen.beep_nid = 0x10; +	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); -	spec->num_adc_nids = ARRAY_SIZE(ad1988_adc_nids); -	spec->adc_nids = ad1988_adc_nids; -	spec->capsrc_nids = ad1988_capsrc_nids; -	spec->mixers[spec->num_mixers++] = ad1988_capture_mixers; -	spec->init_verbs[spec->num_init_verbs++] = ad1988_capture_init_verbs; -	if (spec->multiout.dig_out_nid) { -		if (codec->vendor_id >= 0x11d4989a) { -			spec->mixers[spec->num_mixers++] = -				ad1989_spdif_out_mixers; -			spec->init_verbs[spec->num_init_verbs++] = -				ad1989_spdif_init_verbs; -			codec->slave_dig_outs = ad1989b_slave_dig_outs; -		} else { -			spec->mixers[spec->num_mixers++] = -				ad1988_spdif_out_mixers; -			spec->init_verbs[spec->num_init_verbs++] = -				ad1988_spdif_init_verbs; -		} -	} -	if (spec->dig_in_nid && codec->vendor_id < 0x11d4989a) { -		spec->mixers[spec->num_mixers++] = ad1988_spdif_in_mixers; -		spec->init_verbs[spec->num_init_verbs++] = -			ad1988_spdif_in_init_verbs; -	} +	snd_hda_pick_fixup(codec, ad1988_fixup_models, NULL, ad1988_fixups); +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); -	codec->patch_ops = ad198x_patch_ops; -	switch (board_config) { -	case AD1988_AUTO: -		codec->patch_ops.init = ad1988_auto_init; -		break; -	case AD1988_LAPTOP: -	case AD1988_LAPTOP_DIG: -		codec->patch_ops.unsol_event = ad1988_laptop_unsol_event; -		break; -	} -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1988_loopbacks; -#endif -	spec->vmaster_nid = 0x04; +	err = ad198x_parse_auto_config(codec, true); +	if (err < 0) +		goto error; +	err = ad1988_add_spdif_mux_ctl(codec); +	if (err < 0) +		goto error; -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);  	return 0; + + error: +	snd_hda_gen_free(codec); +	return err;  } @@ -3257,440 +950,6 @@ static int patch_ad1988(struct hda_codec *codec)   *   * AD1984 = AD1884 + two digital mic-ins   * - * FIXME: - * For simplicity, we share the single DAC for both HP and line-outs - * right now.  The inidividual playbacks could be easily implemented, - * but no build-up framework is given, so far. - */ - -static hda_nid_t ad1884_dac_nids[1] = { -	0x04, -}; - -static hda_nid_t ad1884_adc_nids[2] = { -	0x08, 0x09, -}; - -static hda_nid_t ad1884_capsrc_nids[2] = { -	0x0c, 0x0d, -}; - -#define AD1884_SPDIF_OUT	0x02 - -static struct hda_input_mux ad1884_capture_source = { -	.num_items = 4, -	.items = { -		{ "Front Mic", 0x0 }, -		{ "Mic", 0x1 }, -		{ "CD", 0x2 }, -		{ "Mix", 0x3 }, -	}, -}; - -static struct snd_kcontrol_new ad1884_base_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	/* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */ -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 2, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	/* SPDIF controls */ -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		/* identical with ad1983 */ -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1984_dmic_mixers[] = { -	HDA_CODEC_VOLUME("Digital Mic Capture Volume", 0x05, 0x0, HDA_INPUT), -	HDA_CODEC_MUTE("Digital Mic Capture Switch", 0x05, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME_IDX("Digital Mic Capture Volume", 1, 0x06, 0x0, -			     HDA_INPUT), -	HDA_CODEC_MUTE_IDX("Digital Mic Capture Switch", 1, 0x06, 0x0, -			   HDA_INPUT), -	{ } /* end */ -}; - -/* - * initialization verbs - */ -static struct hda_verb ad1884_init_verbs[] = { -	/* DACs; mute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Port-A (HP) mixer */ -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-A pin */ -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* HP selector - select DAC2 */ -	{0x22, AC_VERB_SET_CONNECT_SEL, 0x1}, -	/* Port-D (Line-out) mixer */ -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-D pin */ -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Mono-out mixer */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Mono-out pin */ -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Mono selector */ -	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x1}, -	/* Port-B (front mic) pin */ -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	/* Port-C (rear mic) pin */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	/* Analog mixer; mute as default */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */ -	/* SPDIF output selector */ -	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */ -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	{ } /* end */ -}; - -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1884_loopbacks[] = { -	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */ -	{ 0x20, HDA_INPUT, 1 }, /* Mic */ -	{ 0x20, HDA_INPUT, 2 }, /* CD */ -	{ 0x20, HDA_INPUT, 4 }, /* Docking */ -	{ } /* end */ -}; -#endif - -static const char *ad1884_slave_vols[] = { -	"PCM Playback Volume", -	"Mic Playback Volume", -	"Mono Playback Volume", -	"Front Mic Playback Volume", -	"Mic Playback Volume", -	"CD Playback Volume", -	"Internal Mic Playback Volume", -	"Docking Mic Playback Volume", -	/* "Beep Playback Volume", */ -	"IEC958 Playback Volume", -	NULL -}; - -static int patch_ad1884(struct hda_codec *codec) -{ -	struct ad198x_spec *spec; -	int err; - -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; - -	codec->spec = spec; - -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); -		return err; -	} -	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); - -	spec->multiout.max_channels = 2; -	spec->multiout.num_dacs = ARRAY_SIZE(ad1884_dac_nids); -	spec->multiout.dac_nids = ad1884_dac_nids; -	spec->multiout.dig_out_nid = AD1884_SPDIF_OUT; -	spec->num_adc_nids = ARRAY_SIZE(ad1884_adc_nids); -	spec->adc_nids = ad1884_adc_nids; -	spec->capsrc_nids = ad1884_capsrc_nids; -	spec->input_mux = &ad1884_capture_source; -	spec->num_mixers = 1; -	spec->mixers[0] = ad1884_base_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1884_init_verbs; -	spec->spdif_route = 0; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1884_loopbacks; -#endif -	spec->vmaster_nid = 0x04; -	/* we need to cover all playback volumes */ -	spec->slave_vols = ad1884_slave_vols; - -	codec->patch_ops = ad198x_patch_ops; - -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; - -	return 0; -} - -/* - * Lenovo Thinkpad T61/X61 - */ -static struct hda_input_mux ad1984_thinkpad_capture_source = { -	.num_items = 4, -	.items = { -		{ "Mic", 0x0 }, -		{ "Internal Mic", 0x1 }, -		{ "Mix", 0x3 }, -		{ "Docking-Station", 0x4 }, -	}, -}; - - -/* - * Dell Precision T3400 - */ -static struct hda_input_mux ad1984_dell_desktop_capture_source = { -	.num_items = 3, -	.items = { -		{ "Front Mic", 0x0 }, -		{ "Line-In", 0x1 }, -		{ "Mix", 0x3 }, -	}, -}; - - -static struct snd_kcontrol_new ad1984_thinkpad_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	/* HDA_CODEC_VOLUME_IDX("PCM Playback Volume", 1, 0x03, 0x0, HDA_OUTPUT), */ -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("Beep Playback Volume", 0x20, 0x03, HDA_INPUT), -	HDA_CODEC_MUTE("Beep Playback Switch", 0x20, 0x03, HDA_INPUT), -	HDA_CODEC_VOLUME("Docking Mic Playback Volume", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_MUTE("Docking Mic Playback Switch", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Docking Mic Boost", 0x25, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 2, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	/* SPDIF controls */ -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		/* identical with ad1983 */ -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -/* additional verbs */ -static struct hda_verb ad1984_thinkpad_init_verbs[] = { -	/* Port-E (docking station mic) pin */ -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* docking mic boost */ -	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Analog PC Beeper - allow firmware/ACPI beeps */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3) | 0x1a}, -	/* Analog mixer - docking mic; mute as default */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	/* enable EAPD bit */ -	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02}, -	{ } /* end */ -}; - -/* - * Dell Precision T3400 - */ -static struct snd_kcontrol_new ad1984_dell_desktop_mixers[] = { -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Speaker Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Line-In Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Line-In Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("Line-In Boost", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 2, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ } /* end */ -}; - -/* Digial MIC ADC NID 0x05 + 0x06 */ -static int ad1984_pcm_dmic_prepare(struct hda_pcm_stream *hinfo, -				   struct hda_codec *codec, -				   unsigned int stream_tag, -				   unsigned int format, -				   struct snd_pcm_substream *substream) -{ -	snd_hda_codec_setup_stream(codec, 0x05 + substream->number, -				   stream_tag, 0, format); -	return 0; -} - -static int ad1984_pcm_dmic_cleanup(struct hda_pcm_stream *hinfo, -				   struct hda_codec *codec, -				   struct snd_pcm_substream *substream) -{ -	snd_hda_codec_cleanup_stream(codec, 0x05 + substream->number); -	return 0; -} - -static struct hda_pcm_stream ad1984_pcm_dmic_capture = { -	.substreams = 2, -	.channels_min = 2, -	.channels_max = 2, -	.nid = 0x05, -	.ops = { -		.prepare = ad1984_pcm_dmic_prepare, -		.cleanup = ad1984_pcm_dmic_cleanup -	}, -}; - -static int ad1984_build_pcms(struct hda_codec *codec) -{ -	struct ad198x_spec *spec = codec->spec; -	struct hda_pcm *info; -	int err; - -	err = ad198x_build_pcms(codec); -	if (err < 0) -		return err; - -	info = spec->pcm_rec + codec->num_pcms; -	codec->num_pcms++; -	info->name = "AD1984 Digital Mic"; -	info->stream[SNDRV_PCM_STREAM_CAPTURE] = ad1984_pcm_dmic_capture; -	return 0; -} - -/* models */ -enum { -	AD1984_BASIC, -	AD1984_THINKPAD, -	AD1984_DELL_DESKTOP, -	AD1984_MODELS -}; - -static const char *ad1984_models[AD1984_MODELS] = { -	[AD1984_BASIC]		= "basic", -	[AD1984_THINKPAD]	= "thinkpad", -	[AD1984_DELL_DESKTOP]	= "dell_desktop", -}; - -static struct snd_pci_quirk ad1984_cfg_tbl[] = { -	/* Lenovo Thinkpad T61/X61 */ -	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD), -	SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP), -	SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP), -	{} -}; - -static int patch_ad1984(struct hda_codec *codec) -{ -	struct ad198x_spec *spec; -	int board_config, err; - -	err = patch_ad1884(codec); -	if (err < 0) -		return err; -	spec = codec->spec; -	board_config = snd_hda_check_board_config(codec, AD1984_MODELS, -						  ad1984_models, ad1984_cfg_tbl); -	switch (board_config) { -	case AD1984_BASIC: -		/* additional digital mics */ -		spec->mixers[spec->num_mixers++] = ad1984_dmic_mixers; -		codec->patch_ops.build_pcms = ad1984_build_pcms; -		break; -	case AD1984_THINKPAD: -		if (codec->subsystem_id == 0x17aa20fb) { -			/* Thinpad X300 does not have the ability to do SPDIF, -			   or attach to docking station to use SPDIF */ -			spec->multiout.dig_out_nid = 0; -		} else -			spec->multiout.dig_out_nid = AD1884_SPDIF_OUT; -		spec->input_mux = &ad1984_thinkpad_capture_source; -		spec->mixers[0] = ad1984_thinkpad_mixers; -		spec->init_verbs[spec->num_init_verbs++] = ad1984_thinkpad_init_verbs; -		spec->analog_beep = 1; -		break; -	case AD1984_DELL_DESKTOP: -		spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1984_dell_desktop_capture_source; -		spec->mixers[0] = ad1984_dell_desktop_mixers; -		break; -	} -	return 0; -} - - -/*   * AD1883 / AD1884A / AD1984A / AD1984B   *   * port-B (0x14) - front mic-in @@ -3703,736 +962,161 @@ static int patch_ad1984(struct hda_codec *codec)   * AD1984A = AD1884A + digital-mic   * AD1883 = equivalent with AD1984A   * AD1984B = AD1984A + extra SPDIF-out - * - * FIXME: - * We share the single DAC for both HP and line-outs (see AD1884/1984). - */ - -static hda_nid_t ad1884a_dac_nids[1] = { -	0x03, -}; - -#define ad1884a_adc_nids	ad1884_adc_nids -#define ad1884a_capsrc_nids	ad1884_capsrc_nids - -#define AD1884A_SPDIF_OUT	0x02 - -static struct hda_input_mux ad1884a_capture_source = { -	.num_items = 5, -	.items = { -		{ "Front Mic", 0x0 }, -		{ "Mic", 0x4 }, -		{ "Line", 0x1 }, -		{ "CD", 0x2 }, -		{ "Mix", 0x3 }, -	}, -}; - -static struct snd_kcontrol_new ad1884a_base_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x02, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x02, HDA_INPUT), -	HDA_CODEC_VOLUME("Front Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Boost", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 2, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	/* SPDIF controls */ -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		/* identical with ad1983 */ -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -/* - * initialization verbs   */ -static struct hda_verb ad1884a_init_verbs[] = { -	/* DACs; unmute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	/* Port-A (HP) mixer - route only from analog mixer */ -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-A pin */ -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Port-D (Line-out) mixer - route only from analog mixer */ -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-D pin */ -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Mono-out mixer - route only from analog mixer */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Mono-out pin */ -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Port-B (front mic) pin */ -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	/* Port-C (rear line-in) pin */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	/* Port-E (rear mic) pin */ -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* no boost */ -	/* Port-F (CD) pin */ -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Analog mixer; mute as default */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(4)}, /* aux */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* capture sources */ -	{0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* SPDIF output amp */ -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	{ } /* end */ -}; -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1884a_loopbacks[] = { -	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */ -	{ 0x20, HDA_INPUT, 1 }, /* Mic */ -	{ 0x20, HDA_INPUT, 2 }, /* CD */ -	{ 0x20, HDA_INPUT, 4 }, /* Docking */ -	{ } /* end */ -}; -#endif - -/* - * Laptop model - * - * Port A: Headphone jack - * Port B: MIC jack - * Port C: Internal MIC - * Port D: Dock Line Out (if enabled) - * Port E: Dock Line In (if enabled) - * Port F: Internal speakers +/* set the upper-limit for mixer amp to 0dB for avoiding the possible + * damage by overloading   */ - -static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol, -					struct snd_ctl_elem_value *ucontrol) +static void ad1884_fixup_amp_override(struct hda_codec *codec, +				      const struct hda_fixup *fix, int action)  { -	struct hda_codec *codec = snd_kcontrol_chip(kcontrol); -	int ret = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol); -	int mute = (!ucontrol->value.integer.value[0] && -		    !ucontrol->value.integer.value[1]); -	/* toggle GPIO1 according to the mute state */ -	snd_hda_codec_write_cache(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, -			    mute ? 0x02 : 0x0); -	return ret; +	if (action == HDA_FIXUP_ACT_PRE_PROBE) +		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT, +					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | +					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | +					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | +					  (1 << AC_AMPCAP_MUTE_SHIFT));  } -static struct snd_kcontrol_new ad1884a_laptop_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Master Playback Switch", -		.subdevice = HDA_SUBDEV_AMP_FLAG, -		.info = snd_hda_mixer_amp_switch_info, -		.get = snd_hda_mixer_amp_switch_get, -		.put = ad1884a_mobile_master_sw_put, -		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT), -	}, -	HDA_CODEC_MUTE("Dock Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("Dock Mic Playback Volume", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_MUTE("Dock Mic Playback Switch", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Boost", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Dock Mic Boost", 0x25, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1884a_mobile_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	/*HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/ -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Master Playback Switch", -		.subdevice = HDA_SUBDEV_AMP_FLAG, -		.info = snd_hda_mixer_amp_switch_info, -		.get = snd_hda_mixer_amp_switch_get, -		.put = ad1884a_mobile_master_sw_put, -		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT), -	}, -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Capture Volume", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Capture Volume", 0x15, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -/* mute internal speaker if HP is plugged */ -static void ad1884a_hp_automute(struct hda_codec *codec) +/* toggle GPIO1 according to the mute state */ +static void ad1884_vmaster_hp_gpio_hook(void *private_data, int enabled)  { -	unsigned int present; +	struct hda_codec *codec = private_data; +	struct ad198x_spec *spec = codec->spec; -	present = snd_hda_jack_detect(codec, 0x11); -	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); -	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE, -			    present ? 0x00 : 0x02); +	if (spec->eapd_nid) +		ad_vmaster_eapd_hook(private_data, enabled); +	snd_hda_codec_update_cache(codec, 0x01, 0, +				   AC_VERB_SET_GPIO_DATA, +				   enabled ? 0x00 : 0x02);  } -/* switch to external mic if plugged */ -static void ad1884a_hp_automic(struct hda_codec *codec) +static void ad1884_fixup_hp_eapd(struct hda_codec *codec, +				 const struct hda_fixup *fix, int action)  { -	unsigned int present; - -	present = snd_hda_jack_detect(codec, 0x14); -	snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL, -			    present ? 0 : 1); -} - -#define AD1884A_HP_EVENT		0x37 -#define AD1884A_MIC_EVENT		0x36 +	struct ad198x_spec *spec = codec->spec; +	static const struct hda_verb gpio_init_verbs[] = { +		{0x01, AC_VERB_SET_GPIO_MASK, 0x02}, +		{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02}, +		{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, +		{}, +	}; -/* unsolicited event for HP jack sensing */ -static void ad1884a_hp_unsol_event(struct hda_codec *codec, unsigned int res) -{ -	switch (res >> 26) { -	case AD1884A_HP_EVENT: -		ad1884a_hp_automute(codec); +	switch (action) { +	case HDA_FIXUP_ACT_PRE_PROBE: +		spec->gen.vmaster_mute.hook = ad1884_vmaster_hp_gpio_hook; +		spec->gen.own_eapd_ctl = 1; +		snd_hda_sequence_write_cache(codec, gpio_init_verbs);  		break; -	case AD1884A_MIC_EVENT: -		ad1884a_hp_automic(codec); +	case HDA_FIXUP_ACT_PROBE: +		if (spec->gen.autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT) +			spec->eapd_nid = spec->gen.autocfg.line_out_pins[0]; +		else +			spec->eapd_nid = spec->gen.autocfg.speaker_pins[0];  		break;  	}  } -/* initialize jack-sensing, too */ -static int ad1884a_hp_init(struct hda_codec *codec) +static void ad1884_fixup_thinkpad(struct hda_codec *codec, +				  const struct hda_fixup *fix, int action)  { -	ad198x_init(codec); -	ad1884a_hp_automute(codec); -	ad1884a_hp_automic(codec); -	return 0; -} - -/* mute internal speaker if HP or docking HP is plugged */ -static void ad1884a_laptop_automute(struct hda_codec *codec) -{ -	unsigned int present; - -	present = snd_hda_jack_detect(codec, 0x11); -	if (!present) -		present = snd_hda_jack_detect(codec, 0x12); -	snd_hda_codec_amp_stereo(codec, 0x16, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); -	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_EAPD_BTLENABLE, -			    present ? 0x00 : 0x02); -} - -/* switch to external mic if plugged */ -static void ad1884a_laptop_automic(struct hda_codec *codec) -{ -	unsigned int idx; - -	if (snd_hda_jack_detect(codec, 0x14)) -		idx = 0; -	else if (snd_hda_jack_detect(codec, 0x1c)) -		idx = 4; -	else -		idx = 1; -	snd_hda_codec_write(codec, 0x0c, 0, AC_VERB_SET_CONNECT_SEL, idx); -} +	struct ad198x_spec *spec = codec->spec; -/* unsolicited event for HP jack sensing */ -static void ad1884a_laptop_unsol_event(struct hda_codec *codec, -				       unsigned int res) -{ -	switch (res >> 26) { -	case AD1884A_HP_EVENT: -		ad1884a_laptop_automute(codec); -		break; -	case AD1884A_MIC_EVENT: -		ad1884a_laptop_automic(codec); -		break; +	if (action == HDA_FIXUP_ACT_PRE_PROBE) { +		spec->gen.keep_eapd_on = 1; +		spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook; +		spec->eapd_nid = 0x12; +		/* Analog PC Beeper - allow firmware/ACPI beeps */ +		spec->beep_amp = HDA_COMPOSE_AMP_VAL(0x20, 3, 3, HDA_INPUT); +		spec->gen.beep_nid = 0; /* no digital beep */  	}  } -/* initialize jack-sensing, too */ -static int ad1884a_laptop_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1884a_laptop_automute(codec); -	ad1884a_laptop_automic(codec); -	return 0; -} - -/* additional verbs for laptop model */ -static struct hda_verb ad1884a_laptop_verbs[] = { -	/* Port-A (HP) pin - always unmuted */ -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-F (int speaker) mixer - route only from analog mixer */ -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-F (int speaker) pin */ -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* required for compaq 6530s/6531s speaker output */ -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	/* Port-C pin - internal mic-in */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */ -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */ -	/* Port-D (docking line-out) pin - default unmuted */ -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* analog mix */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	/* unsolicited event for pin-sense */ -	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT}, -	{0x12, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT}, -	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT}, -	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT}, -	/* allow to touch GPIO1 (for mute control) */ -	{0x01, AC_VERB_SET_GPIO_MASK, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */ -	{ } /* end */ -}; - -static struct hda_verb ad1884a_mobile_verbs[] = { -	/* DACs; unmute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	/* Port-A (HP) mixer - route only from analog mixer */ -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-A pin */ -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	/* Port-A (HP) pin - always unmuted */ -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-B (mic jack) pin */ -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */ -	/* Port-C (int mic) pin */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, 0x7002}, /* raise mic as default */ -	/* Port-F (int speaker) mixer - route only from analog mixer */ -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-F pin */ -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Analog mixer; mute as default */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* capture sources */ -	/* {0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, */ /* set via unsol */ -	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* unsolicited event for pin-sense */ -	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT}, -	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT}, -	/* allow to touch GPIO1 (for mute control) */ -	{0x01, AC_VERB_SET_GPIO_MASK, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */ -	{ } /* end */ -}; - -/* - * Thinkpad X300 - * 0x11 - HP - * 0x12 - speaker - * 0x14 - mic-in - * 0x17 - built-in mic - */ - -static struct hda_verb ad1984a_thinkpad_verbs[] = { -	/* HP unmute */ -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* analog mix */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	/* turn on EAPD */ -	{0x12, AC_VERB_SET_EAPD_BTLENABLE, 0x02}, -	/* unsolicited event for pin-sense */ -	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT}, -	/* internal mic - dmic */ -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	/* set magic COEFs for dmic */ +/* set magic COEFs for dmic */ +static const struct hda_verb ad1884_dmic_init_verbs[] = {  	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7},  	{0x01, AC_VERB_SET_PROC_COEF, 0x08}, -	{ } /* end */ +	{}  }; -static struct snd_kcontrol_new ad1984a_thinkpad_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x14, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Capture Source", -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	{ } /* end */ +enum { +	AD1884_FIXUP_AMP_OVERRIDE, +	AD1884_FIXUP_HP_EAPD, +	AD1884_FIXUP_DMIC_COEF, +	AD1884_FIXUP_THINKPAD, +	AD1884_FIXUP_HP_TOUCHSMART,  }; -static struct hda_input_mux ad1984a_thinkpad_capture_source = { -	.num_items = 3, -	.items = { -		{ "Mic", 0x0 }, -		{ "Internal Mic", 0x5 }, -		{ "Mix", 0x3 }, +static const struct hda_fixup ad1884_fixups[] = { +	[AD1884_FIXUP_AMP_OVERRIDE] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1884_fixup_amp_override,  	}, -}; - -/* mute internal speaker if HP is plugged */ -static void ad1984a_thinkpad_automute(struct hda_codec *codec) -{ -	unsigned int present; - -	present = snd_hda_jack_detect(codec, 0x11); -	snd_hda_codec_amp_stereo(codec, 0x12, HDA_OUTPUT, 0, -				 HDA_AMP_MUTE, present ? HDA_AMP_MUTE : 0); -} - -/* unsolicited event for HP jack sensing */ -static void ad1984a_thinkpad_unsol_event(struct hda_codec *codec, -					 unsigned int res) -{ -	if ((res >> 26) != AD1884A_HP_EVENT) -		return; -	ad1984a_thinkpad_automute(codec); -} - -/* initialize jack-sensing, too */ -static int ad1984a_thinkpad_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1984a_thinkpad_automute(codec); -	return 0; -} - -/* - * HP Touchsmart - * port-A (0x11)      - front hp-out - * port-B (0x14)      - unused - * port-C (0x15)      - unused - * port-D (0x12)      - rear line out - * port-E (0x1c)      - front mic-in - * port-F (0x16)      - Internal speakers - * digital-mic (0x17) - Internal mic - */ - -static struct hda_verb ad1984a_touchsmart_verbs[] = { -	/* DACs; unmute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, 0x27}, /* 0dB */ -	/* Port-A (HP) mixer - route only from analog mixer */ -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-A pin */ -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	/* Port-A (HP) pin - always unmuted */ -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	/* Port-E (int speaker) mixer - route only from analog mixer */ -	{0x25, AC_VERB_SET_AMP_GAIN_MUTE, 0x03}, -	/* Port-E pin */ -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x1c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, -	{0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	/* Port-F (int speaker) mixer - route only from analog mixer */ -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-F pin */ -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Analog mixer; mute as default */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* capture sources */ -	/* {0x0c, AC_VERB_SET_CONNECT_SEL, 0x0}, */ /* set via unsol */ -	{0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x0d, AC_VERB_SET_CONNECT_SEL, 0x0}, -	{0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* unsolicited event for pin-sense */ -	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_HP_EVENT}, -	{0x1c, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT}, -	/* allow to touch GPIO1 (for mute control) */ -	{0x01, AC_VERB_SET_GPIO_MASK, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02}, -	{0x01, AC_VERB_SET_GPIO_DATA, 0x02}, /* first muted */ -	/* internal mic - dmic */ -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	/* set magic COEFs for dmic */ -	{0x01, AC_VERB_SET_COEF_INDEX, 0x13f7}, -	{0x01, AC_VERB_SET_PROC_COEF, 0x08}, -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1984a_touchsmart_mixers[] = { -	HDA_CODEC_VOLUME("Master Playback Volume", 0x21, 0x0, HDA_OUTPUT), -/*	HDA_CODEC_MUTE("Master Playback Switch", 0x21, 0x0, HDA_OUTPUT),*/ -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.subdevice = HDA_SUBDEV_AMP_FLAG, -		.name = "Master Playback Switch", -		.info = snd_hda_mixer_amp_switch_info, -		.get = snd_hda_mixer_amp_switch_get, -		.put = ad1884a_mobile_master_sw_put, -		.private_value = HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT), +	[AD1884_FIXUP_HP_EAPD] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1884_fixup_hp_eapd, +		.chained = true, +		.chain_id = AD1884_FIXUP_AMP_OVERRIDE, +	}, +	[AD1884_FIXUP_DMIC_COEF] = { +		.type = HDA_FIXUP_VERBS, +		.v.verbs = ad1884_dmic_init_verbs, +	}, +	[AD1884_FIXUP_THINKPAD] = { +		.type = HDA_FIXUP_FUNC, +		.v.func = ad1884_fixup_thinkpad, +		.chained = true, +		.chain_id = AD1884_FIXUP_DMIC_COEF, +	}, +	[AD1884_FIXUP_HP_TOUCHSMART] = { +		.type = HDA_FIXUP_VERBS, +		.v.verbs = ad1884_dmic_init_verbs, +		.chained = true, +		.chain_id = AD1884_FIXUP_HP_EAPD,  	}, -	HDA_CODEC_VOLUME("PCM Playback Volume", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_MUTE("PCM Playback Switch", 0x20, 0x5, HDA_INPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Mic Boost", 0x25, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Internal Mic Boost", 0x17, 0x0, HDA_INPUT), -	{ } /* end */ -}; - -/* switch to external mic if plugged */ -static void ad1984a_touchsmart_automic(struct hda_codec *codec) -{ -	if (snd_hda_jack_detect(codec, 0x1c)) -		snd_hda_codec_write(codec, 0x0c, 0, -				     AC_VERB_SET_CONNECT_SEL, 0x4); -	else -		snd_hda_codec_write(codec, 0x0c, 0, -				     AC_VERB_SET_CONNECT_SEL, 0x5); -} - - -/* unsolicited event for HP jack sensing */ -static void ad1984a_touchsmart_unsol_event(struct hda_codec *codec, -	unsigned int res) -{ -	switch (res >> 26) { -	case AD1884A_HP_EVENT: -		ad1884a_hp_automute(codec); -		break; -	case AD1884A_MIC_EVENT: -		ad1984a_touchsmart_automic(codec); -		break; -	} -} - -/* initialize jack-sensing, too */ -static int ad1984a_touchsmart_init(struct hda_codec *codec) -{ -	ad198x_init(codec); -	ad1884a_hp_automute(codec); -	ad1984a_touchsmart_automic(codec); -	return 0; -} - - -/* - */ - -enum { -	AD1884A_DESKTOP, -	AD1884A_LAPTOP, -	AD1884A_MOBILE, -	AD1884A_THINKPAD, -	AD1984A_TOUCHSMART, -	AD1884A_MODELS -}; - -static const char *ad1884a_models[AD1884A_MODELS] = { -	[AD1884A_DESKTOP]	= "desktop", -	[AD1884A_LAPTOP]	= "laptop", -	[AD1884A_MOBILE]	= "mobile", -	[AD1884A_THINKPAD]	= "thinkpad", -	[AD1984A_TOUCHSMART]	= "touchsmart",  }; -static struct snd_pci_quirk ad1884a_cfg_tbl[] = { -	SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), -	SND_PCI_QUIRK(0x103c, 0x3037, "HP 2230s", AD1884A_LAPTOP), -	SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), -	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x3070, "HP", AD1884A_MOBILE), -	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30d0, "HP laptop", AD1884A_LAPTOP), -	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x30e0, "HP laptop", AD1884A_LAPTOP), -	SND_PCI_QUIRK_MASK(0x103c, 0xff00, 0x3600, "HP laptop", AD1884A_LAPTOP), -	SND_PCI_QUIRK_MASK(0x103c, 0xfff0, 0x7010, "HP laptop", AD1884A_MOBILE), -	SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD), -	SND_PCI_QUIRK(0x103c, 0x2a82, "Touchsmart", AD1984A_TOUCHSMART), +static const struct snd_pci_quirk ad1884_fixup_tbl[] = { +	SND_PCI_QUIRK(0x103c, 0x2a82, "HP Touchsmart", AD1884_FIXUP_HP_TOUCHSMART), +	SND_PCI_QUIRK_VENDOR(0x103c, "HP", AD1884_FIXUP_HP_EAPD), +	SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1884_FIXUP_THINKPAD),  	{}  }; -static int patch_ad1884a(struct hda_codec *codec) + +static int patch_ad1884(struct hda_codec *codec)  {  	struct ad198x_spec *spec; -	int err, board_config; - -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; - -	codec->spec = spec; +	int err; -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); +	err = alloc_ad_spec(codec); +	if (err < 0)  		return err; -	} +	spec = codec->spec; + +	spec->gen.mixer_nid = 0x20; +	spec->gen.mixer_merge_nid = 0x21; +	spec->gen.beep_nid = 0x10;  	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); -	spec->multiout.max_channels = 2; -	spec->multiout.num_dacs = ARRAY_SIZE(ad1884a_dac_nids); -	spec->multiout.dac_nids = ad1884a_dac_nids; -	spec->multiout.dig_out_nid = AD1884A_SPDIF_OUT; -	spec->num_adc_nids = ARRAY_SIZE(ad1884a_adc_nids); -	spec->adc_nids = ad1884a_adc_nids; -	spec->capsrc_nids = ad1884a_capsrc_nids; -	spec->input_mux = &ad1884a_capture_source; -	spec->num_mixers = 1; -	spec->mixers[0] = ad1884a_base_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1884a_init_verbs; -	spec->spdif_route = 0; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1884a_loopbacks; -#endif -	codec->patch_ops = ad198x_patch_ops; - -	/* override some parameters */ -	board_config = snd_hda_check_board_config(codec, AD1884A_MODELS, -						  ad1884a_models, -						  ad1884a_cfg_tbl); -	switch (board_config) { -	case AD1884A_LAPTOP: -		spec->mixers[0] = ad1884a_laptop_mixers; -		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs; -		spec->multiout.dig_out_nid = 0; -		codec->patch_ops.unsol_event = ad1884a_laptop_unsol_event; -		codec->patch_ops.init = ad1884a_laptop_init; -		/* set the upper-limit for mixer amp to 0dB for avoiding the -		 * possible damage by overloading -		 */ -		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT, -					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | -					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | -					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | -					  (1 << AC_AMPCAP_MUTE_SHIFT)); -		break; -	case AD1884A_MOBILE: -		spec->mixers[0] = ad1884a_mobile_mixers; -		spec->init_verbs[0] = ad1884a_mobile_verbs; -		spec->multiout.dig_out_nid = 0; -		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event; -		codec->patch_ops.init = ad1884a_hp_init; -		/* set the upper-limit for mixer amp to 0dB for avoiding the -		 * possible damage by overloading -		 */ -		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT, -					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | -					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | -					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | -					  (1 << AC_AMPCAP_MUTE_SHIFT)); -		break; -	case AD1884A_THINKPAD: -		spec->mixers[0] = ad1984a_thinkpad_mixers; -		spec->init_verbs[spec->num_init_verbs++] = -			ad1984a_thinkpad_verbs; -		spec->multiout.dig_out_nid = 0; -		spec->input_mux = &ad1984a_thinkpad_capture_source; -		codec->patch_ops.unsol_event = ad1984a_thinkpad_unsol_event; -		codec->patch_ops.init = ad1984a_thinkpad_init; -		break; -	case AD1984A_TOUCHSMART: -		spec->mixers[0] = ad1984a_touchsmart_mixers; -		spec->init_verbs[0] = ad1984a_touchsmart_verbs; -		spec->multiout.dig_out_nid = 0; -		codec->patch_ops.unsol_event = ad1984a_touchsmart_unsol_event; -		codec->patch_ops.init = ad1984a_touchsmart_init; -		/* set the upper-limit for mixer amp to 0dB for avoiding the -		 * possible damage by overloading -		 */ -		snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT, -					  (0x17 << AC_AMPCAP_OFFSET_SHIFT) | -					  (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | -					  (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | -					  (1 << AC_AMPCAP_MUTE_SHIFT)); -		break; -	} +	snd_hda_pick_fixup(codec, NULL, ad1884_fixup_tbl, ad1884_fixups); +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	err = ad198x_parse_auto_config(codec, true); +	if (err < 0) +		goto error; +	err = ad1983_add_spdif_mux_ctl(codec); +	if (err < 0) +		goto error; + +	snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PROBE);  	return 0; -} + error: +	snd_hda_gen_free(codec); +	return err; +}  /*   * AD1882 / AD1882A @@ -4446,347 +1130,47 @@ static int patch_ad1884a(struct hda_codec *codec)   * port-G - rear clfe-out (6stack)   */ -static hda_nid_t ad1882_dac_nids[3] = { -	0x04, 0x03, 0x05 -}; - -static hda_nid_t ad1882_adc_nids[2] = { -	0x08, 0x09, -}; - -static hda_nid_t ad1882_capsrc_nids[2] = { -	0x0c, 0x0d, -}; - -#define AD1882_SPDIF_OUT	0x02 - -/* list: 0x11, 0x39, 0x3a, 0x18, 0x3c, 0x3b, 0x12, 0x20 */ -static struct hda_input_mux ad1882_capture_source = { -	.num_items = 5, -	.items = { -		{ "Front Mic", 0x1 }, -		{ "Mic", 0x4 }, -		{ "Line", 0x2 }, -		{ "CD", 0x3 }, -		{ "Mix", 0x7 }, -	}, -}; - -/* list: 0x11, 0x39, 0x3a, 0x3c, 0x18, 0x1f, 0x12, 0x20 */ -static struct hda_input_mux ad1882a_capture_source = { -	.num_items = 5, -	.items = { -		{ "Front Mic", 0x1 }, -		{ "Mic", 0x4}, -		{ "Line", 0x2 }, -		{ "Digital Mic", 0x06 }, -		{ "Mix", 0x7 }, -	}, -}; - -static struct snd_kcontrol_new ad1882_base_mixers[] = { -	HDA_CODEC_VOLUME("Front Playback Volume", 0x04, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Surround Playback Volume", 0x03, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Headphone Playback Switch", 0x11, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Front Playback Switch", 0x12, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x13, 1, 0x0, HDA_OUTPUT), - -	HDA_CODEC_VOLUME("Mic Boost", 0x3c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Front Mic Boost", 0x39, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Line-In Boost", 0x3a, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME("Capture Volume", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE("Capture Switch", 0x0c, 0x0, HDA_OUTPUT), -	HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x0d, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x0d, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		/* The multiple "Capture Source" controls confuse alsamixer -		 * So call somewhat different.. -		 */ -		/* .name = "Capture Source", */ -		.name = "Input Source", -		.count = 2, -		.info = ad198x_mux_enum_info, -		.get = ad198x_mux_enum_get, -		.put = ad198x_mux_enum_put, -	}, -	/* SPDIF controls */ -	HDA_CODEC_VOLUME("IEC958 Playback Volume", 0x1b, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Source", -		/* identical with ad1983 */ -		.info = ad1983_spdif_route_info, -		.get = ad1983_spdif_route_get, -		.put = ad1983_spdif_route_put, -	}, -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1882_loopback_mixers[] = { -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1882a_loopback_mixers[] = { -	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x20, 0x00, HDA_INPUT), -	HDA_CODEC_VOLUME("Mic Playback Volume", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_MUTE("Mic Playback Switch", 0x20, 0x04, HDA_INPUT), -	HDA_CODEC_VOLUME("Line Playback Volume", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_MUTE("Line Playback Switch", 0x20, 0x01, HDA_INPUT), -	HDA_CODEC_VOLUME("CD Playback Volume", 0x20, 0x06, HDA_INPUT), -	HDA_CODEC_MUTE("CD Playback Switch", 0x20, 0x06, HDA_INPUT), -	HDA_CODEC_VOLUME("Digital Mic Boost", 0x1f, 0x0, HDA_INPUT), -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1882_3stack_mixers[] = { -	HDA_CODEC_MUTE("Surround Playback Switch", 0x15, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x17, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x17, 2, 0x0, HDA_OUTPUT), -	{ -		.iface = SNDRV_CTL_ELEM_IFACE_MIXER, -		.name = "Channel Mode", -		.info = ad198x_ch_mode_info, -		.get = ad198x_ch_mode_get, -		.put = ad198x_ch_mode_put, -	}, -	{ } /* end */ -}; - -static struct snd_kcontrol_new ad1882_6stack_mixers[] = { -	HDA_CODEC_MUTE("Surround Playback Switch", 0x16, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("Center Playback Switch", 0x24, 1, 0x0, HDA_OUTPUT), -	HDA_CODEC_MUTE_MONO("LFE Playback Switch", 0x24, 2, 0x0, HDA_OUTPUT), -	{ } /* end */ -}; - -static struct hda_verb ad1882_ch2_init[] = { -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{ } /* end */ -}; - -static struct hda_verb ad1882_ch4_init[] = { -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{ } /* end */ -}; - -static struct hda_verb ad1882_ch6_init[] = { -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	{ } /* end */ -}; - -static struct hda_channel_mode ad1882_modes[3] = { -	{ 2, ad1882_ch2_init }, -	{ 4, ad1882_ch4_init }, -	{ 6, ad1882_ch6_init }, -}; - -/* - * initialization verbs - */ -static struct hda_verb ad1882_init_verbs[] = { -	/* DACs; mute as default */ -	{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, -	/* Port-A (HP) mixer */ -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-A pin */ -	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* HP selector - select DAC2 */ -	{0x37, AC_VERB_SET_CONNECT_SEL, 0x1}, -	/* Port-D (Line-out) mixer */ -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x29, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Port-D pin */ -	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Mono-out mixer */ -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, -	{0x1e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, -	/* Mono-out pin */ -	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, -	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Port-B (front mic) pin */ -	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x39, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */ -	/* Port-C (line-in) pin */ -	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN}, -	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x3a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */ -	/* Port-C mixer - mute as input */ -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x2c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	/* Port-E (mic-in) pin */ -	{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, -	{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	{0x3c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO}, /* boost */ -	/* Port-E mixer - mute as input */ -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x26, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	/* Port-F (surround) */ -	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Port-G (CLFE) */ -	{0x24, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, -	{0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, -	/* Analog mixer; mute as default */ -	/* list: 0x39, 0x3a, 0x11, 0x12, 0x3c, 0x3b, 0x18, 0x1a */ -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, -	{0x20, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, -	/* Analog Mix output amp */ -	{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x1f}, /* 0dB */ -	/* SPDIF output selector */ -	{0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	{0x02, AC_VERB_SET_CONNECT_SEL, 0x0}, /* PCM */ -	{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE | 0x27}, /* 0dB */ -	{ } /* end */ -}; - -#ifdef CONFIG_SND_HDA_POWER_SAVE -static struct hda_amp_list ad1882_loopbacks[] = { -	{ 0x20, HDA_INPUT, 0 }, /* Front Mic */ -	{ 0x20, HDA_INPUT, 1 }, /* Mic */ -	{ 0x20, HDA_INPUT, 4 }, /* Line */ -	{ 0x20, HDA_INPUT, 6 }, /* CD */ -	{ } /* end */ -}; -#endif - -/* models */ -enum { -	AD1882_3STACK, -	AD1882_6STACK, -	AD1882_MODELS -}; - -static const char *ad1882_models[AD1986A_MODELS] = { -	[AD1882_3STACK]		= "3stack", -	[AD1882_6STACK]		= "6stack", -}; - -  static int patch_ad1882(struct hda_codec *codec)  {  	struct ad198x_spec *spec; -	int err, board_config; - -	spec = kzalloc(sizeof(*spec), GFP_KERNEL); -	if (spec == NULL) -		return -ENOMEM; - -	codec->spec = spec; +	int err; -	err = snd_hda_attach_beep_device(codec, 0x10); -	if (err < 0) { -		ad198x_free(codec); +	err = alloc_ad_spec(codec); +	if (err < 0)  		return err; -	} -	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); - -	spec->multiout.max_channels = 6; -	spec->multiout.num_dacs = 3; -	spec->multiout.dac_nids = ad1882_dac_nids; -	spec->multiout.dig_out_nid = AD1882_SPDIF_OUT; -	spec->num_adc_nids = ARRAY_SIZE(ad1882_adc_nids); -	spec->adc_nids = ad1882_adc_nids; -	spec->capsrc_nids = ad1882_capsrc_nids; -	if (codec->vendor_id == 0x11d41882) -		spec->input_mux = &ad1882_capture_source; -	else -		spec->input_mux = &ad1882a_capture_source; -	spec->num_mixers = 2; -	spec->mixers[0] = ad1882_base_mixers; -	if (codec->vendor_id == 0x11d41882) -		spec->mixers[1] = ad1882_loopback_mixers; -	else -		spec->mixers[1] = ad1882a_loopback_mixers; -	spec->num_init_verbs = 1; -	spec->init_verbs[0] = ad1882_init_verbs; -	spec->spdif_route = 0; -#ifdef CONFIG_SND_HDA_POWER_SAVE -	spec->loopback.amplist = ad1882_loopbacks; -#endif -	spec->vmaster_nid = 0x04; - -	codec->patch_ops = ad198x_patch_ops; - -	/* override some parameters */ -	board_config = snd_hda_check_board_config(codec, AD1882_MODELS, -						  ad1882_models, NULL); -	switch (board_config) { -	default: -	case AD1882_3STACK: -		spec->num_mixers = 3; -		spec->mixers[2] = ad1882_3stack_mixers; -		spec->channel_mode = ad1882_modes; -		spec->num_channel_mode = ARRAY_SIZE(ad1882_modes); -		spec->need_dac_fix = 1; -		spec->multiout.max_channels = 2; -		spec->multiout.num_dacs = 1; -		break; -	case AD1882_6STACK: -		spec->num_mixers = 3; -		spec->mixers[2] = ad1882_6stack_mixers; -		break; -	} - -	codec->no_trigger_sense = 1; -	codec->no_sticky_stream = 1; +	spec = codec->spec; +	spec->gen.mixer_nid = 0x20; +	spec->gen.mixer_merge_nid = 0x21; +	spec->gen.beep_nid = 0x10; +	set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); +	err = ad198x_parse_auto_config(codec, true); +	if (err < 0) +		goto error; +	err = ad1988_add_spdif_mux_ctl(codec); +	if (err < 0) +		goto error;  	return 0; + + error: +	snd_hda_gen_free(codec); +	return err;  }  /*   * patch entries   */ -static struct hda_codec_preset snd_hda_preset_analog[] = { -	{ .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884a }, +static const struct hda_codec_preset snd_hda_preset_analog[] = { +	{ .id = 0x11d4184a, .name = "AD1884A", .patch = patch_ad1884 },  	{ .id = 0x11d41882, .name = "AD1882", .patch = patch_ad1882 }, -	{ .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884a }, +	{ .id = 0x11d41883, .name = "AD1883", .patch = patch_ad1884 },  	{ .id = 0x11d41884, .name = "AD1884", .patch = patch_ad1884 }, -	{ .id = 0x11d4194a, .name = "AD1984A", .patch = patch_ad1884a }, -	{ .id = 0x11d4194b, .name = "AD1984B", .patch = patch_ad1884a }, +	{ .id = 0x11d4194a, .name = "AD1984A", .patch = patch_ad1884 }, +	{ .id = 0x11d4194b, .name = "AD1984B", .patch = patch_ad1884 },  	{ .id = 0x11d41981, .name = "AD1981", .patch = patch_ad1981 },  	{ .id = 0x11d41983, .name = "AD1983", .patch = patch_ad1983 }, -	{ .id = 0x11d41984, .name = "AD1984", .patch = patch_ad1984 }, +	{ .id = 0x11d41984, .name = "AD1984", .patch = patch_ad1884 },  	{ .id = 0x11d41986, .name = "AD1986A", .patch = patch_ad1986a },  	{ .id = 0x11d41988, .name = "AD1988", .patch = patch_ad1988 },  	{ .id = 0x11d4198b, .name = "AD1988B", .patch = patch_ad1988 },  | 
