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

cb10ea54 · Linus Torvalds <[email protected]> · 2008-12-28 11:41:32 -08:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (367 commits)
  ALSA: ASoC: fix a typo in omp-pcm.c
  ASoC: Fix DSP formats in SSM2602 audio codec
  ASoC: Fix incorrect DSP format in OMAP McBSP DAI and affected drivers
  ALSA: hda: fix incorrect mixer index values for 92hd83xx
  ALSA: hda: dinput_mux check
  ALSA: hda - Add quirk for another HP dv7
  ALSA: ASoC - Add missing __devexit annotation to wm8350.c
  ALSA: ASoc: DaVinci: davinci-evm use dsp_b mode
  ALSA: ASoC: DaVinci: i2s, evm, pass same value to codec and cpu_dai
  ALSA: ASoC: tlv320aic3x add dsp_a
  ALSA: ASoC: DaVinci: document I2S limitations
  ALSA: ASoC: DaVinci: davinci-i2s clean up
  ALSA: ASoC: DaVinci: davinci-i2s clean up
  ALSA: ASoC: DaVinci: davinci-i2s add comments to explain polarity
  ALSA: ASoC: DaVinci: davinvi-evm, make requests explicit
  ALSA: ca0106 - disable 44.1kHz capture
  ALSA: ca0106 - Add missing card->private_data initialization
  ALSA: ca0106 - Check ac97 availability at PM
  ALSA: hda - Power up always when no jack detection is available
  ALSA: hda - Fix unused variable warnings in patch_sigmatel.c
  ...

Commit: cb10ea549fdc0ab2dd8988adab5bf40b4fa642f3
Parents: 81d6e59d · 5ce442fe

Merge commit. Changes below are compared with the first parent: 81d6e59d.

Changes

251 files changed · +22060 −7976

File	Status	Add	Del	Content
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+16	−314	View file
Documentation/sound/alsa/HD-Audio-Models.txt	added	+348	−0	View file
Documentation/sound/alsa/HD-Audio.txt	added	+577	−0	View file
Documentation/sound/alsa/Procfile.txt	modified	+10	−0	View file
Documentation/sound/alsa/soc/machine.txt	modified	+4	−4	View file
MAINTAINERS	modified	+1	−1	View file
arch/arm/mach-pxa/include/mach/palmasoc.h	added	+13	−0	View file
include/linux/input.h	modified	+2	−0	View file
include/linux/mfd/wm8350/audio.h	modified	+34	−4	View file
include/sound/ac97_codec.h	modified	+2	−0	View file
include/sound/asound.h	modified	+1	−0	View file
include/sound/core.h	modified	+25	−3	View file
include/sound/info.h	modified	+57	−49	View file
include/sound/jack.h	modified	+2	−0	View file
include/sound/l3.h	added	+18	−0	View file
include/sound/s3c24xx_uda134x.h	added	+14	−0	View file
include/sound/soc-dai.h	added	+231	−0	View file
include/sound/soc-dapm.h	modified	+0	−2	View file
include/sound/soc.h	modified	+36	−170	View file
include/sound/uda134x.h	added	+26	−0	View file
include/sound/version.h	modified	+1	−1	View file
sound/ac97_bus.c	modified	+1	−0	View file
sound/aoa/codecs/Makefile	modified	+4	−0	View file
sound/aoa/codecs/snd-aoa-codec-onyx.c → sound/aoa/codecs/onyx.c	renamed	+6	−6	View file
sound/aoa/codecs/snd-aoa-codec-onyx.h → sound/aoa/codecs/onyx.h	renamed	+0	−0	View file
sound/aoa/codecs/snd-aoa-codec-tas-basstreble.h → sound/aoa/codecs/tas-basstreble.h	renamed	+0	−0	View file
sound/aoa/codecs/snd-aoa-codec-tas-gain-table.h → sound/aoa/codecs/tas-gain-table.h	renamed	+0	−0	View file
sound/aoa/codecs/snd-aoa-codec-tas.c → sound/aoa/codecs/tas.c	renamed	+4	−4	View file
sound/aoa/codecs/snd-aoa-codec-tas.h → sound/aoa/codecs/tas.h	renamed	+0	−0	View file
sound/aoa/codecs/snd-aoa-codec-toonie.c → sound/aoa/codecs/toonie.c	renamed	+1	−1	View file
sound/aoa/core/Makefile	modified	+4	−4	View file
sound/aoa/core/snd-aoa-alsa.c → sound/aoa/core/alsa.c	renamed	+2	−2	View file
sound/aoa/core/snd-aoa-alsa.h → sound/aoa/core/alsa.h	renamed	+0	−0	View file
sound/aoa/core/snd-aoa-core.c → sound/aoa/core/core.c	renamed	+1	−1	View file
sound/aoa/core/snd-aoa-gpio-feature.c → sound/aoa/core/gpio-feature.c	renamed	+1	−1	View file
sound/aoa/core/snd-aoa-gpio-pmf.c → sound/aoa/core/gpio-pmf.c	renamed	+0	−0	View file
sound/aoa/fabrics/Makefile	modified	+2	−0	View file
sound/aoa/fabrics/snd-aoa-fabric-layout.c → sound/aoa/fabrics/layout.c	renamed	+1	−1	View file
sound/aoa/soundbus/i2sbus/Makefile	modified	+1	−1	View file
sound/aoa/soundbus/i2sbus/i2sbus-control.c → sound/aoa/soundbus/i2sbus/control.c	renamed	+0	−0	View file
sound/aoa/soundbus/i2sbus/i2sbus-core.c → sound/aoa/soundbus/i2sbus/core.c	renamed	+2	−2	View file
sound/aoa/soundbus/i2sbus/i2sbus.h	modified	+1	−1	View file
sound/aoa/soundbus/i2sbus/i2sbus-interface.h → sound/aoa/soundbus/i2sbus/interface.h	renamed	+0	−0	View file
sound/aoa/soundbus/i2sbus/i2sbus-pcm.c → sound/aoa/soundbus/i2sbus/pcm.c	renamed	+0	−0	View file
sound/core/Kconfig	modified	+21	−0	View file
sound/core/Makefile	modified	+2	−0	View file
sound/core/device.c	modified	+2	−2	View file
sound/core/hrtimer.c	added	+155	−0	View file
sound/core/info.c	modified	+17	−0	View file
sound/core/init.c	modified	+70	−1	View file
sound/core/jack.c	modified	+14	−1	View file
sound/core/rawmidi.c	modified	+2	−2	View file
sound/core/rtctimer.c	modified	+1	−1	View file
sound/core/seq/seq.c	modified	+3	−1	View file
sound/core/timer.c	modified	+1	−1	View file
sound/drivers/Kconfig	modified	+1	−1	View file
sound/drivers/pcsp/pcsp.c	modified	+3	−5	View file
sound/drivers/pcsp/pcsp.h	modified	+3	−0	View file
sound/drivers/pcsp/pcsp_lib.c	modified	+101	−67	View file
sound/drivers/vx/vx_core.c	modified	+1	−1	View file
sound/drivers/vx/vx_pcm.c	modified	+1	−1	View file
sound/isa/sb/sb8.c	modified	+3	−1	View file
sound/pci/Kconfig	modified	+3	−124	View file
sound/pci/ac97/ac97_codec.c	modified	+1	−1	View file
sound/pci/ac97/ac97_patch.c	modified	+5	−2	View file
sound/pci/ca0106/ca0106.h	modified	+24	−6	View file
sound/pci/ca0106/ca0106_main.c	modified	+333	−217	View file
sound/pci/ca0106/ca0106_mixer.c	modified	+195	−68	View file
sound/pci/cs46xx/cs46xx_lib.c	modified	+4	−1	View file
sound/pci/cs5535audio/Makefile	modified	+3	−0	View file
sound/pci/cs5535audio/cs5535audio.c	modified	+11	−1	View file
sound/pci/cs5535audio/cs5535audio.h	modified	+39	−0	View file
sound/pci/cs5535audio/cs5535audio_olpc.c	added	+179	−0	View file
sound/pci/cs5535audio/cs5535audio_pcm.c	modified	+15	−0	View file
sound/pci/emu10k1/emu10k1_main.c	modified	+258	−236	View file
sound/pci/emu10k1/emumixer.c	modified	+46	−0	View file
sound/pci/es1968.c	modified	+1	−1	View file
sound/pci/hda/Kconfig	added	+188	−0	View file
sound/pci/hda/Makefile	modified	+57	−18	View file
sound/pci/hda/hda_beep.c	modified	+2	−0	View file
sound/pci/hda/hda_codec.c	modified	+605	−176	View file
sound/pci/hda/hda_codec.h	modified	+92	−15	View file
sound/pci/hda/hda_eld.c	added	+590	−0	View file
sound/pci/hda/hda_generic.c	modified	+13	−8	View file
sound/pci/hda/hda_hwdep.c	modified	+233	−1	View file
sound/pci/hda/hda_intel.c	modified	+176	−172	View file
sound/pci/hda/hda_local.h	modified	+93	−7	View file
sound/pci/hda/hda_patch.h	deleted	+0	−22	View before deletion
sound/pci/hda/hda_proc.c	modified	+19	−72	View file
sound/pci/hda/patch_analog.c	modified	+98	−34	View file
sound/pci/hda/patch_atihdmi.c	modified	+33	−7	View file
sound/pci/hda/patch_cmedia.c	modified	+25	−2	View file
sound/pci/hda/patch_conexant.c	modified	+26	−13	View file
sound/pci/hda/patch_intelhdmi.c	added	+711	−0	View file
sound/pci/hda/patch_nvhdmi.c	modified	+29	−3	View file
sound/pci/hda/patch_realtek.c	modified	+932	−749	View file
sound/pci/hda/patch_si3054.c	modified	+33	−2	View file
sound/pci/hda/patch_sigmatel.c	modified	+772	−546	View file
sound/pci/hda/patch_via.c	modified	+90	−81	View file
sound/pci/ice1712/ice1724.c	modified	+12	−11	View file
sound/pci/maestro3.c	modified	+1	−1	View file
sound/pci/mixart/mixart.c	modified	+3	−1	View file
sound/pci/mixart/mixart_core.c	modified	+1	−1	View file
sound/pci/oxygen/oxygen.c	modified	+4	−0	View file
sound/pci/pcxhr/Makefile	modified	+1	−1	View file
sound/pci/pcxhr/pcxhr.c	modified	+386	−172	View file
sound/pci/pcxhr/pcxhr.h	modified	+51	−25	View file
sound/pci/pcxhr/pcxhr_core.c	modified	+187	−106	View file
sound/pci/pcxhr/pcxhr_core.h	modified	+4	−1	View file
sound/pci/pcxhr/pcxhr_hwdep.c	modified	+113	−45	View file
sound/pci/pcxhr/pcxhr_mix22.c	added	+820	−0	View file
sound/pci/pcxhr/pcxhr_mix22.h	added	+56	−0	View file
sound/pci/pcxhr/pcxhr_mixer.c	modified	+382	−174	View file
sound/pci/riptide/riptide.c	modified	+2	−2	View file
sound/pci/rme9652/hdsp.c	modified	+2	−2	View file
sound/pci/rme9652/hdspm.c	modified	+2	−2	View file
sound/pcmcia/pdaudiocf/pdaudiocf_irq.c	modified	+1	−1	View file
sound/ppc/pmac.c	modified	+1	−1	View file
sound/ppc/tumbler.c	modified	+2	−1	View file
sound/soc/Kconfig	modified	+6	−7	View file
sound/soc/Makefile	modified	+10	−2	View file
sound/soc/at32/Makefile	deleted	+0	−11	View before deletion
sound/soc/at32/at32-pcm.c	deleted	+0	−492	View before deletion
sound/soc/at32/at32-pcm.h	deleted	+0	−79	View before deletion
sound/soc/at32/at32-ssc.c	deleted	+0	−849	View before deletion
sound/soc/at32/at32-ssc.h	deleted	+0	−59	View before deletion
sound/soc/at91/Kconfig	deleted	+0	−10	View before deletion
sound/soc/at91/Makefile	deleted	+0	−6	View before deletion
sound/soc/at91/at91-pcm.c	deleted	+0	−434	View before deletion
sound/soc/at91/at91-ssc.c	deleted	+0	−791	View before deletion
sound/soc/at91/at91-ssc.h	deleted	+0	−27	View before deletion
sound/soc/at32/Kconfig → sound/soc/atmel/Kconfig	renamed	+26	−17	View file
sound/soc/atmel/Makefile	added	+15	−0	View file
sound/soc/atmel/atmel-pcm.c	added	+494	−0	View file
sound/soc/at91/at91-pcm.h → sound/soc/atmel/atmel-pcm.h	renamed	+40	−26	View file
sound/soc/atmel/atmel_ssc_dai.c	added	+790	−0	View file
sound/soc/atmel/atmel_ssc_dai.h	added	+121	−0	View file
sound/soc/at32/playpaq_wm8510.c → sound/soc/atmel/playpaq_wm8510.c	renamed	+5	−6	View file
sound/soc/atmel/sam9g20_wm8731.c	added	+328	−0	View file
sound/soc/au1x/dbdma2.c	modified	+2	−1	View file
sound/soc/au1x/psc-ac97.c	modified	+8	−8	View file
sound/soc/au1x/psc-i2s.c	modified	+8	−10	View file
sound/soc/au1x/sample-ac97.c	modified	+2	−2	View file
sound/soc/blackfin/Kconfig	modified	+15	−7	View file
sound/soc/blackfin/bf5xx-ac97-pcm.c	modified	+62	−51	View file
sound/soc/blackfin/bf5xx-ac97.c	modified	+110	−68	View file
sound/soc/blackfin/bf5xx-ac97.h	modified	+30	−5	View file
sound/soc/blackfin/bf5xx-ad1980.c	modified	+4	−4	View file
sound/soc/blackfin/bf5xx-ad73311.c	modified	+5	−5	View file
sound/soc/blackfin/bf5xx-i2s-pcm.c	modified	+12	−0	View file
sound/soc/blackfin/bf5xx-i2s.c	modified	+21	−10	View file
sound/soc/blackfin/bf5xx-sport.h	modified	+1	−1	View file
sound/soc/blackfin/bf5xx-ssm2602.c	modified	+7	−7	View file
sound/soc/codecs/Kconfig	modified	+49	−20	View file
sound/soc/codecs/Makefile	modified	+12	−0	View file
sound/soc/codecs/ac97.c	modified	+4	−3	View file
sound/soc/codecs/ad1980.c	modified	+18	−6	View file
sound/soc/codecs/ad73311.c	modified	+13	−5	View file
sound/soc/codecs/ak4535.c	modified	+15	−4	View file
sound/soc/codecs/cs4270.c	modified	+32	−6	View file
sound/soc/codecs/l3.c	added	+91	−0	View file
sound/soc/codecs/pcm3008.c	added	+212	−0	View file
sound/soc/codecs/pcm3008.h	added	+25	−0	View file
sound/soc/codecs/ssm2602.c	modified	+46	−11	View file
sound/soc/codecs/tlv320aic23.c	modified	+206	−56	View file
sound/soc/codecs/tlv320aic26.c	modified	+15	−7	View file
sound/soc/codecs/tlv320aic3x.c	modified	+126	−40	View file
sound/soc/codecs/tlv320aic3x.h	modified	+59	−1	View file
sound/soc/codecs/twl4030.c	added	+1317	−0	View file
sound/soc/codecs/twl4030.h	added	+219	−0	View file
sound/soc/codecs/uda134x.c	added	+668	−0	View file
sound/soc/codecs/uda134x.h	added	+36	−0	View file
sound/soc/codecs/uda1380.c	modified	+19	−10	View file
sound/soc/codecs/wm8350.c	added	+1583	−0	View file
sound/soc/codecs/wm8350.h	added	+20	−0	View file
sound/soc/codecs/wm8510.c	modified	+15	−4	View file
sound/soc/codecs/wm8580.c	modified	+70	−64	View file
sound/soc/codecs/wm8580.h	modified	+1	−0	View file
sound/soc/codecs/wm8728.c	added	+585	−0	View file
sound/soc/codecs/wm8728.h	added	+30	−0	View file
sound/soc/codecs/wm8731.c	modified	+19	−6	View file
sound/soc/codecs/wm8750.c	modified	+15	−4	View file
sound/soc/codecs/wm8753.c	modified	+24	−15	View file
sound/soc/codecs/wm8900.c	modified	+107	−155	View file
sound/soc/codecs/wm8900.h	modified	+0	−6	View file
sound/soc/codecs/wm8903.c	modified	+125	−143	View file
sound/soc/codecs/wm8903.h	modified	+0	−5	View file
sound/soc/codecs/wm8971.c	modified	+15	−4	View file
sound/soc/codecs/wm8990.c	modified	+34	−9	View file
sound/soc/codecs/wm8990.h	modified	+2	−2	View file
sound/soc/codecs/wm9712.c	modified	+7	−5	View file
sound/soc/codecs/wm9713.c	modified	+20	−26	View file
sound/soc/davinci/Kconfig	modified	+10	−0	View file
sound/soc/davinci/Makefile	modified	+2	−0	View file
sound/soc/davinci/davinci-evm.c	modified	+7	−7	View file
sound/soc/davinci/davinci-i2s.c	modified	+194	−63	View file
sound/soc/davinci/davinci-pcm.c	modified	+18	−12	View file
sound/soc/davinci/davinci-sffsdr.c	added	+157	−0	View file
sound/soc/fsl/Kconfig	modified	+1	−1	View file
sound/soc/fsl/fsl_dma.c	modified	+13	−1	View file
sound/soc/fsl/fsl_ssi.c	modified	+18	−6	View file
sound/soc/fsl/mpc5200_psc_i2s.c	modified	+14	−8	View file
sound/soc/fsl/mpc8610_hpcd.c	modified	+4	−4	View file
sound/soc/fsl/soc-of-simple.c	modified	+6	−6	View file
sound/soc/omap/Kconfig	modified	+34	−1	View file
sound/soc/omap/Makefile	modified	+8	−0	View file
sound/soc/omap/n810.c	modified	+7	−3	View file
sound/soc/omap/omap-mcbsp.c	modified	+39	−22	View file
sound/soc/omap/omap-pcm.c	modified	+13	−1	View file
sound/soc/omap/omap2evm.c	added	+151	−0	View file
sound/soc/omap/omap3beagle.c	added	+149	−0	View file
sound/soc/omap/omap3pandora.c	added	+311	−0	View file
sound/soc/omap/osk5912.c	modified	+5	−5	View file
sound/soc/omap/overo.c	added	+148	−0	View file
sound/soc/omap/sdp3430.c	added	+152	−0	View file
sound/soc/pxa/Kconfig	modified	+22	−0	View file
sound/soc/pxa/Makefile	modified	+6	−0	View file
sound/soc/pxa/corgi.c	modified	+4	−8	View file
sound/soc/pxa/e800_wm9712.c	modified	+4	−4	View file
sound/soc/pxa/em-x270.c	modified	+3	−4	View file
sound/soc/pxa/palm27x.c	added	+269	−0	View file
sound/soc/pxa/poodle.c	modified	+3	−3	View file
sound/soc/pxa/pxa-ssp.c	added	+931	−0	View file
sound/soc/pxa/pxa-ssp.h	added	+47	−0	View file
sound/soc/pxa/pxa2xx-ac97.c	modified	+23	−10	View file
sound/soc/pxa/pxa2xx-i2s.c	modified	+23	−12	View file
sound/soc/pxa/pxa2xx-pcm.c	modified	+13	−1	View file
sound/soc/pxa/spitz.c	modified	+3	−3	View file
sound/soc/pxa/tosa.c	modified	+26	−12	View file
sound/soc/pxa/zylonite.c	added	+219	−0	View file
sound/soc/s3c24xx/Kconfig	modified	+5	−0	View file
sound/soc/s3c24xx/Makefile	modified	+2	−0	View file
sound/soc/s3c24xx/ln2440sbc_alc650.c	modified	+4	−4	View file
sound/soc/s3c24xx/neo1973_wm8753.c	modified	+4	−5	View file
sound/soc/s3c24xx/s3c2412-i2s.c	modified	+24	−14	View file
sound/soc/s3c24xx/s3c2443-ac97.c	modified	+24	−6	View file
sound/soc/s3c24xx/s3c24xx-i2s.c	modified	+26	−9	View file
sound/soc/s3c24xx/s3c24xx-pcm.c	modified	+12	−0	View file
sound/soc/s3c24xx/s3c24xx_uda134x.c	added	+373	−0	View file
sound/soc/s3c24xx/smdk2443_wm9710.c	modified	+4	−4	View file
sound/soc/sh/dma-sh7760.c	modified	+12	−0	View file
sound/soc/sh/hac.c	modified	+16	−3	View file
sound/soc/sh/sh7760-ac97.c	modified	+3	−3	View file
sound/soc/sh/ssi.c	modified	+20	−10	View file
sound/soc/soc-core.c	modified	+624	−216	View file
sound/soc/soc-dapm.c	modified	+24	−58	View file
sound/sound_core.c	modified	+1	−0	View file
sound/usb/caiaq/caiaq-control.c	modified	+30	−43	View file
sound/usb/caiaq/caiaq-device.c	modified	+1	−1	View file
sound/usb/usbmidi.c	modified	+1	−1	View file
sound/usb/usx2y/usb_stream.c	modified	+2	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/sound/alsa/ALSA-Configuration.txt

View file

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 394d7d3..841a936 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -757,6 +757,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     model	- force the model name
     position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF)
     probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)
+    probe_only	- Only probing and no codec initialization (default=off);
+		  Useful to check the initial codec status for debugging
     bdl_pos_adj	- Specifies the DMA IRQ timing delay in samples.
 		Passing -1 will make the driver to choose the appropriate
 		value based on the controller chip.
@@ -772,327 +774,23 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports multiple cards and autoprobe.
     
+    See Documentation/sound/alsa/HD-Audio.txt for more details about
+    HD-audio driver.
+
     Each codec may have a model table for different configurations.
     If your machine isn't listed there, the default (usually minimal)
     configuration is set up.  You can pass "model=<name>" option to
     specify a certain model in such a case.  There are different
-    models depending on the codec chip.
-
-	  Model name	Description
-	  ----------    -----------
-	ALC880
-	  3stack	3-jack in back and a headphone out
-	  3stack-digout	3-jack in back, a HP out and a SPDIF out
-	  5stack	5-jack in back, 2-jack in front
-	  5stack-digout	5-jack in back, 2-jack in front, a SPDIF out
-	  6stack	6-jack in back, 2-jack in front
-	  6stack-digout	6-jack with a SPDIF out
-	  w810		3-jack
-	  z71v		3-jack (HP shared SPDIF)
-	  asus		3-jack (ASUS Mobo)
-	  asus-w1v	ASUS W1V
-	  asus-dig	ASUS with SPDIF out
-	  asus-dig2	ASUS with SPDIF out (using GPIO2)
-	  uniwill	3-jack
-	  fujitsu	Fujitsu Laptops (Pi1536)
-	  F1734		2-jack
-	  lg		LG laptop (m1 express dual)
-	  lg-lw		LG LW20/LW25 laptop
-	  tcl		TCL S700
-	  clevo		Clevo laptops (m520G, m665n)
-	  medion	Medion Rim 2150
-	  test		for testing/debugging purpose, almost all controls can be
-			adjusted.  Appearing only when compiled with
-			$CONFIG_SND_DEBUG=y
-	  auto		auto-config reading BIOS (default)
-
-	ALC260
-	  hp		HP machines
-	  hp-3013	HP machines (3013-variant)
-	  hp-dc7600	HP DC7600
-	  fujitsu	Fujitsu S7020
-	  acer		Acer TravelMate
-	  will		Will laptops (PB V7900)
-	  replacer	Replacer 672V
-	  basic		fixed pin assignment (old default model)
-	  test		for testing/debugging purpose, almost all controls can
-			adjusted.  Appearing only when compiled with
-			$CONFIG_SND_DEBUG=y
-	  auto		auto-config reading BIOS (default)
-
-	ALC262
-	  fujitsu	Fujitsu Laptop
-	  hp-bpc	HP xw4400/6400/8400/9400 laptops
-	  hp-bpc-d7000	HP BPC D7000
-	  hp-tc-t5735	HP Thin Client T5735
-	  hp-rp5700	HP RP5700
-	  benq		Benq ED8
-	  benq-t31	Benq T31
-	  hippo		Hippo (ATI) with jack detection, Sony UX-90s
-	  hippo_1	Hippo (Benq) with jack detection
-	  sony-assamd	Sony ASSAMD
-	  toshiba-s06	Toshiba S06
-	  toshiba-rx1	Toshiba RX1
-	  ultra		Samsung Q1 Ultra Vista model
-	  lenovo-3000	Lenovo 3000 y410
-	  nec		NEC Versa S9100
-	  basic		fixed pin assignment w/o SPDIF
-	  auto		auto-config reading BIOS (default)
-
-	ALC267/268
-	  quanta-il1	Quanta IL1 mini-notebook
-	  3stack	3-stack model
-	  toshiba	Toshiba A205
-	  acer		Acer laptops
-	  acer-aspire	Acer Aspire One
-	  dell		Dell OEM laptops (Vostro 1200)
-	  zepto		Zepto laptops
-	  test		for testing/debugging purpose, almost all controls can
-			adjusted.  Appearing only when compiled with
-			$CONFIG_SND_DEBUG=y
-	  auto		auto-config reading BIOS (default)
-
-	ALC269
-	  basic		Basic preset
-	  quanta	Quanta FL1
-	  eeepc-p703	ASUS Eeepc P703 P900A
-	  eeepc-p901	ASUS Eeepc P901 S101
-
-	ALC662/663
-	  3stack-dig	3-stack (2-channel) with SPDIF
-	  3stack-6ch	 3-stack (6-channel)
-	  3stack-6ch-dig 3-stack (6-channel) with SPDIF
-	  6stack-dig	 6-stack with SPDIF
-	  lenovo-101e	 Lenovo laptop
-	  eeepc-p701	ASUS Eeepc P701
-	  eeepc-ep20	ASUS Eeepc EP20
-	  ecs		ECS/Foxconn mobo
-	  m51va		ASUS M51VA
-	  g71v		ASUS G71V
-	  h13		ASUS H13
-	  g50v		ASUS G50V
-	  asus-mode1	ASUS
-	  asus-mode2	ASUS
-	  asus-mode3	ASUS
-	  asus-mode4	ASUS
-	  asus-mode5	ASUS
-	  asus-mode6	ASUS
-	  auto		auto-config reading BIOS (default)
-
-	ALC882/885
-	  3stack-dig	3-jack with SPDIF I/O
-	  6stack-dig	6-jack digital with SPDIF I/O
-	  arima		Arima W820Di1
-	  targa		Targa T8, MSI-1049 T8
-	  asus-a7j	ASUS A7J
-	  asus-a7m	ASUS A7M
-	  macpro	MacPro support
-	  mbp3		Macbook Pro rev3
-	  imac24	iMac 24'' with jack detection
-	  w2jc		ASUS W2JC
-	  auto		auto-config reading BIOS (default)
-
-	ALC883/888
-	  3stack-dig	3-jack with SPDIF I/O
-	  6stack-dig	6-jack digital with SPDIF I/O
-	  3stack-6ch    3-jack 6-channel
-	  3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
-	  6stack-dig-demo  6-jack digital for Intel demo board
-	  acer		Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
-	  acer-aspire	Acer Aspire 9810
-	  medion	Medion Laptops
-	  medion-md2	Medion MD2
-	  targa-dig	Targa/MSI
-	  targa-2ch-dig	Targs/MSI with 2-channel
-	  laptop-eapd   3-jack with SPDIF I/O and EAPD (Clevo M540JE, M550JE)
-	  lenovo-101e	Lenovo 101E
-	  lenovo-nb0763	Lenovo NB0763
-	  lenovo-ms7195-dig Lenovo MS7195
-	  lenovo-sky	Lenovo Sky
-	  haier-w66	Haier W66
-	  3stack-hp	HP machines with 3stack (Lucknow, Samba boards)
-	  6stack-dell	Dell machines with 6stack (Inspiron 530)
-	  mitac		Mitac 8252D
-	  clevo-m720	Clevo M720 laptop series
-	  fujitsu-pi2515 Fujitsu AMILO Pi2515
-	  3stack-6ch-intel Intel DG33* boards
-	  auto		auto-config reading BIOS (default)
-
-	ALC861/660
-	  3stack	3-jack
-	  3stack-dig	3-jack with SPDIF I/O
-	  6stack-dig	6-jack with SPDIF I/O
-	  3stack-660	3-jack (for ALC660)
-	  uniwill-m31	Uniwill M31 laptop
-	  toshiba	Toshiba laptop support
-	  asus		Asus laptop support
-	  asus-laptop	ASUS F2/F3 laptops
-	  auto		auto-config reading BIOS (default)
-
-	ALC861VD/660VD
-	  3stack	3-jack
-	  3stack-dig	3-jack with SPDIF OUT
-	  6stack-dig	6-jack with SPDIF OUT
-	  3stack-660	3-jack (for ALC660VD)
-	  3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
-	  lenovo	Lenovo 3000 C200
-	  dallas	Dallas laptops
-	  hp		HP TX1000
-	  auto		auto-config reading BIOS (default)
-
-	CMI9880
-	  minimal	3-jack in back
-	  min_fp	3-jack in back, 2-jack in front
-	  full		6-jack in back, 2-jack in front
-	  full_dig	6-jack in back, 2-jack in front, SPDIF I/O
-	  allout	5-jack in back, 2-jack in front, SPDIF out
-	  auto		auto-config reading BIOS (default)
-
-	AD1882 / AD1882A
-	  3stack	3-stack mode (default)
-	  6stack	6-stack mode
-
-	AD1884A / AD1883 / AD1984A / AD1984B
-	  desktop	3-stack desktop (default)
-	  laptop	laptop with HP jack sensing
-	  mobile	mobile devices with HP jack sensing
-	  thinkpad	Lenovo Thinkpad X300
-
-	AD1884
-	  N/A
-
-	AD1981
-	  basic		3-jack (default)
-	  hp		HP nx6320
-	  thinkpad	Lenovo Thinkpad T60/X60/Z60
-	  toshiba	Toshiba U205
-
-	AD1983
-	  N/A
-
-	AD1984
-	  basic		default configuration
-	  thinkpad	Lenovo Thinkpad T61/X61
-	  dell		Dell T3400
-
-	AD1986A
-	  6stack	6-jack, separate surrounds (default)
-	  3stack	3-stack, shared surrounds
-	  laptop	2-channel only (FSC V2060, Samsung M50)
-	  laptop-eapd	2-channel with EAPD (Samsung R65, ASUS A6J)
-	  laptop-automute 2-channel with EAPD and HP-automute (Lenovo N100)
-	  ultra		2-channel with EAPD (Samsung Ultra tablet PC)
-
-	AD1988/AD1988B/AD1989A/AD1989B
-	  6stack	6-jack
-	  6stack-dig	ditto with SPDIF
-	  3stack	3-jack
-	  3stack-dig	ditto with SPDIF
-	  laptop	3-jack with hp-jack automute
-	  laptop-dig	ditto with SPDIF
-	  auto		auto-config reading BIOS (default)
-	
-	Conexant 5045
-	  laptop-hpsense    Laptop with HP sense (old model laptop)
-	  laptop-micsense   Laptop with Mic sense (old model fujitsu)
-	  laptop-hpmicsense Laptop with HP and Mic senses
-	  benq		Benq R55E
-	  test		for testing/debugging purpose, almost all controls
-			can be adjusted.  Appearing only when compiled with
-			$CONFIG_SND_DEBUG=y
-
-	Conexant 5047
-	  laptop	Basic Laptop config 
-	  laptop-hp	Laptop config for some HP models (subdevice 30A5)
-	  laptop-eapd	Laptop config with EAPD support
-	  test		for testing/debugging purpose, almost all controls
-			can be adjusted.  Appearing only when compiled with
-			$CONFIG_SND_DEBUG=y
-
-	Conexant 5051
-	  laptop	Basic Laptop config (default)
-	  hp		HP Spartan laptop
-
-	STAC9200
-	  ref		Reference board
-	  dell-d21	Dell (unknown)
-	  dell-d22	Dell (unknown)
-	  dell-d23	Dell (unknown)
-	  dell-m21	Dell Inspiron 630m, Dell Inspiron 640m
-	  dell-m22	Dell Latitude D620, Dell Latitude D820
-	  dell-m23	Dell XPS M1710, Dell Precision M90
-	  dell-m24	Dell Latitude 120L
-	  dell-m25	Dell Inspiron E1505n
-	  dell-m26	Dell Inspiron 1501
-	  dell-m27	Dell Inspiron E1705/9400
-	  gateway	Gateway laptops with EAPD control
-	  panasonic	Panasonic CF-74
-
-	STAC9205/9254
-	  ref		Reference board
-	  dell-m42	Dell (unknown)
-	  dell-m43	Dell Precision
-	  dell-m44	Dell Inspiron
-
-	STAC9220/9221
-	  ref		Reference board
-	  3stack	D945 3stack
-	  5stack	D945 5stack + SPDIF
-	  intel-mac-v1	Intel Mac Type 1
-	  intel-mac-v2	Intel Mac Type 2
-	  intel-mac-v3	Intel Mac Type 3
-	  intel-mac-v4	Intel Mac Type 4
-	  intel-mac-v5	Intel Mac Type 5
-	  intel-mac-auto Intel Mac (detect type according to subsystem id)
-	  macmini	Intel Mac Mini (equivalent with type 3)
-	  macbook	Intel Mac Book (eq. type 5)
-	  macbook-pro-v1 Intel Mac Book Pro 1st generation (eq. type 3)
-	  macbook-pro	Intel Mac Book Pro 2nd generation (eq. type 3)
-	  imac-intel	Intel iMac (eq. type 2)
-	  imac-intel-20	Intel iMac (newer version) (eq. type 3)
-	  dell-d81	Dell (unknown)
-	  dell-d82	Dell (unknown)
-	  dell-m81	Dell (unknown)
-	  dell-m82	Dell XPS M1210
-
-	STAC9202/9250/9251
-	  ref		Reference board, base config
-	  m2-2		Some Gateway MX series laptops
-	  m6		Some Gateway NX series laptops
-	  pa6		Gateway NX860 series
-
-	STAC9227/9228/9229/927x
-	  ref		Reference board
-	  ref-no-jd	Reference board without HP/Mic jack detection
-	  3stack	D965 3stack
-	  5stack	D965 5stack + SPDIF
-	  dell-3stack	Dell Dimension E520
-	  dell-bios	Fixes with Dell BIOS setup
-
-	STAC92HD71B*
-	  ref		Reference board
-	  dell-m4-1	Dell desktops
-	  dell-m4-2	Dell desktops
-	  dell-m4-3	Dell desktops
-
-	STAC92HD73*
-	  ref		Reference board
-	  no-jd		BIOS setup but without jack-detection
-	  dell-m6-amic	Dell desktops/laptops with analog mics
-	  dell-m6-dmic	Dell desktops/laptops with digital mics
-	  dell-m6	Dell desktops/laptops with both type of mics
-
-	STAC9872
-	  vaio		Setup for VAIO FE550G/SZ110
-	  vaio-ar Setup for VAIO AR
+    models depending on the codec chip.  The list of available models
+    is found in HD-Audio-Models.txt
 
     The model name "genric" is treated as a special case.  When this
     model is given, the driver uses the generic codec parser without
     "codec-patch".  It's sometimes good for testing and debugging.
 
     If the default configuration doesn't work and one of the above
-    matches with your device, report it together with the PCI
-    subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
+    matches with your device, report it together with alsa-info.sh
+    output (with --no-upload option) to kernel bugzilla or alsa-devel
     ML (see the section "Links and Addresses").
 
     power_save and power_save_controller options are for power-saving
@@ -1652,7 +1350,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     * AuzenTech X-Meridian
     * Bgears b-Enspirer
     * Club3D Theatron DTS
-    * HT-Omega Claro
+    * HT-Omega Claro (plus)
+    * HT-Omega Claro halo (XT)
     * Razer Barracuda AC-1
     * Sondigo Inferno
 
@@ -2409,8 +2108,11 @@ Links and Addresses
   ALSA project homepage
        http://www.alsa-project.org
 
-  ALSA Bug Tracking System
-       https://bugtrack.alsa-project.org/bugs/
+  Kernel Bugzilla
+       http://bugzilla.kernel.org/
 
   ALSA Developers ML
        mailto:[email protected]
+
+  alsa-info.sh script
+       http://www.alsa-project.org/alsa-info.sh

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

View file

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
new file mode 100644
index 0000000..4b7ac21
--- /dev/null
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -0,0 +1,348 @@
+  Model name	Description
+  ----------    -----------
+ALC880
+======
+  3stack	3-jack in back and a headphone out
+  3stack-digout	3-jack in back, a HP out and a SPDIF out
+  5stack	5-jack in back, 2-jack in front
+  5stack-digout	5-jack in back, 2-jack in front, a SPDIF out
+  6stack	6-jack in back, 2-jack in front
+  6stack-digout	6-jack with a SPDIF out
+  w810		3-jack
+  z71v		3-jack (HP shared SPDIF)
+  asus		3-jack (ASUS Mobo)
+  asus-w1v	ASUS W1V
+  asus-dig	ASUS with SPDIF out
+  asus-dig2	ASUS with SPDIF out (using GPIO2)
+  uniwill	3-jack
+  fujitsu	Fujitsu Laptops (Pi1536)
+  F1734		2-jack
+  lg		LG laptop (m1 express dual)
+  lg-lw		LG LW20/LW25 laptop
+  tcl		TCL S700
+  clevo		Clevo laptops (m520G, m665n)
+  medion	Medion Rim 2150
+  test		for testing/debugging purpose, almost all controls can be
+		adjusted.  Appearing only when compiled with
+		$CONFIG_SND_DEBUG=y
+  auto		auto-config reading BIOS (default)
+
+ALC260
+======
+  hp		HP machines
+  hp-3013	HP machines (3013-variant)
+  hp-dc7600	HP DC7600
+  fujitsu	Fujitsu S7020
+  acer		Acer TravelMate
+  will		Will laptops (PB V7900)
+  replacer	Replacer 672V
+  basic		fixed pin assignment (old default model)
+  test		for testing/debugging purpose, almost all controls can
+		adjusted.  Appearing only when compiled with
+		$CONFIG_SND_DEBUG=y
+  auto		auto-config reading BIOS (default)
+
+ALC262
+======
+  fujitsu	Fujitsu Laptop
+  hp-bpc	HP xw4400/6400/8400/9400 laptops
+  hp-bpc-d7000	HP BPC D7000
+  hp-tc-t5735	HP Thin Client T5735
+  hp-rp5700	HP RP5700
+  benq		Benq ED8
+  benq-t31	Benq T31
+  hippo		Hippo (ATI) with jack detection, Sony UX-90s
+  hippo_1	Hippo (Benq) with jack detection
+  sony-assamd	Sony ASSAMD
+  toshiba-s06	Toshiba S06
+  toshiba-rx1	Toshiba RX1
+  ultra		Samsung Q1 Ultra Vista model
+  lenovo-3000	Lenovo 3000 y410
+  nec		NEC Versa S9100
+  basic		fixed pin assignment w/o SPDIF
+  auto		auto-config reading BIOS (default)
+
+ALC267/268
+==========
+  quanta-il1	Quanta IL1 mini-notebook
+  3stack	3-stack model
+  toshiba	Toshiba A205
+  acer		Acer laptops
+  acer-dmic	Acer laptops with digital-mic
+  acer-aspire	Acer Aspire One
+  dell		Dell OEM laptops (Vostro 1200)
+  zepto		Zepto laptops
+  test		for testing/debugging purpose, almost all controls can
+		adjusted.  Appearing only when compiled with
+		$CONFIG_SND_DEBUG=y
+  auto		auto-config reading BIOS (default)
+
+ALC269
+======
+  basic		Basic preset
+  quanta	Quanta FL1
+  eeepc-p703	ASUS Eeepc P703 P900A
+  eeepc-p901	ASUS Eeepc P901 S101
+  fujitsu	FSC Amilo
+  auto		auto-config reading BIOS (default)
+
+ALC662/663
+==========
+  3stack-dig	3-stack (2-channel) with SPDIF
+  3stack-6ch	 3-stack (6-channel)
+  3stack-6ch-dig 3-stack (6-channel) with SPDIF
+  6stack-dig	 6-stack with SPDIF
+  lenovo-101e	 Lenovo laptop
+  eeepc-p701	ASUS Eeepc P701
+  eeepc-ep20	ASUS Eeepc EP20
+  ecs		ECS/Foxconn mobo
+  m51va		ASUS M51VA
+  g71v		ASUS G71V
+  h13		ASUS H13
+  g50v		ASUS G50V
+  asus-mode1	ASUS
+  asus-mode2	ASUS
+  asus-mode3	ASUS
+  asus-mode4	ASUS
+  asus-mode5	ASUS
+  asus-mode6	ASUS
+  auto		auto-config reading BIOS (default)
+
+ALC882/885
+==========
+  3stack-dig	3-jack with SPDIF I/O
+  6stack-dig	6-jack digital with SPDIF I/O
+  arima		Arima W820Di1
+  targa		Targa T8, MSI-1049 T8
+  asus-a7j	ASUS A7J
+  asus-a7m	ASUS A7M
+  macpro	MacPro support
+  mbp3		Macbook Pro rev3
+  imac24	iMac 24'' with jack detection
+  w2jc		ASUS W2JC
+  auto		auto-config reading BIOS (default)
+
+ALC883/888
+==========
+  3stack-dig	3-jack with SPDIF I/O
+  6stack-dig	6-jack digital with SPDIF I/O
+  3stack-6ch    3-jack 6-channel
+  3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
+  6stack-dig-demo  6-jack digital for Intel demo board
+  acer		Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
+  acer-aspire	Acer Aspire 9810
+  acer-aspire-4930g Acer Aspire 4930G
+  medion	Medion Laptops
+  medion-md2	Medion MD2
+  targa-dig	Targa/MSI
+  targa-2ch-dig	Targs/MSI with 2-channel
+  laptop-eapd   3-jack with SPDIF I/O and EAPD (Clevo M540JE, M550JE)
+  lenovo-101e	Lenovo 101E
+  lenovo-nb0763	Lenovo NB0763
+  lenovo-ms7195-dig Lenovo MS7195
+  lenovo-sky	Lenovo Sky
+  haier-w66	Haier W66
+  3stack-hp	HP machines with 3stack (Lucknow, Samba boards)
+  6stack-dell	Dell machines with 6stack (Inspiron 530)
+  mitac		Mitac 8252D
+  clevo-m720	Clevo M720 laptop series
+  fujitsu-pi2515 Fujitsu AMILO Pi2515
+  fujitsu-xa3530 Fujitsu AMILO XA3530
+  3stack-6ch-intel Intel DG33* boards
+  auto		auto-config reading BIOS (default)
+
+ALC861/660
+==========
+  3stack	3-jack
+  3stack-dig	3-jack with SPDIF I/O
+  6stack-dig	6-jack with SPDIF I/O
+  3stack-660	3-jack (for ALC660)
+  uniwill-m31	Uniwill M31 laptop
+  toshiba	Toshiba laptop support
+  asus		Asus laptop support
+  asus-laptop	ASUS F2/F3 laptops
+  auto		auto-config reading BIOS (default)
+
+ALC861VD/660VD
+==============
+  3stack	3-jack
+  3stack-dig	3-jack with SPDIF OUT
+  6stack-dig	6-jack with SPDIF OUT
+  3stack-660	3-jack (for ALC660VD)
+  3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
+  lenovo	Lenovo 3000 C200
+  dallas	Dallas laptops
+  hp		HP TX1000
+  asus-v1s	ASUS V1Sn
+  auto		auto-config reading BIOS (default)
+
+CMI9880
+=======
+  minimal	3-jack in back
+  min_fp	3-jack in back, 2-jack in front
+  full		6-jack in back, 2-jack in front
+  full_dig	6-jack in back, 2-jack in front, SPDIF I/O
+  allout	5-jack in back, 2-jack in front, SPDIF out
+  auto		auto-config reading BIOS (default)
+
+AD1882 / AD1882A
+================
+  3stack	3-stack mode (default)
+  6stack	6-stack mode
+
+AD1884A / AD1883 / AD1984A / AD1984B
+====================================
+  desktop	3-stack desktop (default)
+  laptop	laptop with HP jack sensing
+  mobile	mobile devices with HP jack sensing
+  thinkpad	Lenovo Thinkpad X300
+
+AD1884
+======
+  N/A
+
+AD1981
+======
+  basic		3-jack (default)
+  hp		HP nx6320
+  thinkpad	Lenovo Thinkpad T60/X60/Z60
+  toshiba	Toshiba U205
+
+AD1983
+======
+  N/A
+
+AD1984
+======
+  basic		default configuration
+  thinkpad	Lenovo Thinkpad T61/X61
+  dell		Dell T3400
+
+AD1986A
+=======