Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into fixes (77623f62) · Commits · e / devices / android_kernel_fairphone_FP3

sound/pci/hda/hda_intel.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2713,6 +2713,9 @@ static struct pci_device_id azx_ids[] = {
		{ PCI_DEVICE(0x10de, 0x0ac1), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac2), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0ac3), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be2), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be3), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0be4), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d94), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d95), .driver_data = AZX_DRIVER_NVIDIA },
		{ PCI_DEVICE(0x10de, 0x0d96), .driver_data = AZX_DRIVER_NVIDIA },

sound/pci/hda/patch_analog.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1789,6 +1789,14 @@ static int patch_ad1981(struct hda_codec *codec)

		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;

sound/pci/hda/patch_conexant.c

+37 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@

		#include "hda_codec.h"
		#include "hda_local.h"
		#include "hda_beep.h"

		#define CXT_PIN_DIR_IN 0x00
		#define CXT_PIN_DIR_OUT 0x01
		@@ -111,6 +112,7 @@ struct conexant_spec {
		unsigned int dell_automute;
		unsigned int port_d_mode;
		unsigned char ext_mic_bias;
		unsigned int dell_vostro;
		};

		static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo,
		@@ -476,6 +478,7 @@ static void conexant_free(struct hda_codec *codec)
		snd_array_free(&spec->jacks);
		}
		#endif
		snd_hda_detach_beep_device(codec);
		kfree(codec->spec);
		}

		@@ -2109,9 +2112,12 @@ static int cxt5066_mic_boost_mux_enum_get(struct snd_kcontrol *kcontrol,
		{
		struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
		int val;
		hda_nid_t nid = kcontrol->private_value & 0xff;
		int inout = (kcontrol->private_value & 0x100) ?
		AC_AMP_GET_INPUT : AC_AMP_GET_OUTPUT;

		val = snd_hda_codec_read(codec, 0x17, 0,
		AC_VERB_GET_AMP_GAIN_MUTE, AC_AMP_GET_OUTPUT);
		val = snd_hda_codec_read(codec, nid, 0,
		AC_VERB_GET_AMP_GAIN_MUTE, inout);

		ucontrol->value.enumerated.item[0] = val & AC_AMP_GAIN;
		return 0;
		@@ -2123,6 +2129,9 @@ static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,
		struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
		const struct hda_input_mux *imux = &cxt5066_analog_mic_boost;
		unsigned int idx;
		hda_nid_t nid = kcontrol->private_value & 0xff;
		int inout = (kcontrol->private_value & 0x100) ?
		AC_AMP_SET_INPUT : AC_AMP_SET_OUTPUT;

		if (!imux->num_items)
		return 0;
		@@ -2130,9 +2139,9 @@ static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,
		if (idx >= imux->num_items)
		idx = imux->num_items - 1;

		snd_hda_codec_write_cache(codec, 0x17, 0,
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AC_AMP_SET_RIGHT \| AC_AMP_SET_LEFT \| AC_AMP_SET_OUTPUT \|
		AC_AMP_SET_RIGHT \| AC_AMP_SET_LEFT \| inout \|
		imux->items[idx].index);

		return 1;
		@@ -2201,10 +2210,11 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {

		{
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Analog Mic Boost Capture Enum",
		.name = "Ext Mic Boost Capture Enum",
		.info = cxt5066_mic_boost_mux_enum_info,
		.get = cxt5066_mic_boost_mux_enum_get,
		.put = cxt5066_mic_boost_mux_enum_put,
		.private_value = 0x17,
		},

		HDA_BIND_VOL("Capture Volume", &cxt5066_bind_capture_vol_others),
		@@ -2212,6 +2222,19 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {
		{}
		};

		static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
		{
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Int Mic Boost Capture Enum",
		.info = cxt5066_mic_boost_mux_enum_info,
		.get = cxt5066_mic_boost_mux_enum_get,
		.put = cxt5066_mic_boost_mux_enum_put,
		.private_value = 0x23 \| 0x100,
		},
		HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
		{}
		};

		static struct hda_verb cxt5066_init_verbs[] = {
		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
		@@ -2397,10 +2420,15 @@ static struct hda_verb cxt5066_init_verbs_portd_lo[] = {
		/* initialize jack-sensing, too */
		static int cxt5066_init(struct hda_codec *codec)
		{
		struct conexant_spec *spec = codec->spec;

		snd_printdd("CXT5066: init\n");
		conexant_init(codec);
		if (codec->patch_ops.unsol_event) {
		cxt5066_hp_automute(codec);
		if (spec->dell_vostro)
		cxt5066_vostro_automic(codec);
		else
		cxt5066_automic(codec);
		}
		return 0;
		@@ -2500,7 +2528,10 @@ static int patch_cxt5066(struct hda_codec *codec)
		spec->init_verbs[0] = cxt5066_init_verbs_vostro;
		spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
		spec->mixers[spec->num_mixers++] = cxt5066_mixers;
		spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers;
		spec->port_d_mode = 0;
		spec->dell_vostro = 1;
		snd_hda_attach_beep_device(codec, 0x13);

		/* no S/PDIF out */
		spec->multiout.dig_out_nid = 0;

sound/pci/hda/patch_realtek.c

+290 −25

Original line number	Diff line number	Diff line
		@@ -131,8 +131,8 @@ enum {
		enum {
		ALC269_BASIC,
		ALC269_QUANTA_FL1,
		ALC269_ASUS_EEEPC_P703,
		ALC269_ASUS_EEEPC_P901,
		ALC269_ASUS_AMIC,
		ALC269_ASUS_DMIC,
		ALC269_FUJITSU,
		ALC269_LIFEBOOK,
		ALC269_AUTO,
		@@ -188,6 +188,8 @@ enum {
		ALC663_ASUS_MODE4,
		ALC663_ASUS_MODE5,
		ALC663_ASUS_MODE6,
		ALC663_ASUS_MODE7,
		ALC663_ASUS_MODE8,
		ALC272_DELL,
		ALC272_DELL_ZM1,
		ALC272_SAMSUNG_NC10,
		@@ -6248,6 +6250,7 @@ static const char *alc260_models[ALC260_MODEL_LAST] = {

		static struct snd_pci_quirk alc260_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1025, 0x007b, "Acer C20x", ALC260_ACER),
		SND_PCI_QUIRK(0x1025, 0x007f, "Acer", ALC260_WILL),
		SND_PCI_QUIRK(0x1025, 0x008f, "Acer", ALC260_ACER),
		SND_PCI_QUIRK(0x1509, 0x4540, "Favorit 100XS", ALC260_FAVORIT100),
		SND_PCI_QUIRK(0x103c, 0x2808, "HP d5700", ALC260_HP_3013),
		@@ -8918,7 +8921,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x0579, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */
		SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC882_AUTO),
		SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
		SND_PCI_QUIRK(0x1462, 0x3729, "MSI S420", ALC883_TARGA_DIG),
		SND_PCI_QUIRK(0x1462, 0x3783, "NEC S970", ALC883_TARGA_DIG),
		@@ -9235,6 +9238,8 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.num_adc_nids = ARRAY_SIZE(alc889_adc_nids),
		.adc_nids = alc889_adc_nids,
		.capsrc_nids = alc889_capsrc_nids,
		.capsrc_nids = alc889_capsrc_nids,
		.dig_out_nid = ALC883_DIGOUT_NID,
		.dig_in_nid = ALC883_DIGIN_NID,
		.slave_dig_outs = alc883_slave_dig_outs,
		@@ -9281,6 +9286,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.dig_out_nid = ALC883_DIGOUT_NID,
		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
		.channel_mode = alc883_3ST_2ch_modes,
		@@ -9427,6 +9433,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
		.channel_mode = alc883_sixstack_modes,
		.input_mux = &alc883_capture_source,
		@@ -9488,6 +9495,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
		.channel_mode = alc883_3ST_2ch_modes,
		.input_mux = &alc883_lenovo_101e_capture_source,
		@@ -9667,6 +9675,7 @@ static struct alc_config_preset alc882_presets[] = {
		alc880_gpio1_init_verbs },
		.adc_nids = alc883_adc_nids,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
		.capsrc_nids = alc883_capsrc_nids,
		.dac_nids = alc883_dac_nids,
		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
		.channel_mode = alc889A_mb31_6ch_modes,
		@@ -13231,10 +13240,12 @@ static struct hda_verb alc269_eeepc_amic_init_verbs[] = {
		/* toggle speaker-output according to the hp-jack state */
		static void alc269_speaker_automute(struct hda_codec *codec)
		{
		struct alc_spec *spec = codec->spec;
		unsigned int nid = spec->autocfg.hp_pins[0];
		unsigned int present;
		unsigned char bits;

		present = snd_hda_jack_detect(codec, 0x15);
		present = snd_hda_jack_detect(codec, nid);
		bits = present ? AMP_IN_MUTE(0) : 0;
		snd_hda_codec_amp_stereo(codec, 0x0c, HDA_INPUT, 0,
		AMP_IN_MUTE(0), bits);
		@@ -13459,8 +13470,8 @@ static void alc269_auto_init(struct hda_codec *codec)
		static const char *alc269_models[ALC269_MODEL_LAST] = {
		[ALC269_BASIC] = "basic",
		[ALC269_QUANTA_FL1] = "quanta",
		[ALC269_ASUS_EEEPC_P703] = "eeepc-p703",
		[ALC269_ASUS_EEEPC_P901] = "eeepc-p901",
		[ALC269_ASUS_AMIC] = "asus-amic",
		[ALC269_ASUS_DMIC] = "asus-dmic",
		[ALC269_FUJITSU] = "fujitsu",
		[ALC269_LIFEBOOK] = "lifebook",
		[ALC269_AUTO] = "auto",
		@@ -13469,18 +13480,41 @@ static const char *alc269_models[ALC269_MODEL_LAST] = {
		static struct snd_pci_quirk alc269_cfg_tbl[] = {
		SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_QUANTA_FL1),
		SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
		ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_ASUS_EEEPC_P703),
		SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_ASUS_EEEPC_P703),
		ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1273, "ASUS UL80JT", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1283, "ASUS U53Jc", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x12b3, "ASUS N82Jv", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x13a3, "ASUS UL30Vt", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1373, "ASUS G73JX", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1383, "ASUS UJ30Jc", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x13d3, "ASUS N61JA", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1413, "ASUS UL50", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1443, "ASUS UL30", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1453, "ASUS M60Jv", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1483, "ASUS UL80", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x14f3, "ASUS F83Vf", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x14e3, "ASUS UL20", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1513, "ASUS UX30", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x15a3, "ASUS N60Jv", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x15b3, "ASUS N60Dp", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x15c3, "ASUS N70De", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x15e3, "ASUS F83T", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1643, "ASUS M60J", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1653, "ASUS U50", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1693, "ASUS F50N", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x16a3, "ASUS F5Q", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_ASUS_DMIC),
		SND_PCI_QUIRK(0x1043, 0x1723, "ASUS P80", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1743, "ASUS U80", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1773, "ASUS U20A", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x1883, "ASUS F81Se", ALC269_ASUS_AMIC),
		SND_PCI_QUIRK(0x1043, 0x831a, "ASUS Eeepc P901",
		ALC269_ASUS_EEEPC_P901),
		ALC269_ASUS_DMIC),
		SND_PCI_QUIRK(0x1043, 0x834a, "ASUS Eeepc S101",
		ALC269_ASUS_EEEPC_P901),
		SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_ASUS_EEEPC_P901),
		ALC269_ASUS_DMIC),
		SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005HA", ALC269_ASUS_DMIC),
		SND_PCI_QUIRK(0x1043, 0x83ce, "ASUS P1005HA", ALC269_ASUS_DMIC),
		SND_PCI_QUIRK(0x1734, 0x115d, "FSC Amilo", ALC269_FUJITSU),
		SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook ICH9M-based", ALC269_LIFEBOOK),
		{}
		@@ -13510,7 +13544,7 @@ static struct alc_config_preset alc269_presets[] = {
		.setup = alc269_quanta_fl1_setup,
		.init_hook = alc269_quanta_fl1_init_hook,
		},
		[ALC269_ASUS_EEEPC_P703] = {
		[ALC269_ASUS_AMIC] = {
		.mixers = { alc269_eeepc_mixer },
		.cap_mixer = alc269_epc_capture_mixer,
		.init_verbs = { alc269_init_verbs,
		@@ -13524,7 +13558,7 @@ static struct alc_config_preset alc269_presets[] = {
		.setup = alc269_eeepc_amic_setup,
		.init_hook = alc269_eeepc_inithook,
		},
		[ALC269_ASUS_EEEPC_P901] = {
		[ALC269_ASUS_DMIC] = {
		.mixers = { alc269_eeepc_mixer },
		.cap_mixer = alc269_epc_capture_mixer,
		.init_verbs = { alc269_init_verbs,
		@@ -16159,6 +16193,52 @@ static struct snd_kcontrol_new alc663_g50v_mixer[] = {
		{ } /* end */
		};

		static struct hda_bind_ctls alc663_asus_mode7_8_all_bind_switch = {
		.ops = &snd_hda_bind_sw,
		.values = {
		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
		HDA_COMPOSE_AMP_VAL(0x15, 3, 0, HDA_OUTPUT),
		HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),
		HDA_COMPOSE_AMP_VAL(0x1b, 3, 0, HDA_OUTPUT),
		HDA_COMPOSE_AMP_VAL(0x21, 3, 0, HDA_OUTPUT),
		0
		},
		};

		static struct hda_bind_ctls alc663_asus_mode7_8_sp_bind_switch = {
		.ops = &snd_hda_bind_sw,
		.values = {
		HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
		HDA_COMPOSE_AMP_VAL(0x17, 3, 0, HDA_OUTPUT),
		0
		},
		};

		static struct snd_kcontrol_new alc663_mode7_mixer[] = {
		HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
		HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
		HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
		HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Headphone2 Playback Switch", 0x21, 0x0, HDA_OUTPUT),
		HDA_CODEC_VOLUME("IntMic Playback Volume", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_MUTE("IntMic Playback Switch", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
		HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
		{ } /* end */
		};

		static struct snd_kcontrol_new alc663_mode8_mixer[] = {
		HDA_BIND_SW("Master Playback Switch", &alc663_asus_mode7_8_all_bind_switch),
		HDA_BIND_VOL("Speaker Playback Volume", &alc663_asus_bind_master_vol),
		HDA_BIND_SW("Speaker Playback Switch", &alc663_asus_mode7_8_sp_bind_switch),
		HDA_CODEC_MUTE("Headphone1 Playback Switch", 0x15, 0x0, HDA_OUTPUT),
		HDA_CODEC_MUTE("Headphone2 Playback Switch", 0x21, 0x0, HDA_OUTPUT),
		HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
		{ } /* end */
		};


		static struct snd_kcontrol_new alc662_chmode_mixer[] = {
		{
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		@@ -16446,6 +16526,45 @@ static struct hda_verb alc272_dell_init_verbs[] = {
		{}
		};

		static struct hda_verb alc663_mode7_init_verbs[] = {
		{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
		{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
		{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x1b, AC_VERB_SET_CONNECT_SEL, 0x01},
		{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */
		{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
		{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
		{0x19, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_MIC_EVENT},
		{0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_HP_EVENT},
		{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_HP_EVENT},
		{}
		};

		static struct hda_verb alc663_mode8_init_verbs[] = {
		{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
		{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
		{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
		{0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
		{0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
		{0x21, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x21, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
		{0x21, AC_VERB_SET_CONNECT_SEL, 0x01}, /* Headphone */
		{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
		{0x22, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(9)},
		{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_HP_EVENT},
		{0x18, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_MIC_EVENT},
		{0x21, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_HP_EVENT},
		{}
		};

		static struct snd_kcontrol_new alc662_auto_capture_mixer[] = {
		HDA_CODEC_VOLUME("Capture Volume", 0x09, 0x0, HDA_INPUT),
		HDA_CODEC_MUTE("Capture Switch", 0x09, 0x0, HDA_INPUT),
		@@ -16625,6 +16744,54 @@ static void alc663_two_hp_m2_speaker_automute(struct hda_codec *codec)
		}
		}

		static void alc663_two_hp_m7_speaker_automute(struct hda_codec *codec)
		{
		unsigned int present1, present2;

		present1 = snd_hda_codec_read(codec, 0x1b, 0,
		AC_VERB_GET_PIN_SENSE, 0)
		& AC_PINSENSE_PRESENCE;
		present2 = snd_hda_codec_read(codec, 0x21, 0,
		AC_VERB_GET_PIN_SENSE, 0)
		& AC_PINSENSE_PRESENCE;

		if (present1 \|\| present2) {
		snd_hda_codec_write_cache(codec, 0x14, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
		snd_hda_codec_write_cache(codec, 0x17, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
		} else {
		snd_hda_codec_write_cache(codec, 0x14, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
		snd_hda_codec_write_cache(codec, 0x17, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
		}
		}

		static void alc663_two_hp_m8_speaker_automute(struct hda_codec *codec)
		{
		unsigned int present1, present2;

		present1 = snd_hda_codec_read(codec, 0x21, 0,
		AC_VERB_GET_PIN_SENSE, 0)
		& AC_PINSENSE_PRESENCE;
		present2 = snd_hda_codec_read(codec, 0x15, 0,
		AC_VERB_GET_PIN_SENSE, 0)
		& AC_PINSENSE_PRESENCE;

		if (present1 \|\| present2) {
		snd_hda_codec_write_cache(codec, 0x14, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
		snd_hda_codec_write_cache(codec, 0x17, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
		} else {
		snd_hda_codec_write_cache(codec, 0x14, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
		snd_hda_codec_write_cache(codec, 0x17, 0,
		AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
		}
		}

		static void alc663_m51va_unsol_event(struct hda_codec *codec,
		unsigned int res)
		{
		@@ -16644,7 +16811,7 @@ static void alc663_m51va_setup(struct hda_codec *codec)
		spec->ext_mic.pin = 0x18;
		spec->ext_mic.mux_idx = 0;
		spec->int_mic.pin = 0x12;
		spec->int_mic.mux_idx = 1;
		spec->int_mic.mux_idx = 9;
		spec->auto_mic = 1;
		}

		@@ -16656,7 +16823,17 @@ static void alc663_m51va_inithook(struct hda_codec *codec)

		/* *************** Mode1 ****************************/
		#define alc663_mode1_unsol_event alc663_m51va_unsol_event
		#define alc663_mode1_setup alc663_m51va_setup

		static void alc663_mode1_setup(struct hda_codec *codec)
		{
		struct alc_spec *spec = codec->spec;
		spec->ext_mic.pin = 0x18;
		spec->ext_mic.mux_idx = 0;
		spec->int_mic.pin = 0x19;
		spec->int_mic.mux_idx = 1;
		spec->auto_mic = 1;
		}

		#define alc663_mode1_inithook alc663_m51va_inithook

		/* *************** Mode2 ****************************/
		@@ -16673,7 +16850,7 @@ static void alc662_mode2_unsol_event(struct hda_codec *codec,
		}
		}

		#define alc662_mode2_setup alc663_m51va_setup
		#define alc662_mode2_setup alc663_mode1_setup

		static void alc662_mode2_inithook(struct hda_codec *codec)
		{
		@@ -16694,7 +16871,7 @@ static void alc663_mode3_unsol_event(struct hda_codec *codec,
		}
		}

		#define alc663_mode3_setup alc663_m51va_setup
		#define alc663_mode3_setup alc663_mode1_setup

		static void alc663_mode3_inithook(struct hda_codec *codec)
		{
		@@ -16715,7 +16892,7 @@ static void alc663_mode4_unsol_event(struct hda_codec *codec,
		}
		}

		#define alc663_mode4_setup alc663_m51va_setup
		#define alc663_mode4_setup alc663_mode1_setup

		static void alc663_mode4_inithook(struct hda_codec *codec)
		{
		@@ -16736,7 +16913,7 @@ static void alc663_mode5_unsol_event(struct hda_codec *codec,
		}
		}

		#define alc663_mode5_setup alc663_m51va_setup
		#define alc663_mode5_setup alc663_mode1_setup

		static void alc663_mode5_inithook(struct hda_codec *codec)
		{
		@@ -16757,7 +16934,7 @@ static void alc663_mode6_unsol_event(struct hda_codec *codec,
		}
		}

		#define alc663_mode6_setup alc663_m51va_setup
		#define alc663_mode6_setup alc663_mode1_setup

		static void alc663_mode6_inithook(struct hda_codec *codec)
		{
		@@ -16765,6 +16942,50 @@ static void alc663_mode6_inithook(struct hda_codec *codec)
		alc_mic_automute(codec);
		}

		/* *************** Mode7 ****************************/
		static void alc663_mode7_unsol_event(struct hda_codec *codec,
		unsigned int res)
		{
		switch (res >> 26) {
		case ALC880_HP_EVENT:
		alc663_two_hp_m7_speaker_automute(codec);
		break;
		case ALC880_MIC_EVENT:
		alc_mic_automute(codec);
		break;
		}
		}

		#define alc663_mode7_setup alc663_mode1_setup

		static void alc663_mode7_inithook(struct hda_codec *codec)
		{
		alc663_two_hp_m7_speaker_automute(codec);
		alc_mic_automute(codec);
		}

		/* *************** Mode8 ****************************/
		static void alc663_mode8_unsol_event(struct hda_codec *codec,
		unsigned int res)
		{
		switch (res >> 26) {
		case ALC880_HP_EVENT:
		alc663_two_hp_m8_speaker_automute(codec);
		break;
		case ALC880_MIC_EVENT:
		alc_mic_automute(codec);
		break;
		}
		}

		#define alc663_mode8_setup alc663_m51va_setup

		static void alc663_mode8_inithook(struct hda_codec *codec)
		{
		alc663_two_hp_m8_speaker_automute(codec);
		alc_mic_automute(codec);
		}

		static void alc663_g71v_hp_automute(struct hda_codec *codec)
		{
		unsigned int present;
		@@ -16899,6 +17120,8 @@ static const char *alc662_models[ALC662_MODEL_LAST] = {
		[ALC663_ASUS_MODE4] = "asus-mode4",
		[ALC663_ASUS_MODE5] = "asus-mode5",
		[ALC663_ASUS_MODE6] = "asus-mode6",
		[ALC663_ASUS_MODE7] = "asus-mode7",
		[ALC663_ASUS_MODE8] = "asus-mode8",
		[ALC272_DELL] = "dell",
		[ALC272_DELL_ZM1] = "dell-zm1",
		[ALC272_SAMSUNG_NC10] = "samsung-nc10",
		@@ -16915,12 +17138,22 @@ static struct snd_pci_quirk alc662_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1043, 0x11d3, "ASUS NB", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x11f3, "ASUS NB", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x1203, "ASUS NB", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x1303, "ASUS G60J", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x1333, "ASUS G60Jx", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x1339, "ASUS NB", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x13e3, "ASUS N71JA", ALC663_ASUS_MODE7),
		SND_PCI_QUIRK(0x1043, 0x1463, "ASUS N71", ALC663_ASUS_MODE7),
		SND_PCI_QUIRK(0x1043, 0x14d3, "ASUS G72", ALC663_ASUS_MODE8),
		SND_PCI_QUIRK(0x1043, 0x1563, "ASUS N90", ALC663_ASUS_MODE3),
		SND_PCI_QUIRK(0x1043, 0x15d3, "ASUS N50SF F50SF", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x16c3, "ASUS NB", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x16f3, "ASUS K40C K50C", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x1733, "ASUS N81De", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x1753, "ASUS NB", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x1763, "ASUS NB", ALC663_ASUS_MODE6),
		SND_PCI_QUIRK(0x1043, 0x1765, "ASUS NB", ALC663_ASUS_MODE6),
		SND_PCI_QUIRK(0x1043, 0x1783, "ASUS NB", ALC662_ASUS_MODE2),
		SND_PCI_QUIRK(0x1043, 0x1793, "ASUS F50GX", ALC663_ASUS_MODE1),
		SND_PCI_QUIRK(0x1043, 0x17b3, "ASUS F70SL", ALC663_ASUS_MODE3),
		SND_PCI_QUIRK(0x1043, 0x17c3, "ASUS UX20", ALC663_ASUS_M51VA),
		SND_PCI_QUIRK(0x1043, 0x17f3, "ASUS X58LE", ALC662_ASUS_MODE2),
		@@ -17204,6 +17437,36 @@ static struct alc_config_preset alc662_presets[] = {
		.setup = alc663_mode6_setup,
		.init_hook = alc663_mode6_inithook,
		},
		[ALC663_ASUS_MODE7] = {
		.mixers = { alc663_mode7_mixer },
		.cap_mixer = alc662_auto_capture_mixer,
		.init_verbs = { alc662_init_verbs,
		alc663_mode7_init_verbs },
		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
		.hp_nid = 0x03,
		.dac_nids = alc662_dac_nids,
		.dig_out_nid = ALC662_DIGOUT_NID,
		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
		.channel_mode = alc662_3ST_2ch_modes,
		.unsol_event = alc663_mode7_unsol_event,
		.setup = alc663_mode7_setup,
		.init_hook = alc663_mode7_inithook,
		},
		[ALC663_ASUS_MODE8] = {
		.mixers = { alc663_mode8_mixer },
		.cap_mixer = alc662_auto_capture_mixer,
		.init_verbs = { alc662_init_verbs,
		alc663_mode8_init_verbs },
		.num_dacs = ARRAY_SIZE(alc662_dac_nids),
		.hp_nid = 0x03,
		.dac_nids = alc662_dac_nids,
		.dig_out_nid = ALC662_DIGOUT_NID,
		.num_channel_mode = ARRAY_SIZE(alc662_3ST_2ch_modes),
		.channel_mode = alc662_3ST_2ch_modes,
		.unsol_event = alc663_mode8_unsol_event,
		.setup = alc663_mode8_setup,
		.init_hook = alc663_mode8_inithook,
		},
		[ALC272_DELL] = {
		.mixers = { alc663_m51va_mixer },
		.cap_mixer = alc272_auto_capture_mixer,
		@@ -17687,7 +17950,9 @@ static struct hda_codec_preset snd_hda_preset_realtek[] = {
		{ .id = 0x10ec0267, .name = "ALC267", .patch = patch_alc268 },
		{ .id = 0x10ec0268, .name = "ALC268", .patch = patch_alc268 },
		{ .id = 0x10ec0269, .name = "ALC269", .patch = patch_alc269 },
		{ .id = 0x10ec0270, .name = "ALC270", .patch = patch_alc269 },
		{ .id = 0x10ec0272, .name = "ALC272", .patch = patch_alc662 },
		{ .id = 0x10ec0275, .name = "ALC275", .patch = patch_alc269 },
		{ .id = 0x10ec0861, .rev = 0x100340, .name = "ALC660",
		.patch = patch_alc861 },
		{ .id = 0x10ec0660, .name = "ALC660-VD", .patch = patch_alc861vd },