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

Commit 01da4705 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:
  sound: sequencer: clean up remove bogus check
  ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212
  ALSA: hda - Disable MSI for Nvidia controller
  ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220
  ALSA: hda - Fix secondary ADC of ALC260 basic model
  ALSA: hda - Add an error message for invalid mapping NID
  ALSA: hda - New Intel HDA controller
parents 61d71807 e04dd2d2

sound/oss/sequencer.c

+0 −2
Original line number Diff line number Diff line
@@ -1631,8 +1631,6 @@ unsigned long compute_finetune(unsigned long base_freq, int bend, int range, 
	}



	semitones = bend / 100;

	if (semitones > 99)

		semitones = 99;

	cents = bend % 100;



	amount = (int) (semitone_tuning[semitones] * multiplier * cent_tuning[cents]) / 10000;

sound/pci/hda/hda_codec.c

+3 −1
Original line number Diff line number Diff line
@@ -1806,6 +1806,8 @@ int snd_hda_add_nid(struct hda_codec *codec, struct snd_kcontrol *kctl, 
		item->nid = nid;

		return 0;

	}

	printk(KERN_ERR "hda-codec: no NID for mapping control %s:%d:%d\n",

	       kctl->id.name, kctl->id.index, index);

	return -EINVAL;

}

EXPORT_SYMBOL_HDA(snd_hda_add_nid);

sound/pci/hda/hda_intel.c

+9 −0
Original line number Diff line number Diff line
@@ -2271,6 +2271,7 @@ static struct snd_pci_quirk position_fix_list[] __devinitdata = { 
	SND_PCI_QUIRK(0x1043, 0x813d, "ASUS P5AD2", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1462, 0x1002, "MSI Wind U115", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x1565, 0x820f, "Biostar Microtech", POS_FIX_LPIB),

	SND_PCI_QUIRK(0x8086, 0xd601, "eMachines T5212", POS_FIX_LPIB),

	{}

};
@@ -2378,6 +2379,13 @@ static void __devinit check_msi(struct azx *chip) 
		       "hda_intel: msi for device %04x:%04x set to %d\n",

		       q->subvendor, q->subdevice, q->value);

		chip->msi = q->value;

		return;

	}



	/* NVidia chipsets seem to cause troubles with MSI */

	if (chip->driver_type == AZX_DRIVER_NVIDIA) {

		printk(KERN_INFO "hda_intel: Disable MSI for Nvidia chipset\n");

		chip->msi = 0;

	}

}
@@ -2706,6 +2714,7 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
	{ PCI_DEVICE(0x8086, 0x3a6e), .driver_data = AZX_DRIVER_ICH },

	/* PCH */

	{ PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_ICH },

	{ PCI_DEVICE(0x8086, 0x3b57), .driver_data = AZX_DRIVER_ICH },

	/* CPT */

	{ PCI_DEVICE(0x8086, 0x1c20), .driver_data = AZX_DRIVER_PCH },

	/* SCH */

sound/pci/hda/patch_realtek.c

+4 −2
Original line number Diff line number Diff line
@@ -6477,7 +6477,7 @@ static struct alc_config_preset alc260_presets[] = { 
		.num_dacs = ARRAY_SIZE(alc260_dac_nids),

		.dac_nids = alc260_dac_nids,

		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),

		.adc_nids = alc260_adc_nids,

		.adc_nids = alc260_dual_adc_nids,

		.num_channel_mode = ARRAY_SIZE(alc260_modes),

		.channel_mode = alc260_modes,

		.input_mux = &alc260_capture_source,
@@ -9195,6 +9195,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1462, 0x4314, "MSI", ALC883_TARGA_DIG),

	SND_PCI_QUIRK(0x1462, 0x4319, "MSI", ALC883_TARGA_DIG),

	SND_PCI_QUIRK(0x1462, 0x4324, "MSI", ALC883_TARGA_DIG),

	SND_PCI_QUIRK(0x1462, 0x4570, "MSI Wind Top AE2220", ALC883_TARGA_DIG),

	SND_PCI_QUIRK(0x1462, 0x6510, "MSI GX620", ALC883_TARGA_8ch_DIG),

	SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1462, 0x7187, "MSI", ALC883_6ST_DIG),
@@ -9204,6 +9205,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1462, 0x7280, "MSI", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1462, 0x7350, "MSI", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1462, 0x7437, "MSI NetOn AP1900", ALC883_TARGA_DIG),

	SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG),

	SND_PCI_QUIRK(0x1462, 0xaa08, "MSI", ALC883_TARGA_2ch_DIG),










@@ -9235,7 +9237,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {













	SND_PCI_QUIRK(0x8086, 0x0022, "DX58SO", ALC889_INTEL),















	SND_PCI_QUIRK(0x8086, 0x0021, "Intel IbexPeak", ALC889A_INTEL),















	SND_PCI_QUIRK(0x8086, 0x3b56, "Intel IbexPeak", ALC889A_INTEL),













	SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC883_3ST_6ch),













	SND_PCI_QUIRK(0x8086, 0xd601, "D102GGC", ALC882_6ST_DIG),





























	{}















};