linux/include/sound, branch v2.6.31.12

Merge branch 'topic/pcm-jiffies-check' into for-linus

2009-06-10T05:26:41Z

* topic/pcm-jiffies-check: ALSA: pcm - A helper function to compose PCM stream name for debug prints ALSA: pcm - Fix update of runtime->hw_ptr_interrupt ALSA: pcm - Fix a typo in hw_ptr update check ALSA: PCM midlevel: lower jiffies check margin using runtime->delay value ALSA: PCM midlevel: Do not update hw_ptr_jiffies when hw_ptr is not changed ALSA: PCM midlevel: introduce mask for xrun_debug() macro ALSA: PCM midlevel: improve fifo_size handling

Merge branch 'topic/pcm-delay' into for-linus

2009-06-10T05:26:40Z

* topic/pcm-delay: ALSA: usbaudio - Add delay account ALSA: Add extra delay count in PCM

Merge branch 'topic/div64-cleanup' into for-linus

2009-06-10T05:26:28Z

* topic/div64-cleanup: ALSA: Clean up 64bit division functions

Merge branch 'topic/cleanup' into for-linus

2009-06-10T05:26:24Z

* topic/cleanup: ALSA: Remove deprecated include/sound/driver.h ALSA: Remove deprecated snd_card_new()

Merge branch 'topic/caiaq' into for-linus

2009-06-10T05:26:23Z

* topic/caiaq: ALSA: snd_usb_caiaq: bump version number ALSA: snd_usb_caiaq: give better shortname ALSA: Core - add snd_card_set_id() function ALSA: snd_usb_caiaq: give better longname ALSA: snd_usb_caiaq: use strlcpy ALSA: snd_usb_caiaq: clean whitespaces

Merge branch 'topic/asoc' into for-linus

2009-06-10T05:26:18Z

* topic/asoc: (135 commits) ASoC: Apostrophe patrol ASoC: codec tlv320aic23 fix bogus divide by 0 message ASoC: fix NULL pointer dereference in soc_suspend() ASoC: Fix build error in twl4030.c ASoC: SSM2602: assign last substream to the master when shutting down ASoC: Blackfin: document how anomaly 05000250 is handled ASoC: Blackfin: set the transfer size according the ac97_frame size ASoC: SSM2602: remove unsupported sample rates ASoC: TWL4030: Check the interface format for 4 channel mode ASoC: TWL4030: Use reg_cache in twl4030_init_chip ASoC: Initialise dev for the dummy S/PDIF DAI ASoC: Add dummy S/PDIF codec support ASoC: correct print specifiers for unsigneds ASoC: Modify mpc5200 AC97 driver to use V9 of spin_event_timeout() ASoC: Switch FSL SSI DAI over to symmetric_rates ASoC: Mark MPC5200 AC97 as BROKEN until PowerPC merge issues are resolved ASoC: Fabric bindings for STAC9766 on the Efika ASoC: Support for AC97 on Phytec pmc030 base board. ASoC: AC97 driver for mpc5200 ASoC: Main rewite of the mpc5200 audio DMA code ...

ALSA: Clean up 64bit division functions

2009-06-05T15:45:17Z

Replace the house-made div64_32() with the standard div_u64*() functions. Signed-off-by: Takashi Iwai

ALSA: Core - add snd_card_set_id() function

2009-06-02T10:47:46Z

Introduce snd_card_set_id() function to allow lowlevel drivers to set default identification name for card slot. The function checks also for identification name collisions and tries to create unique name. Also, the snd_card_create() function is simplified, because this new function is used. As bonus, proper name collision checks are evaluated at the card create time. Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai

ALSA: PCM midlevel: improve fifo_size handling

2009-05-29T09:47:33Z

Move the fifo_size assignment to hw->ioctl callback to allow lowlevel drivers overwrite the default behaviour. fifo_size is in frames not bytes as specified in asound.h and alsa-lib's documentation, but most hardware have fixed byte based FIFOs. Introduce internal SNDRV_PCM_INFO_FIFO_IN_FRAMES. Signed-off-by: Jaroslav Kysela Signed-off-by: Takashi Iwai

Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check

2009-05-29T09:46:10Z