Commit 98ae6878 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] hda-intel - Fix HDA buffer alignment
  [ALSA] hda-codec - Add model for HP Compaq d5750
  [ALSA] hda-codec - Add support for MacBook Pro 1st generation
  [ALSA] version 1.0.14rc3
  [ALSA] hda-codec - Add model for HP Compaq d5700
  [ALSA] intel8x0 - Fix Oops at kdump crash kernel
  [ALSA] hda-codec - Fix speaker output on MacPro
  [ALSA] hda-codec - more systems for Analog Devices
  [ALSA] hda-intel - Fix codec probe with ATI contorllers
  [ALSA] hda-codec - Add suppoprt for Asus M2N-SLI motherboard
  [ALSA] intel8x0 - Fix speaker output after S2RAM
  [ALSA] ac97 - fix AD shared shared jack control logic
  [ALSA] soc - Fix dependencies in Kconfig files
parents b720a3be 5f1545bc

Documentation/sound/alsa/ALSA-Configuration.txt

+3 −1
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  basic		3-jack (default)

	  hp		HP nx6320

	  thinkpad	Lenovo Thinkpad T60/X60/Z60

	  toshiba	Toshiba U205



	AD1986A

	  6stack	6-jack, separate surrounds (default)
@@ -906,7 +907,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  5stack	D945 5stack + SPDIF

	  macmini	Intel Mac Mini

	  macbook	Intel Mac Book

	  macbook-pro	Intel Mac Book Pro

	  macbook-pro-v1 Intel Mac Book Pro 1st generation

	  macbook-pro	Intel Mac Book Pro 2nd generation



	STAC9202/9250/9251

	  ref		Reference board, base config

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.14rc3"

#define CONFIG_SND_DATE " (Tue Mar 06 13:10:00 2007 UTC)"
 
#define CONFIG_SND_DATE " (Wed Mar 14 07:25:50 2007 UTC)"

sound/pci/ac97/ac97_patch.c

+8 −5
Original line number Diff line number Diff line
@@ -1962,9 +1962,11 @@ static int snd_ac97_ad1888_downmix_put(struct snd_kcontrol *kcontrol, struct snd 
static void ad1888_update_jacks(struct snd_ac97 *ac97)

{

	unsigned short val = 0;

	if (! is_shared_linein(ac97))

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

	if (is_shared_linein(ac97))

		val |= (1 << 12);

	if (! is_shared_micin(ac97))

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

	if (is_shared_micin(ac97))

		val |= (1 << 11);

	/* shared Line-In */

	snd_ac97_update_bits(ac97, AC97_AD_MISC, (1 << 11) | (1 << 12), val);
@@ -2136,8 +2138,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1985_controls[] = { 
static void ad1985_update_jacks(struct snd_ac97 *ac97)

{

	ad1888_update_jacks(ac97);

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

	snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 1 << 9,

			     is_shared_micin(ac97) ? 0 : 1 << 9);

			     is_shared_micin(ac97) ? 1 << 9 : 0);

}



static int patch_ad1985_specific(struct snd_ac97 *ac97)

sound/pci/hda/hda_intel.c

+15 −2
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ enum { SDI0, SDI1, SDI2, SDI3, SDO0, SDO1, SDO2, SDO3 }; 


/* STATESTS int mask: SD2,SD1,SD0 */

#define STATESTS_INT_MASK	0x07

#define AZX_MAX_CODECS		3



/* SD_CTL bits */

#define SD_CTL_STREAM_RESET	0x01	/* stream reset bit */
@@ -966,6 +965,16 @@ static int azx_setup_controller(struct azx *chip, struct azx_dev *azx_dev) 
 * Codec initialization

 */



static unsigned int azx_max_codecs[] __devinitdata = {

	[AZX_DRIVER_ICH] = 3,

	[AZX_DRIVER_ATI] = 4,

	[AZX_DRIVER_ATIHDMI] = 4,

	[AZX_DRIVER_VIA] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_SIS] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_ULI] = 3,		/* FIXME: correct? */

	[AZX_DRIVER_NVIDIA] = 3,	/* FIXME: correct? */

};



static int __devinit azx_codec_create(struct azx *chip, const char *model)

{

	struct hda_bus_template bus_temp;
@@ -982,7 +991,7 @@ static int __devinit azx_codec_create(struct azx *chip, const char *model) 
		return err;



	codecs = 0;

	for (c = 0; c < AZX_MAX_CODECS; c++) {

	for (c = 0; c < azx_max_codecs[chip->driver_type]; c++) {

		if ((chip->codec_mask & (1 << c)) & probe_mask) {

			err = snd_hda_codec_new(chip->bus, c, NULL);

			if (err < 0)
@@ -1078,6 +1087,10 @@ static int azx_pcm_open(struct snd_pcm_substream *substream) 
	runtime->hw.rates = hinfo->rates;

	snd_pcm_limit_hw_rates(runtime);

	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);

	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,

				   128);

	snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,

				   128);

	if ((err = hinfo->ops.open(hinfo, apcm->codec, substream)) < 0) {

		azx_release_device(azx_dev);

		mutex_unlock(&chip->open_mutex);

sound/pci/hda/patch_analog.c

+38 −3
Original line number Diff line number Diff line
@@ -833,12 +833,14 @@ static struct snd_pci_quirk ad1986a_cfg_tbl[] = { 
	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(0x144d, 0xb03c, "Samsung R55", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xc01e, "FSC V2060", AD1986A_LAPTOP),

	SND_PCI_QUIRK(0x144d, 0xc023, "Samsung X60", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc024, "Samsung R65", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc026, "Samsung X11", AD1986A_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x144d, 0xc504, "Samsung Q35", AD1986A_3STACK),

	SND_PCI_QUIRK(0x144d, 0xc027, "Samsung Q1", AD1986A_ULTRA),

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

	SND_PCI_QUIRK(0x17c0, 0x2017, "Samsung M50", AD1986A_LAPTOP),
@@ -1205,7 +1207,7 @@ static struct hda_verb ad1981_init_verbs[] = { 
/*

 * Patch for HP nx6320

 *

 * nx6320 uses EAPD in the reserve way - EAPD-on means the internal

 * nx6320 uses EAPD in the reverse way - EAPD-on means the internal

 * speaker output enabled _and_ mute-LED off.

 */
@@ -1373,6 +1375,21 @@ static int ad1981_hp_init(struct hda_codec *codec) 
	return 0;

}



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

	{ }

};



/* configuration for Lenovo Thinkpad T60 */

static struct snd_kcontrol_new ad1981_thinkpad_mixers[] = {

	HDA_CODEC_VOLUME("Master Playback Volume", 0x05, 0x0, HDA_OUTPUT),
@@ -1418,6 +1435,7 @@ enum { 
	AD1981_BASIC,

	AD1981_HP,

	AD1981_THINKPAD,

	AD1981_TOSHIBA,

	AD1981_MODELS

};
@@ -1425,6 +1443,7 @@ 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[] = {
@@ -1435,6 +1454,7 @@ static struct snd_pci_quirk ad1981_cfg_tbl[] = { 
	/* Lenovo Thinkpad T60/X60/Z6xx */

	SND_PCI_QUIRK(0x17aa, 0, "Lenovo Thinkpad", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x1014, 0x0597, "Lenovo Z60", AD1981_THINKPAD),

	SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba U205", AD1981_TOSHIBA),

	{}

};
@@ -1485,8 +1505,17 @@ static int patch_ad1981(struct hda_codec *codec) 
		spec->mixers[0] = ad1981_thinkpad_mixers;

		spec->input_mux = &ad1981_thinkpad_capture_source;

		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;

	}



	return 0;

}
@@ -2607,6 +2636,12 @@ static const char *ad1988_models[AD1988_MODEL_LAST] = { 
	[AD1988_AUTO]		= "auto",

};



static struct snd_pci_quirk ad1988_cfg_tbl[] = {

	SND_PCI_QUIRK(0x1043, 0x81f6, "Asus M2N-SLI", AD1988_6STACK_DIG),

	SND_PCI_QUIRK(0x1043, 0x81ec, "Asus P5B-DLX", AD1988_6STACK_DIG),

	{}

};



static int patch_ad1988(struct hda_codec *codec)

{

	struct ad198x_spec *spec;
@@ -2623,7 +2658,7 @@ static int patch_ad1988(struct hda_codec *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, NULL);

						  ad1988_models, ad1988_cfg_tbl);

	if (board_config < 0) {

		printk(KERN_INFO "hda_codec: Unknown model for AD1988, trying auto-probe from BIOS...\n");

		board_config = AD1988_AUTO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE