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

Commit d389c7d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  [ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
  [ALSA] hda - Fix resume of auto-config mode with Realtek codecs
  [ALSA] hda - Fix model for LG LS75 laptop
  [ALSA] hda - Fix mic input on HP2133
  [ALSA] ac97 - Fix ASUS A9T laptop output
parents 4ded3835 378bd6a5

include/sound/ac97_codec.h

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ struct snd_ac97 { 
			unsigned short pcmreg[3];	// PCM registers

			unsigned short codec_cfg[3];	// CODEC_CFG bits

			unsigned char swap_mic_linein;	// AD1986/AD1986A only

			unsigned char lo_as_master;	/* LO as master */

		} ad18xx;

		unsigned int dev_flags;		/* device specific */

	} spec;

sound/pci/ac97/ac97_patch.c

+34 −14
Original line number Diff line number Diff line
@@ -1971,6 +1971,9 @@ static int snd_ac97_ad1888_lohpsel_get(struct snd_kcontrol *kcontrol, struct snd 


	val = ac97->regs[AC97_AD_MISC];

	ucontrol->value.integer.value[0] = !(val & AC97_AD198X_LOSEL);

	if (ac97->spec.ad18xx.lo_as_master)

		ucontrol->value.integer.value[0] =

			!ucontrol->value.integer.value[0];

	return 0;

}
@@ -1979,8 +1982,10 @@ static int snd_ac97_ad1888_lohpsel_put(struct snd_kcontrol *kcontrol, struct snd 
	struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);

	unsigned short val;



	val = !ucontrol->value.integer.value[0]

		? (AC97_AD198X_LOSEL | AC97_AD198X_HPSEL) : 0;

	val = !ucontrol->value.integer.value[0];

	if (ac97->spec.ad18xx.lo_as_master)

		val = !val;

	val = val ? (AC97_AD198X_LOSEL | AC97_AD198X_HPSEL) : 0;

	return snd_ac97_update_bits(ac97, AC97_AD_MISC,

				    AC97_AD198X_LOSEL | AC97_AD198X_HPSEL, val);

}
@@ -2031,7 +2036,7 @@ static void ad1888_update_jacks(struct snd_ac97 *ac97) 
{

	unsigned short val = 0;

	/* clear LODIS if shared jack is to be used for Surround out */

	if (is_shared_linein(ac97))

	if (!ac97->spec.ad18xx.lo_as_master && is_shared_linein(ac97))

		val |= (1 << 12);

	/* clear CLDIS if shared jack is to be used for C/LFE out */

	if (is_shared_micin(ac97))
@@ -2067,9 +2072,13 @@ static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = { 


static int patch_ad1888_specific(struct snd_ac97 *ac97)

{

	if (!ac97->spec.ad18xx.lo_as_master) {

		/* rename 0x04 as "Master" and 0x02 as "Master Surround" */

	snd_ac97_rename_vol_ctl(ac97, "Master Playback", "Master Surround Playback");

	snd_ac97_rename_vol_ctl(ac97, "Headphone Playback", "Master Playback");

		snd_ac97_rename_vol_ctl(ac97, "Master Playback",

					"Master Surround Playback");

		snd_ac97_rename_vol_ctl(ac97, "Headphone Playback",

					"Master Playback");

	}

	return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));

}
@@ -2088,16 +2097,27 @@ static int patch_ad1888(struct snd_ac97 * ac97) 
	

	patch_ad1881(ac97);

	ac97->build_ops = &patch_ad1888_build_ops;

	/* Switch FRONT/SURROUND LINE-OUT/HP-OUT default connection */

	/* it seems that most vendors connect line-out connector to headphone out of AC'97 */



	/*

	 * LO can be used as a real line-out on some devices,

	 * and we need to revert the front/surround mixer switches

	 */

	if (ac97->subsystem_vendor == 0x1043 &&

	    ac97->subsystem_device == 0x1193) /* ASUS A9T laptop */

		ac97->spec.ad18xx.lo_as_master = 1;



	misc = snd_ac97_read(ac97, AC97_AD_MISC);

	/* AD-compatible mode */

	/* Stereo mutes enabled */

	misc = snd_ac97_read(ac97, AC97_AD_MISC);

	snd_ac97_write_cache(ac97, AC97_AD_MISC, misc |

			     AC97_AD198X_LOSEL |

			     AC97_AD198X_HPSEL |

			     AC97_AD198X_MSPLT |

			     AC97_AD198X_AC97NC);

	misc |= AC97_AD198X_MSPLT | AC97_AD198X_AC97NC;

	if (!ac97->spec.ad18xx.lo_as_master)

		/* Switch FRONT/SURROUND LINE-OUT/HP-OUT default connection */

		/* it seems that most vendors connect line-out connector to

		 * headphone out of AC'97

		 */

		misc |= AC97_AD198X_LOSEL | AC97_AD198X_HPSEL;



	snd_ac97_write_cache(ac97, AC97_AD_MISC, misc);

	ac97->flags |= AC97_STEREO_MUTES;

	return 0;

}

sound/pci/hda/patch_analog.c

+28 −22
Original line number Diff line number Diff line
@@ -3644,33 +3644,17 @@ static struct snd_kcontrol_new ad1884a_laptop_mixers[] = { 
	{ } /* end */

};



static struct hda_input_mux ad1884a_mobile_capture_source = {

	.num_items = 2,

	.items = {

		{ "Mic", 0x1 }, /* port-C */

		{ "Mix", 0x3 },

	},

};



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),

	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, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("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("Mic Boost", 0x15, 0x0, 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),

	{

		.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 */

};
@@ -3687,14 +3671,31 @@ static void ad1884a_hp_automute(struct hda_codec *codec) 
			    present ? 0x00 : 0x02);

}



/* switch to external mic if plugged */

static void ad1884a_hp_automic(struct hda_codec *codec)

{

	unsigned int present;



	present = snd_hda_codec_read(codec, 0x14, 0,

				     AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;

	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



/* unsolicited event for HP jack sensing */

static void ad1884a_hp_unsol_event(struct hda_codec *codec, unsigned int res)

{

	if ((res >> 26) != AD1884A_HP_EVENT)

		return;

	switch (res >> 26) {

	case AD1884A_HP_EVENT:

		ad1884a_hp_automute(codec);

		break;

	case AD1884A_MIC_EVENT:

		ad1884a_hp_automic(codec);

		break;

	}

}



/* initialize jack-sensing, too */
@@ -3702,6 +3703,7 @@ static int ad1884a_hp_init(struct hda_codec *codec) 
{

	ad198x_init(codec);

	ad1884a_hp_automute(codec);

	ad1884a_hp_automic(codec);

	return 0;

}
@@ -3715,10 +3717,15 @@ static struct hda_verb ad1884a_laptop_verbs[] = { 
	/* Port-F pin */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x16, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},

	/* 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 */

	/* 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},

	{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1884A_MIC_EVENT},

	{ } /* end */

};
@@ -3878,7 +3885,6 @@ static int patch_ad1884a(struct hda_codec *codec) 
		spec->mixers[0] = ad1884a_mobile_mixers;

		spec->init_verbs[spec->num_init_verbs++] = ad1884a_laptop_verbs;

		spec->multiout.dig_out_nid = 0;

		spec->input_mux = &ad1884a_mobile_capture_source;

		codec->patch_ops.unsol_event = ad1884a_hp_unsol_event;

		codec->patch_ops.init = ad1884a_hp_init;

		break;

sound/pci/hda/patch_cmedia.c

+1 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ static const char *cmi9880_models[CMI_MODELS] = { 


static struct snd_pci_quirk cmi9880_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", CMI_FULL_DIG),

	SND_PCI_QUIRK(0x1854, 0x002b, "LG LS75", CMI_MINIMAL),

	SND_PCI_QUIRK(0x1854, 0x0032, "LG", CMI_FULL_DIG),

	{} /* terminator */

};

sound/pci/hda/patch_realtek.c

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,6 @@ do_sku: 
			    AC_VERB_SET_UNSOLICITED_ENABLE,

			    AC_USRSP_EN | ALC880_HP_EVENT);

	spec->unsol_event = alc_sku_unsol_event;

	spec->init_hook = alc_sku_automute;	

}



/*
@@ -10513,6 +10512,7 @@ static struct snd_pci_quirk alc268_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),

	SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x14c0, 0x0025, "COMPAL IFL90/JFL-92", ALC268_TOSHIBA),

	SND_PCI_QUIRK(0x152d, 0x0763, "Diverse (CPR2000)", ALC268_ACER),

	SND_PCI_QUIRK(0x152d, 0x0771, "Quanta IL1", ALC267_QUANTA_IL1),

	SND_PCI_QUIRK(0x1170, 0x0040, "ZEPTO", ALC268_ZEPTO),