litmus-rt.git/include/sound, branch linux-tip

ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI

2010-11-24T06:29:56+00:00

Current AP4 FSI set_rate function used bogus clock process
which didn't care enable/disable and clk->usecound.
To solve this issue, this patch also modify FSI driver to call
set_rate with enough options.
This patch modify it.

Signed-off-by: Kuninori Morimoto 
Signed-off-by: Paul Mundt

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

2010-10-25T15:32:05+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
  ALSA: hda - Disable sticky PCM stream assignment for AD codecs
  ALSA: usb - Creative USB X-Fi volume knob support
  ALSA: ca0106: Use card specific dac id for mute controls.
  ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
  ALSA: ca0106: Create a nice spot for mapping channels to dacs.
  ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
  ALSA: ca0106: Pull out dac powering routine into separate function.
  ALSA: ca0106 - add Sound Blaster 5.1vx info.
  ASoC: tlv320dac33: Use usleep_range for delays
  ALSA: usb-audio: add Novation Launchpad support
  ALSA: hda - Add workarounds for CT-IBG controllers
  ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
  ASoC: tpa6130a2: Error handling for broken chip
  ASoC: max98088: Staticise m98088_eq_band
  ASoC: soc-core: Fix codec->name memory leak
  ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
  ALSA: hda - Add some workarounds for Creative IBG
  ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
  ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
  ALSA: hda - Add alc_init_jacks() call to other codecs
  ...

Merge branch 'topic/hda' into for-linus

2010-10-25T08:40:05+00:00

Merge branch 'topic/asoc' into for-linus

2010-10-25T08:00:30+00:00

Conflicts:
	arch/powerpc/platforms/85xx/p1022_ds.c

driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices

2010-10-22T17:16:43+00:00

This patch removes the old CONFIG_SYSFS_DEPRECATED_V2 config option,
but it keeps the logic around to handle block devices in the old manner
as some people like to run new kernel versions on old (pre 2007/2008)
distros.

Signed-off-by: Kay Sievers 
Cc: Jens Axboe 
Cc: Stephen Hemminger 
Cc: "Eric W. Biederman" 
Cc: Alan Stern 
Cc: "James E.J. Bottomley" 
Cc: Andrew Morton 
Cc: Alexey Kuznetsov 
Cc: Randy Dunlap 
Cc: Tejun Heo 
Cc: "David S. Miller" 
Cc: Jaroslav Kysela 
Cc: Takashi Iwai 
Cc: Ingo Molnar 
Cc: Peter Zijlstra 
Cc: David Howells 
Signed-off-by: Greg Kroah-Hartman

ASoC: Restore MAX98088 CODEC driver

2010-10-18T23:46:27+00:00

This reverts commit f6765502f8daae3d237a394889276c8987f3e299 and adds
the missing include file.

Signed-off-by: Peter Hsiang 
Signed-off-by: Mark Brown

ALSA: emu10k1: Fix warning: "CCR" redefined

2010-10-18T05:45:44+00:00

CCR is defined in emu10k1, but SuperH is defined too.
If user use this driver with SuperH, it becomes a double definition.

Signed-off-by: Nobuhiro Iwamatsu 
Cc: Paul Mundt 
Signed-off-by: Takashi Iwai

ALSA: tlv - Define numbers in sound/tlv.h

2010-10-17T08:46:14+00:00

Signed-off-by: Takashi Iwai

ALSA: fix unused warnings with snd_power_get_state

2010-10-17T08:08:45+00:00

If we compile the ASoC code with PM disabled, we hit stuff like:
sound/soc/soc-dapm.c: In function 'snd_soc_dapm_suspend_check':
sound/soc/soc-dapm.c:440: warning: unused variable 'codec'

So tweak the stub macro to avoid these issues.

Signed-off-by: Mike Frysinger 
Signed-off-by: Takashi Iwai

ASoC: don't register AC97 devices twice

2010-10-13T09:35:17+00:00

With generic AC97 ASoC glue driver (codec/ac97.c), we get following warning when
the device is registered (slightly stripped the backtrace):

kobject (c5a863e8): tried to init an initialized object, something is seriously
                    wrong.
[] (unwind_backtrace+0x0/0xec)
[] (kobject_init+0x38/0x70)
[] (device_initialize+0x20/0x70)
[] (device_register+0xc/0x18)
[] (snd_soc_instantiate_cards+0x924/0xacc [snd_soc_core])
[] (snd_soc_register_platform+0x16c/0x198 [snd_soc_core])
[] (platform_drv_probe+0x18/0x1c)
[] (driver_probe_device+0xb0/0x16c)
[] (__driver_attach+0x5c/0x7c)
[] (bus_for_each_dev+0x48/0x78)
[] (bus_add_driver+0x98/0x214)
[] (driver_register+0xa4/0x130)
[] (do_one_initcall+0xd0/0x1a4)
[] (sys_init_module+0x12b0/0x1454)

This happens because the generic AC97 glue driver creates its codec->ac97 via
calling snd_ac97_mixer(). snd_ac97_mixer() provides own version of
snd_device.register which handles the device registration when
snd_card_register() is called.

To avoid registering the AC97 device twice, we add a new flag to the
snd_soc_codec: ac97_created which tells whether the AC97 device was created by
SoC subsystem.

Signed-off-by: Mika Westerberg 
Acked-by: Liam Girdwood 
Signed-off-by: Mark Brown