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

Commit 6c31e7ee 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:
  ASoC: Add missing comma to SND_SOC_DAPM_SWITCH_E in soc-dapm.h
  ALSA: hda: Add STAC92HD83XXX_PWR_REF quirk
  ALSA: hda: revert change to 92hd83xxx power mapping
  ALSA: hda - Add model entry for HP dv4
  ALSA: hda: 83xxx port 0xe DAC selection
  ASoC: fix registration of the SoC card in the Freescale MPC8610 drivers
  sound: virtuoso: document HDAV1.3 driver status
  sound: virtuoso: add newline
  sound: virtuoso: enable UART on Xonar HDAV1.3
  sound: Remove removed OSS kernel parameters from doc
  ALSA: hda: fix invalid power mapping masks
  ASoC: atmel_pcm: Remove non-existant header
  ALSA: hda - add quirks for some 82801H variants to use ALC883_MITAC
  ALSA: hda - Fix (yet more) STAC925x issues
parents f3b8436a 0f0779b1

Documentation/kernel-parameters.txt

+0 −7
Original line number Diff line number Diff line
@@ -577,9 +577,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			a memory unit (amount[KMG]). See also

			Documentation/kdump/kdump.txt for a example.



	cs4232=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>



	cs89x0_dma=	[HW,NET]

			Format: <dma>
@@ -732,10 +729,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			Default value is 0.

			Value can be changed at runtime via /selinux/enforce.



	es1371=		[HW,OSS]

			Format: <spdif>,[<nomix>,[<amplifier>]]

			See also header of sound/oss/es1371.c.



	ether=		[HW,NET] Ethernet cards parameters

			This option is obsoleted by the "netdev=" option, which

			has equivalent usage. See its documentation for details.

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ STAC92HD73* 
STAC92HD83*

===========

  ref		Reference board

  mic-ref	Reference board with power managment for ports



STAC9872

========

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
#define SND_SOC_DAPM_SWITCH_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

{	.id = snd_soc_dapm_switch, .name = wname, .reg = wreg, .shift = wshift, \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1 \

	.invert = winvert, .kcontrols = wcontrols, .num_kcontrols = 1, \

	.event = wevent, .event_flags = wflags}

#define SND_SOC_DAPM_MUX_E(wname, wreg, wshift, winvert, wcontrols, \

	wevent, wflags) \

sound/pci/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -744,8 +744,8 @@ config SND_VIRTUOSO 
	select SND_OXYGEN_LIB

	help

	  Say Y here to include support for sound cards based on the

	  Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2, D2X and

	  HDAV1.3 (Deluxe).

	  Asus AV100/AV200 chips, i.e., Xonar D1, DX, D2 and D2X.

	  Support for the HDAV1.3 (Deluxe) is very experimental.



	  To compile this driver as a module, choose M here: the module

	  will be called snd-virtuoso.

sound/pci/hda/patch_realtek.c

+2 −0
Original line number Diff line number Diff line
@@ -8478,6 +8478,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_ASUS_EEE1601),

	SND_PCI_QUIRK(0x105b, 0x0ce8, "Foxconn P35AX-S", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x105b, 0x6668, "Foxconn", ALC883_6ST_DIG),

	SND_PCI_QUIRK(0x1071, 0x8227, "Mitac 82801H", ALC883_MITAC),

	SND_PCI_QUIRK(0x1071, 0x8253, "Mitac 8252d", ALC883_MITAC),

	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC883_LAPTOP_EAPD),

	SND_PCI_QUIRK(0x10f1, 0x2350, "TYAN-S2350", ALC888_6ST_DELL),
@@ -8526,6 +8527,7 @@ static struct snd_pci_quirk alc883_cfg_tbl[] = { 
	SND_PCI_QUIRK(0x1991, 0x5625, "Haier W66", ALC883_HAIER_W66),

	SND_PCI_QUIRK(0x8086, 0x0001, "DG33BUC", ALC883_3ST_6ch_INTEL),

	SND_PCI_QUIRK(0x8086, 0x0002, "DG33FBC", ALC883_3ST_6ch_INTEL),

	SND_PCI_QUIRK(0x8086, 0x2503, "82801H", ALC883_MITAC),

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

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

	{}