Commit faa38b5e 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: (214 commits)
  ALSA: hda - Add pin-fix for HP dc5750
  ALSA: als4000: Fix potentially invalid DMA mode setup
  ALSA: als4000: enable burst mode
  ALSA: hda - Fix initial capsrc selection in patch_alc269()
  ASoC: TWL4030: Capture route runtime DAPM ordering fix
  ALSA: hda - Add PC-beep whitelist for an Intel board
  ALSA: hda - More relax for pending period handling
  ALSA: hda - Define AC_FMT_* constants
  ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
  ALSA: hda - Add support for HDMI HBR passthrough
  ALSA: hda - Set Stream Type in Stream Format according to AES0
  ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
  ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
  ASoC: wm9081: fix resource reclaim in wm9081_register error path
  ASoC: wm8978: fix a memory leak if a wm8978_register fail
  ASoC: wm8974: fix a memory leak if another WM8974 is registered
  ASoC: wm8961: fix resource reclaim in wm8961_register error path
  ASoC: wm8955: fix resource reclaim in wm8955_register error path
  ASoC: wm8940: fix a memory leak if wm8940_register return error
  ASoC: wm8904: fix resource reclaim in wm8904_register error path
  ...
parents 78417334 74bf40f0

Documentation/kernel-parameters.txt

+6 −161
Original line number Diff line number Diff line
@@ -281,19 +281,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			no: ACPI OperationRegions are not marked as reserved,

			no further checks are performed.



	ad1848=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<dma2>,<type>



	add_efi_memmap	[EFI; X86] Include EFI memory map in

			kernel's map of available physical RAM.



	advansys=	[HW,SCSI]

			See header of drivers/scsi/advansys.c.



	aedsp16=	[HW,OSS] Audio Excel DSP 16

			Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>

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



	agp=		[AGP]

			{ off | try_unsupported }

			off: disable AGP support
@@ -312,6 +305,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	aic79xx=	[HW,SCSI]

			See Documentation/scsi/aic79xx.txt.



	ALSA		[HW,ALSA]

			See Documentation/sound/alsa/alsa-parameters.txt



	alignment=	[KNL,ARM]

			Allow the default userspace alignment fault handler

			behaviour to be specified.  Bit 0 enables warnings,
@@ -656,8 +652,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			Disable PIN 1 of APIC timer

			Can be useful to work around chipset bugs.



	dmasound=	[HW,OSS] Sound subsystem buffers



	dma_debug=off	If the kernel is compiled with DMA_API_DEBUG support,

			this option disables the debugging code at boot.
@@ -1527,9 +1521,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			that the amount of memory usable for all allocations

			is not too small.



	mpu401=		[HW,OSS]

			Format: <io>,<irq>



	MTD_Partition=	[MTD]

			Format: <name>,<region-number>,<size>,<offset>
@@ -1854,9 +1845,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			For example, to override I2C bus2:

			omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100



	opl3=		[HW,OSS]

			Format: <io>



	oprofile.timer=	[HW]

			Use timer interrupt instead of performance counters
@@ -1868,6 +1856,9 @@ and is between 256 and 4096 characters. It is defined in the file 
				perfmon on Intel CPUs instead of the

				CPU specific event set.



	OSS		[HW,OSS]

			See Documentation/sound/oss/oss-parameters.txt



	osst=		[HW,SCSI] SCSI Tape Driver

			Format: <buffer_size>,<write_threshold>

			See also Documentation/scsi/st.txt.
@@ -1904,9 +1895,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			Currently this function knows 686a and 8231 chips.

			Format: [spp|ps2|epp|ecp|ecpepp]



	pas2=		[HW,OSS] Format:

			<io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>



	pas16=		[HW,SCSI]

			See header of drivers/scsi/pas16.c.
@@ -2178,10 +2166,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			[HW,MOUSE] Controls Logitech smartscroll autorepeat.

			0 = disabled, 1 = enabled (default).



	pss=		[HW,OSS] Personal Sound System (ECHO ESC614)

			Format:

			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>



	pt.		[PARIDE]

			See Documentation/blockdev/paride.txt.
@@ -2397,128 +2381,6 @@ and is between 256 and 4096 characters. It is defined in the file 
				1: Fast pin select (default)

				2: ATC IRMode



	snd-ad1816a=	[HW,ALSA]



	snd-ad1848=	[HW,ALSA]



	snd-ali5451=	[HW,ALSA]



	snd-als100=	[HW,ALSA]



	snd-als4000=	[HW,ALSA]



	snd-azt2320=	[HW,ALSA]



	snd-cmi8330=	[HW,ALSA]



	snd-cmipci=	[HW,ALSA]



	snd-cs4231=	[HW,ALSA]



	snd-cs4232=	[HW,ALSA]



	snd-cs4236=	[HW,ALSA]



	snd-cs4281=	[HW,ALSA]



	snd-cs46xx=	[HW,ALSA]



	snd-dt019x=	[HW,ALSA]



	snd-dummy=	[HW,ALSA]



	snd-emu10k1=	[HW,ALSA]



	snd-ens1370=	[HW,ALSA]



	snd-ens1371=	[HW,ALSA]



	snd-es968=	[HW,ALSA]



	snd-es1688=	[HW,ALSA]



	snd-es18xx=	[HW,ALSA]



	snd-es1938=	[HW,ALSA]



	snd-es1968=	[HW,ALSA]



	snd-fm801=	[HW,ALSA]



	snd-gusclassic=	[HW,ALSA]



	snd-gusextreme=	[HW,ALSA]



	snd-gusmax=	[HW,ALSA]



	snd-hdsp=	[HW,ALSA]



	snd-ice1712=	[HW,ALSA]



	snd-intel8x0=	[HW,ALSA]



	snd-interwave=	[HW,ALSA]



	snd-interwave-stb=

			[HW,ALSA]



	snd-korg1212=	[HW,ALSA]



	snd-maestro3=	[HW,ALSA]



	snd-mpu401=	[HW,ALSA]



	snd-mtpav=	[HW,ALSA]



	snd-nm256=	[HW,ALSA]



	snd-opl3sa2=	[HW,ALSA]



	snd-opti92x-ad1848=

			[HW,ALSA]



	snd-opti92x-cs4231=

			[HW,ALSA]



	snd-opti93x=	[HW,ALSA]



	snd-pmac=	[HW,ALSA]



	snd-rme32=	[HW,ALSA]



	snd-rme96=	[HW,ALSA]



	snd-rme9652=	[HW,ALSA]



	snd-sb8=	[HW,ALSA]



	snd-sb16=	[HW,ALSA]



	snd-sbawe=	[HW,ALSA]



	snd-serial=	[HW,ALSA]



	snd-sgalaxy=	[HW,ALSA]



	snd-sonicvibes=	[HW,ALSA]



	snd-sun-amd7930=

			[HW,ALSA]



	snd-sun-cs4231=	[HW,ALSA]



	snd-trident=	[HW,ALSA]



	snd-usb-audio=	[HW,ALSA,USB]



	snd-via82xx=	[HW,ALSA]



	snd-virmidi=	[HW,ALSA]



	snd-wavefront=	[HW,ALSA]



	snd-ymfpci=	[HW,ALSA]



	softlockup_panic=

			[KNL] Should the soft-lockup detector generate panics.
@@ -2533,9 +2395,6 @@ and is between 256 and 4096 characters. It is defined in the file 
	spia_pedr=

	spia_peddr=



	sscape=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>



	st=		[HW,SCSI] SCSI tape parameters (buffers, etc.)

			See Documentation/scsi/st.txt.
@@ -2675,10 +2534,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			to facilitate early boot debugging.

			See also Documentation/trace/events.txt



	trix=		[HW,OSS] MediaTrix AudioTrix Pro

			Format:

			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>



	tsc=		Disable clocksource-must-verify flag for TSC.

			Format: <string>

			[x86] reliable: mark tsc clocksource as reliable, this
@@ -2695,12 +2550,6 @@ and is between 256 and 4096 characters. It is defined in the file 
	u14-34f=	[HW,SCSI] UltraStor 14F/34F SCSI host adapter

			See header of drivers/scsi/u14-34f.c.



	uart401=	[HW,OSS]

			Format: <io>,<irq>



	uart6850=	[HW,OSS]

			Format: <io>,<irq>



	uhash_entries=	[KNL,NET]

			Set number of hash buckets for UDP/UDP-Lite connections
@@ -2866,9 +2715,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			overridden by individual drivers. 0 will hide

			cursors, 1 will display them.



	waveartist=	[HW,OSS]

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



	wd33c93=	[HW,SCSI]

			See header of drivers/scsi/wd33c93.c.
@@ -2911,5 +2757,4 @@ ______________________________________________________________________ 


TODO:



	Add documentation for ALSA options.

	Add more DRM drivers.

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

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,11 @@ ALC662/663/272 
  samsung-nc10	Samsung NC10 mini notebook

  auto		auto-config reading BIOS (default)



ALC680

======

  base		Base model (ASUS NX90)

  auto		auto-config reading BIOS (default)



ALC882/883/885/888/889

======================

  3stack-dig	3-jack with SPDIF I/O
@@ -282,6 +287,7 @@ Conexant 5051 
  hp		HP Spartan laptop

  hp-dv6736	HP dv6736

  hp-f700	HP Compaq Presario F700

  ideapad	Lenovo IdeaPad laptop

  lenovo-x200	Lenovo X200 laptop

  toshiba	Toshiba Satellite M300

Documentation/sound/alsa/Procfile.txt

+8 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ card*/pcm*/xrun_debug 
	  bit 2 = Enable additional jiffies check

	  bit 3 = Log hwptr update at each period interrupt

	  bit 4 = Log hwptr update at each snd_pcm_update_hw_ptr()

	  bit 5 = Show last 10 positions on error

	  bit 6 = Do above only once



	When the bit 0 is set, the driver will show the messages to

	kernel log when an xrun is detected.  The debug message is
@@ -122,6 +124,12 @@ card*/pcm*/xrun_debug 
	Bits 3 and 4 are for logging the hwptr records.  Note that

	these will give flood of kernel messages.



	When bit 5 is set, the driver logs the last 10 xrun errors and

	the proc file shows each jiffies, position, period_size,

	buffer_size, old_hw_ptr, and hw_ptr_base values.



	When bit 6 is set, the full xrun log is shown only once.



card*/pcm*/sub*/info

	The general information of this PCM sub-stream.

Documentation/sound/alsa/alsa-parameters.txt

0 → 100644
+135 −0
Original line number Diff line number Diff line 
                          ALSA Kernel Parameters

                          ~~~~~~~~~~~~~~~~~~~~~~



See Documentation/kernel-parameters.txt for general information on

specifying module parameters.



This document may not be entirely up to date and comprehensive. The command

"modinfo -p ${modulename}" shows a current list of all parameters of a loadable

module. Loadable modules, after being loaded into the running kernel, also

reveal their parameters in /sys/module/${modulename}/parameters/. Some of these

parameters may be changed at runtime by the command

"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".





	snd-ad1816a=	[HW,ALSA]



	snd-ad1848=	[HW,ALSA]



	snd-ali5451=	[HW,ALSA]



	snd-als100=	[HW,ALSA]



	snd-als4000=	[HW,ALSA]



	snd-azt2320=	[HW,ALSA]



	snd-cmi8330=	[HW,ALSA]



	snd-cmipci=	[HW,ALSA]



	snd-cs4231=	[HW,ALSA]



	snd-cs4232=	[HW,ALSA]



	snd-cs4236=	[HW,ALSA]



	snd-cs4281=	[HW,ALSA]



	snd-cs46xx=	[HW,ALSA]



	snd-dt019x=	[HW,ALSA]



	snd-dummy=	[HW,ALSA]



	snd-emu10k1=	[HW,ALSA]



	snd-ens1370=	[HW,ALSA]



	snd-ens1371=	[HW,ALSA]



	snd-es968=	[HW,ALSA]



	snd-es1688=	[HW,ALSA]



	snd-es18xx=	[HW,ALSA]



	snd-es1938=	[HW,ALSA]



	snd-es1968=	[HW,ALSA]



	snd-fm801=	[HW,ALSA]



	snd-gusclassic=	[HW,ALSA]



	snd-gusextreme=	[HW,ALSA]



	snd-gusmax=	[HW,ALSA]



	snd-hdsp=	[HW,ALSA]



	snd-ice1712=	[HW,ALSA]



	snd-intel8x0=	[HW,ALSA]



	snd-interwave=	[HW,ALSA]



	snd-interwave-stb=

			[HW,ALSA]



	snd-korg1212=	[HW,ALSA]



	snd-maestro3=	[HW,ALSA]



	snd-mpu401=	[HW,ALSA]



	snd-mtpav=	[HW,ALSA]



	snd-nm256=	[HW,ALSA]



	snd-opl3sa2=	[HW,ALSA]



	snd-opti92x-ad1848=

			[HW,ALSA]



	snd-opti92x-cs4231=

			[HW,ALSA]



	snd-opti93x=	[HW,ALSA]



	snd-pmac=	[HW,ALSA]



	snd-rme32=	[HW,ALSA]



	snd-rme96=	[HW,ALSA]



	snd-rme9652=	[HW,ALSA]



	snd-sb8=	[HW,ALSA]



	snd-sb16=	[HW,ALSA]



	snd-sbawe=	[HW,ALSA]



	snd-serial=	[HW,ALSA]



	snd-sgalaxy=	[HW,ALSA]



	snd-sonicvibes=	[HW,ALSA]



	snd-sun-amd7930=

			[HW,ALSA]



	snd-sun-cs4231=	[HW,ALSA]



	snd-trident=	[HW,ALSA]



	snd-usb-audio=	[HW,ALSA,USB]



	snd-via82xx=	[HW,ALSA]



	snd-virmidi=	[HW,ALSA]



	snd-wavefront=	[HW,ALSA]



	snd-ymfpci=	[HW,ALSA]

Documentation/sound/oss/oss-parameters.txt

0 → 100644
+51 −0
Original line number Diff line number Diff line 
                          OSS Kernel Parameters

                          ~~~~~~~~~~~~~~~~~~~~~



See Documentation/kernel-parameters.txt for general information on

specifying module parameters.



This document may not be entirely up to date and comprehensive. The command

"modinfo -p ${modulename}" shows a current list of all parameters of a loadable

module. Loadable modules, after being loaded into the running kernel, also

reveal their parameters in /sys/module/${modulename}/parameters/. Some of these

parameters may be changed at runtime by the command

"echo -n ${value} > /sys/module/${modulename}/parameters/${parm}".





	ad1848=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<dma2>,<type>



	aedsp16=	[HW,OSS] Audio Excel DSP 16

			Format: <io>,<irq>,<dma>,<mss_io>,<mpu_io>,<mpu_irq>

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



	dmasound=	[HW,OSS] Sound subsystem buffers



	mpu401=		[HW,OSS]

			Format: <io>,<irq>



	opl3=		[HW,OSS]

			Format: <io>



	pas2=		[HW,OSS] Format:

			<io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>



	pss=		[HW,OSS] Personal Sound System (ECHO ESC614)

			Format:

			<io>,<mss_io>,<mss_irq>,<mss_dma>,<mpu_io>,<mpu_irq>



	sscape=		[HW,OSS]

			Format: <io>,<irq>,<dma>,<mpu_io>,<mpu_irq>



	trix=		[HW,OSS] MediaTrix AudioTrix Pro

			Format:

			<io>,<irq>,<dma>,<dma2>,<sb_io>,<sb_irq>,<sb_dma>,<mpu_io>,<mpu_irq>



	uart401=	[HW,OSS]

			Format: <io>,<irq>



	uart6850=	[HW,OSS]

			Format: <io>,<irq>



	waveartist=	[HW,OSS]

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE