]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 14 Jan 2011 08:45:40 +0000 (09:45 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - Suppress the odd number of channels for HDMI
Takashi Iwai [Fri, 14 Jan 2011 08:42:27 +0000 (09:42 +0100)]
ALSA: hda - Suppress the odd number of channels for HDMI

It looks like that HDMI codecs don't support the odd number of channels
although HD-audio spec doesn't have the restriction.  Add the
hw_constraint to limit to only the even number of channels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 14 Jan 2011 08:35:17 +0000 (09:35 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoMerge branch 'for-linus' into for-next
Takashi Iwai [Fri, 14 Jan 2011 08:05:38 +0000 (09:05 +0100)]
Merge branch 'for-linus' into for-next

13 years agoALSA: hda - Add fixup-call in init callback
Takashi Iwai [Thu, 13 Jan 2011 14:41:45 +0000 (15:41 +0100)]
ALSA: hda - Add fixup-call in init callback

In some cases, the fix-up is required in the init callback to be called
both at the first initialization and at the resume.  The new action type
ALC_FIXUP_ACT_INIT is used for this case.

So far, only ALC275_FIXUP_SONY_HWEQ uses this.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Reorganize fixup structure for Realtek
Takashi Iwai [Thu, 13 Jan 2011 13:22:32 +0000 (14:22 +0100)]
ALSA: hda - Reorganize fixup structure for Realtek

Instead of keeping various data types in a single record, put the
type field and keep a single value in each entry, but allows chaining
multiple fixup entries.  This allows more flexible data management
(see ALC275_FIXUP_SONY_HWEQ for example).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Apply Sony VAIO hweq fixup only once
Takashi Iwai [Thu, 13 Jan 2011 13:40:43 +0000 (14:40 +0100)]
ALSA: hda - Apply Sony VAIO hweq fixup only once

This should be applied also only once as a part of the initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Apply mario fixup only once
Takashi Iwai [Thu, 13 Jan 2011 13:36:37 +0000 (14:36 +0100)]
ALSA: hda - Apply mario fixup only once

The amp-override is necessary only once at initialization time.
Also fixed a coding style issue.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Remove unused fixup entry for ALC262
Takashi Iwai [Thu, 13 Jan 2011 13:14:41 +0000 (14:14 +0100)]
ALSA: hda - Remove unused fixup entry for ALC262

... and a minor cleanup.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/asoc' into for-linus
Takashi Iwai [Thu, 13 Jan 2011 07:37:24 +0000 (08:37 +0100)]
Merge branch 'topic/asoc' into for-linus

13 years agoMerge branch 'topic/hda' into for-linus
Takashi Iwai [Thu, 13 Jan 2011 07:37:19 +0000 (08:37 +0100)]
Merge branch 'topic/hda' into for-linus

13 years agoMerge branch 'topic/misc' into for-linus
Takashi Iwai [Thu, 13 Jan 2011 07:37:14 +0000 (08:37 +0100)]
Merge branch 'topic/misc' into for-linus

13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 13 Jan 2011 07:30:07 +0000 (08:30 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection
Takashi Iwai [Thu, 13 Jan 2011 07:08:08 +0000 (08:08 +0100)]
ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection

When only one mic is available and it's an analog mic, the current
IDT/STAC parser may give an Oops.

Reference: bko#25692
https://bugzilla.kernel.org/show_bug.cgi?id=25692

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 12 Jan 2011 11:32:25 +0000 (12:32 +0100)]
Merge branch 'topic/asoc' into for-next

13 years agoMerge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Wed, 12 Jan 2011 11:26:24 +0000 (12:26 +0100)]
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc

13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 12 Jan 2011 08:11:11 +0000 (09:11 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Add missing NID 0x19 fixup for Sony VAIO
Takashi Iwai [Wed, 12 Jan 2011 08:03:05 +0000 (09:03 +0100)]
ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO

With GPIO2-fixup, another fixup for NID 0x19 was missing because the
fixup is applied only once.  Add the corresponding verb to the entry.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO
Kailang Yang [Wed, 12 Jan 2011 08:01:23 +0000 (09:01 +0100)]
ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO

SONY VAIO ALC275 default BIOS verb set the hardware EQ to disable.
Enable it when driver is loading.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 12 Jan 2011 07:33:36 +0000 (08:33 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 12 Jan 2011 07:33:04 +0000 (08:33 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: oxygen: fix Xonar DG input
Clemens Ladisch [Wed, 12 Jan 2011 07:30:12 +0000 (08:30 +0100)]
ALSA: oxygen: fix Xonar DG input

Apparently, this card uses the other I2S input.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Fix EAPD on Lenovo NB ALC269 to low
Kailang Yang [Wed, 12 Jan 2011 07:12:52 +0000 (08:12 +0100)]
ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low

Lenovo NB 0x9e54 use the external AMP in an inverted manner.
Set EAPD to low will enable the AMP.

Signed-off-by: Kailang Yang <kailang@realtek.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 12 Jan 2011 07:05:17 +0000 (08:05 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Fix missing EAPD for Acer 4930G
Takashi Iwai [Wed, 12 Jan 2011 07:03:39 +0000 (08:03 +0100)]
ALSA: hda - Fix missing EAPD for Acer 4930G

The proper initializatio of NID 0x15 EAPD is missing in the quirk for
Acer 4930G.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 12 Jan 2011 06:46:56 +0000 (07:46 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
Nitin Daga [Mon, 10 Jan 2011 16:19:31 +0000 (21:49 +0530)]
ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.

Added hardware constraint in patch_hdmi.c to disable
channels 4/6 which are not supported by some older
NVIDIA GPUs.

Signed-off-by: Nitin Daga <ndaga@nvidia.com>
Acked-By: Stephen Warren <swarren@nvidia.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
Takashi Iwai [Tue, 11 Jan 2011 17:11:04 +0000 (18:11 +0100)]
ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser

The dynamic PCM restriction based on ELD information may lead to the
problem in some cases, e.g. when the receiver is turned off.  Then it
may send a TV HDMI default such as channels = 2.  Since it's still
plugged, the driver doesn't know whether it's the right configuration
for future use.  Now, when an app opens the device at this moment,
then turn on the receiver, the app still sends channels=2.

The right solution is to implement some kind of notification and
automatic re-open mechanism.  But, this is a goal far ahead.

This patch provides a workaround for such a case by providing a new
module option static_hdmi_pcm for snd-hda-codec-hdmi module.  When
this is set to true, the driver doesn't change PCM parameters per
ELD information.  For users who need the static configuration like
the scenario above, set this to true.

The parameter can be changed dynamically via sysfs, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoALSA: hda - Don't refer ELD when unplugged
Takashi Iwai [Tue, 11 Jan 2011 17:07:14 +0000 (18:07 +0100)]
ALSA: hda - Don't refer ELD when unplugged

When unplugged, we shouldn't refer to ELD information for PCM open
any more.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 12 Jan 2011 06:20:51 +0000 (07:20 +0100)]
Merge branch 'topic/asoc' into for-next

13 years agoMerge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
Takashi Iwai [Wed, 12 Jan 2011 06:20:30 +0000 (07:20 +0100)]
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc

13 years agoASoC: tpa6130a2: Fix compiler warning
Peter Ujfalusi [Tue, 28 Dec 2010 09:16:19 +0000 (11:16 +0200)]
ASoC: tpa6130a2: Fix compiler warning

sound/soc/codecs/tpa6130a2.c: In function 'tpa6130a2_add_controls':
sound/soc/codecs/tpa6130a2.c:342: warning: unused variable 'dapm'

Introduced by commit 39646871a47fd8808c08de0ce7d7ca8393af2805 ("ASoC:
tpa6130a2: Replace DAPM code with direct interface").

The DAPM code has been removed from the driver, but the
dapm struct remained.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
13 years agoASoC: tlv320dac33: Add DAPM selection for LOM invert
Peter Ujfalusi [Mon, 10 Jan 2011 13:39:49 +0000 (15:39 +0200)]
ASoC: tlv320dac33: Add DAPM selection for LOM invert

The L/R LOM line can be invertined side of the
corresponding DAC, or inverted from the corresponding
LOP.
Add control for user space to select the source of the
LOM inversion.
When only the analog bypass is enabled, and the LOM
is inverted from DAC output, we need to power the
corresponding DAC.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
13 years agoASoC: DMIC codec: Adding a generic DMIC codec
David Lambert [Thu, 6 Jan 2011 14:00:37 +0000 (08:00 -0600)]
ASoC: DMIC codec: Adding a generic DMIC codec

This codec is to be used by the DMIC driver to
control the DMIC codec.  This driver will be used on future
implementations of the DMIC driver to support codec specific
features.

At this time, the codec driver just registers the codec DAI.

Signed-off-by: David Lambert <dlambert@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 11 Jan 2011 19:00:53 +0000 (20:00 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 11 Jan 2011 19:00:51 +0000 (20:00 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.
Nitin Daga [Mon, 10 Jan 2011 16:19:31 +0000 (21:49 +0530)]
ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs.

Added hardware constraint in patch_hdmi.c to disable
channels 4/6 which are not supported by some older
NVIDIA GPUs.

Signed-off-by: Nitin Daga <ndaga@nvidia.com>
Acked-By: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: snd-usb-us122l: Fix missing NULL checks
Karsten Wiese [Tue, 4 Jan 2011 00:20:37 +0000 (01:20 +0100)]
ALSA: snd-usb-us122l: Fix missing NULL checks

Fix missing NULL checks in usb_stream_hwdep_poll() and usb_stream_hwdep_ioctl().
Wake up poll waiters before returning from usb_stream_hwdep_ioctl().

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: snd-usb-us122l: Fix MIDI output
Karsten Wiese [Mon, 3 Jan 2011 01:41:58 +0000 (02:41 +0100)]
ALSA: snd-usb-us122l: Fix MIDI output

The US-122L always reads 9 bytes per urb unless they are set to 0xFD.

Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()
Dimitris Papastamos [Tue, 11 Jan 2011 11:24:02 +0000 (11:24 +0000)]
ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync()

The size of the lzo syncing bitmap was incorrectly set to the size
of the cache times the word size, however, the correct size is the
size of the cache.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 11 Jan 2011 17:21:12 +0000 (18:21 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Add static_hdmi_pcm option to HDMI codec parser
Takashi Iwai [Tue, 11 Jan 2011 17:11:04 +0000 (18:11 +0100)]
ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser

The dynamic PCM restriction based on ELD information may lead to the
problem in some cases, e.g. when the receiver is turned off.  Then it
may send a TV HDMI default such as channels = 2.  Since it's still
plugged, the driver doesn't know whether it's the right configuration
for future use.  Now, when an app opens the device at this moment,
then turn on the receiver, the app still sends channels=2.

The right solution is to implement some kind of notification and
automatic re-open mechanism.  But, this is a goal far ahead.

This patch provides a workaround for such a case by providing a new
module option static_hdmi_pcm for snd-hda-codec-hdmi module.  When
this is set to true, the driver doesn't change PCM parameters per
ELD information.  For users who need the static configuration like
the scenario above, set this to true.

The parameter can be changed dynamically via sysfs, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Don't refer ELD when unplugged
Takashi Iwai [Tue, 11 Jan 2011 17:07:14 +0000 (18:07 +0100)]
ALSA: hda - Don't refer ELD when unplugged

When unplugged, we shouldn't refer to ELD information for PCM open
any more.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 11 Jan 2011 17:03:06 +0000 (18:03 +0100)]
Merge branch 'topic/asoc' into for-next

13 years agoASoC: Fix section mismatch in wm8995.c
Takashi Iwai [Tue, 11 Jan 2011 16:58:26 +0000 (17:58 +0100)]
ASoC: Fix section mismatch in wm8995.c

__devinitconst can't be used for data referred in driver struct.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 11 Jan 2011 16:54:53 +0000 (17:54 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: oxygen: add S/PDIF source selection for Claro cards
Clemens Ladisch [Tue, 11 Jan 2011 09:35:29 +0000 (10:35 +0100)]
ALSA: oxygen: add S/PDIF source selection for Claro cards

Add a mixer control to switch between the optical and coaxial S/PDIF
inputs on the HT-Omega Claro and Claro halo cards.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: fix CD/MIDI for X-Meridian (2G)
Clemens Ladisch [Tue, 11 Jan 2011 09:33:40 +0000 (10:33 +0100)]
ALSA: oxygen: fix CD/MIDI for X-Meridian (2G)

Enable the X-Meridian's CD input and the X-Meridian 2G's potential
MIDI ports.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: fix migor audio build
Guennadi Liakhovetski [Tue, 11 Jan 2011 07:34:52 +0000 (08:34 +0100)]
ASoC: fix migor audio build

Commit 6d803ba736abb5e122dede70a4720e4843dd6df4 "ARM: 6483/1: arm & sh:
factorised duplicated clkdev.c" broke compilation of migor audio. Use the
correct header to fix the problem.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 11 Jan 2011 06:39:07 +0000 (07:39 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: include delay.h for msleep in Xonar DG support
Stephen Rothwell [Tue, 11 Jan 2011 02:20:30 +0000 (13:20 +1100)]
ALSA: include delay.h for msleep in Xonar DG support

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: cs4270: use the built-in register cache support
Timur Tabi [Mon, 10 Jan 2011 19:28:32 +0000 (13:28 -0600)]
ASoC: cs4270: use the built-in register cache support

Update the CS4270 driver to use ASoC's internal codec register cache feature.
This change allows ASoC to perform the low-level I2C operations necessary to
read the register cache.  Support is also added for initializing the register
cache with an array of known power-on default values.

The CS4270 driver was handling the register cache itself, but somwhere along
the conversion to multi-compaonent, this feature broke.

Signed-off-by: Timur Tabi <timur@freescale.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 10 Jan 2011 15:50:06 +0000 (16:50 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: oxygen: add some card names
Clemens Ladisch [Mon, 10 Jan 2011 15:37:19 +0000 (16:37 +0100)]
ALSA: oxygen: add some card names

Instead of the generic Oxygen, use the actual card name, if known.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: do not show chip revision in card longname
Clemens Ladisch [Mon, 10 Jan 2011 15:36:23 +0000 (16:36 +0100)]
ALSA: oxygen: do not show chip revision in card longname

Apparently, the revision is 2 on all sold sound cards, so this
information is not actually useful.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: X-Meridian: add S/PDIF source selection
Clemens Ladisch [Mon, 10 Jan 2011 15:35:38 +0000 (16:35 +0100)]
ALSA: oxygen: X-Meridian: add S/PDIF source selection

Add a mixer control to select between the on-board and extension board
S/PDIF inputs for the X-Meridian (2G).

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: add digital input validity check switch
Clemens Ladisch [Mon, 10 Jan 2011 15:34:15 +0000 (16:34 +0100)]
ALSA: oxygen: add digital input validity check switch

Add a mixer control to prevent capturing S/PDIF samples that are not
marked as valid (non-audio or corrupted samples).

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMAINTAINERS: add myself
Clemens Ladisch [Mon, 10 Jan 2011 15:32:54 +0000 (16:32 +0100)]
MAINTAINERS: add myself

Add entries for the remaining drivers that I'm maintaining.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: usb-audio: add Edirol SD-90 PCM support
Clemens Ladisch [Mon, 10 Jan 2011 15:30:54 +0000 (16:30 +0100)]
ALSA: usb-audio: add Edirol SD-90 PCM support

Add support for the 24-bit audio I/Os of the Edirol SD-90 interface.

Reported-any-tested-by: Jim Grusendorf <alsa-user@grusendorf.ca>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: usb-audio: use enum control info helper
Clemens Ladisch [Mon, 10 Jan 2011 15:30:13 +0000 (16:30 +0100)]
ALSA: usb-audio: use enum control info helper

Simplify info callbacks by using the snd_ctl_enum_info() helper function.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: ymfpci: use enum control info helper
Clemens Ladisch [Mon, 10 Jan 2011 15:29:06 +0000 (16:29 +0100)]
ALSA: ymfpci: use enum control info helper

Simplify the info callback by using the snd_ctl_enum_info() helper function.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: cmipci: use enum control info helper
Clemens Ladisch [Mon, 10 Jan 2011 15:28:19 +0000 (16:28 +0100)]
ALSA: cmipci: use enum control info helper

Simplify info callbacks by using the snd_ctl_enum_info() helper function.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: bt87x: use enum control info helper
Clemens Ladisch [Mon, 10 Jan 2011 15:27:26 +0000 (16:27 +0100)]
ALSA: bt87x: use enum control info helper

Simplify the info callback by using the snd_ctl_enum_info() helper function.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: core, oxygen, virtuoso: add an enum control info helper
Clemens Ladisch [Mon, 10 Jan 2011 15:25:44 +0000 (16:25 +0100)]
ALSA: core, oxygen, virtuoso: add an enum control info helper

Introduce the helper function snd_ctl_enum_info() to fill out the
elem_info fields for an enumerated control.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: add Xonar HDAV1.3 Slim support
Clemens Ladisch [Mon, 10 Jan 2011 15:23:57 +0000 (16:23 +0100)]
ALSA: virtuoso: add Xonar HDAV1.3 Slim support

Add experimental support for the Asus Xonar HDAV1.3 Slim sound card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: add Xonar DG support
Clemens Ladisch [Mon, 10 Jan 2011 15:20:29 +0000 (16:20 +0100)]
ALSA: oxygen: add Xonar DG support

Add experimental support for the Asus Xonar DG sound card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: add X-Meridian 2G support
Clemens Ladisch [Mon, 10 Jan 2011 15:17:26 +0000 (16:17 +0100)]
ALSA: oxygen: add X-Meridian 2G support

Add support for the AuzenTech X-Meridian 7.1 2G sound card.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: add more PCI IDs
Clemens Ladisch [Mon, 10 Jan 2011 15:16:32 +0000 (16:16 +0100)]
ALSA: oxygen: add more PCI IDs

Add PCI IDs for some unknown models.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: reduce MCLK in double rate modes
Clemens Ladisch [Mon, 10 Jan 2011 15:16:08 +0000 (16:16 +0100)]
ALSA: virtuoso: reduce MCLK in double rate modes

For the CSxxxx and AKxxxx DAC/ADC chips, the MCLK factor in double rate
modes (64-96 kHz) can be reduced to 128x without reducing sound quality.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: simplify model-specific MCLK handling
Clemens Ladisch [Mon, 10 Jan 2011 15:14:52 +0000 (16:14 +0100)]
ALSA: oxygen: simplify model-specific MCLK handling

Replace the get_i2s_mclk callback with tables of MCLK values.  This
simplifies the MCLK-handling code in both the framework and the model-
specific drivers.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: use headphone gain setting only on front DAC
Clemens Ladisch [Mon, 10 Jan 2011 15:11:32 +0000 (16:11 +0100)]
ALSA: virtuoso: use headphone gain setting only on front DAC

Do not apply the headphone gain offset to any but the front DAC.  These
DACs would not be used in headphone mode, so this saves a few register
writes.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: handle DAC oversampling automatically
Clemens Ladisch [Mon, 10 Jan 2011 15:11:05 +0000 (16:11 +0100)]
ALSA: virtuoso: handle DAC oversampling automatically

Remove the DAC Oversampling mixer control because this setting does not
make much sense.

For cards with the H6 daughterboard, 128x oversampling was disabled
anyway because these high MCLK frequency would not be compatible with
the connector cable.

For cards without the H6 daughterboard, 128x gives a slightly higher
output quality; there is no reason to reduce it to 64x except for saving
power, but then these cards have not been designed to be power efficient
anyway (the D2's blinkenlights cannot be disabled).

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: use lower master clock with H6 daughterboard
Clemens Ladisch [Mon, 10 Jan 2011 15:09:23 +0000 (16:09 +0100)]
ALSA: virtuoso: use lower master clock with H6 daughterboard

Because of the unshielded connector cable, it is important to use as low
a master clock frequency as possible with the H6.

For double rate modes (64-96 kHz), the MCLK rate is unconditionally
lowered from 512x to 256x because the higher rate would not improve
anything.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: configure correct master clock frequency on the CS2000
Clemens Ladisch [Mon, 10 Jan 2011 15:07:11 +0000 (16:07 +0100)]
ALSA: virtuoso: configure correct master clock frequency on the CS2000

The clock output of the CS2000, which is used as master clock for the
DACs, was using half the actual master clock frequency for some reason.
Using the theoretically correct frequency seems also to work in practice.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: remove non-working controls on Essence ST Deluxe
Clemens Ladisch [Mon, 10 Jan 2011 15:05:38 +0000 (16:05 +0100)]
ALSA: virtuoso: remove non-working controls on Essence ST Deluxe

On the Xonar Essence ST Deluxe, remove all mixer controls that would
require I2C communication with the third DAC, which does not work
because of an addressing conflict with the CS2000 chip.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: change PCM1796 format to I2S
Clemens Ladisch [Mon, 10 Jan 2011 15:03:17 +0000 (16:03 +0100)]
ALSA: virtuoso: change PCM1796 format to I2S

Change the PCM format used for the PCM1796 from left-justified to I2S to
ensure that the correct format is used even for the Essence ST Deluxe's
center/LFE DAC, where I2C does not work because of an address conflict
with the CS2000 chip.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: wait for PCM1796 clock to become stable
Clemens Ladisch [Mon, 10 Jan 2011 15:02:32 +0000 (16:02 +0100)]
ALSA: virtuoso: wait for PCM1796 clock to become stable

The PCM1796 needs the master clock for I2C communication to work, so
add delays after clock changes to ensure that the clock is stable when
we try to write the DACs' registers.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: virtuoso: do not use fast I2C speed
Clemens Ladisch [Mon, 10 Jan 2011 15:01:57 +0000 (16:01 +0100)]
ALSA: virtuoso: do not use fast I2C speed

To make the I2C communication reliable when using the H6 daughterboard,
reduce the I2C clock frequency.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: fix SPI clocks slower than 6.25 MHz
Clemens Ladisch [Mon, 10 Jan 2011 15:01:17 +0000 (16:01 +0100)]
ALSA: oxygen: fix SPI clocks slower than 6.25 MHz

Fix wrong register bits for SPI clock cycle times longer than 160 ns,
and adjust the polling loop timeout for these speeds.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: remove oxygen_model::private_data field
Clemens Ladisch [Mon, 10 Jan 2011 15:00:34 +0000 (16:00 +0100)]
ALSA: oxygen: remove oxygen_model::private_data field

The number of DACs can now be deduced from the dac_channels_mixer field,
so the private_data field is no longer needed.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: oxygen: allow different number of PCM and mixer channels
Clemens Ladisch [Mon, 10 Jan 2011 14:59:38 +0000 (15:59 +0100)]
ALSA: oxygen: allow different number of PCM and mixer channels

For cards like the Xonar HDAV1.3, differentiate between the number of
PCM channels that can be played and the number of channels whose volume
can be adjusted.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 10 Jan 2011 14:47:29 +0000 (15:47 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Add support for multiple headphone/speaker controls for Realtek
Takashi Iwai [Mon, 10 Jan 2011 14:45:23 +0000 (15:45 +0100)]
ALSA: hda - Add support for multiple headphone/speaker controls for Realtek

So far, Realtek auto-parser assumed that the multiple pins are only for
line-outs, and assigned the channel names like Front, Surround, etc for
the multiple outputs.  But, there are devices that have multiple
headphones, and these can be better controlled with the corresponding
control-name like "Headphone" with indicies.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Fix multi-headphone handling for Realtek codecs
Takashi Iwai [Mon, 10 Jan 2011 13:47:35 +0000 (14:47 +0100)]
ALSA: hda - Fix multi-headphone handling for Realtek codecs

When multiple headphone pins are defined without line-out pins, the
driver takes them as primary outputs.  But it forgot to set line_out_type
to HP by assuming there is some rest of HP pins.  This results in some
mis-handling of these pins for Realtek codec parser.  It takes as if
these are pure line-out jacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Cc: <stable@kernel.org>
13 years agoASoC: RX1950: Enable Mic Jack during glue driver init
Vasily Khoruzhick [Thu, 6 Jan 2011 20:15:49 +0000 (22:15 +0200)]
ASoC: RX1950: Enable Mic Jack during glue driver init

Enable Mic Jack during glue driver init, otherwise capture will not work.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 10 Jan 2011 10:14:37 +0000 (11:14 +0100)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near()
Jesper Juhl [Thu, 6 Jan 2011 21:19:47 +0000 (22:19 +0100)]
ALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near()

snd_pcm_hw_param_near() will leak the memory allocated to 'save' if the
call to snd_pcm_hw_param_max() returns less than zero.
This patch makes sure we never leak.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 10 Jan 2011 10:12:48 +0000 (11:12 +0100)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda: Use vostro model quirk for Dell Vostro 1014
Daniel T Chen [Sat, 8 Jan 2011 23:25:27 +0000 (18:25 -0500)]
ALSA: hda: Use vostro model quirk for Dell Vostro 1014

BugLink: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5184
A user reported on the alsa-devel mailing list that he needs to use
the vostro model quirk to have audible playback, so apply it for his
PCI SSID.

Reported-and-tested-by: Fernando Lemos <fernandotcl@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: HDA: Add Lenovo vendor quirk for Conexant 205xx
David Henningsson [Fri, 7 Jan 2011 06:53:39 +0000 (07:53 +0100)]
ALSA: HDA: Add Lenovo vendor quirk for Conexant 205xx

BugLink: http://bugs.launchpad.net/bugs/689036
Many new Lenovos need the ideapad quirk. Also, since the
auto parser for this chip is far from optimal, the regression
risk is low (although not zero).

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: HDA: Fix volume control indices for Mics (Realtek)
David Henningsson [Wed, 5 Jan 2011 10:03:56 +0000 (11:03 +0100)]
ALSA: HDA: Fix volume control indices for Mics (Realtek)

If more than one mic is present with different locations,
e g "Front Mic" and "Rear Mic", they can use the same index (0),
since their names are different.

Previous behavior was to have "Front Mic" as index 1, causing it
to be ignored by e g PulseAudio.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: HDA: Rename "Mic Boost" to "Mic Boost Volume"
David Henningsson [Tue, 4 Jan 2011 14:24:24 +0000 (15:24 +0100)]
ALSA: HDA: Rename "Mic Boost" to "Mic Boost Volume"

BugLink: http://bugs.launchpad.net/bugs/697240
If the "Volume" suffix is not given, alsa-lib gets confused and
loses the dB information at the simple element level.

Boosts generally affects both playback and capture, as they are
applied early in the chain. Hence no "Playback" or "Capture" in
the suffix.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: HDA: Add internal mic for IDT 92HD88B
David Henningsson [Tue, 4 Jan 2011 05:30:53 +0000 (06:30 +0100)]
ALSA: HDA: Add internal mic for IDT 92HD88B

BugLink: http://bugs.launchpad.net/bugs/696493
According to datasheet (and real-world testing), IDT 92HD88B can
have internal mics at NID 0x11 and 0x20, so enable them accordingly.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 10 Jan 2011 09:49:13 +0000 (10:49 +0100)]
Merge branch 'fix/hda' into topic/hda

13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Sat, 8 Jan 2011 12:04:45 +0000 (13:04 +0100)]
Merge branch 'topic/asoc' into for-next

13 years agoASoC: Fix the device references to codec and platform drivers
Harsha Priya [Wed, 5 Jan 2011 06:04:51 +0000 (11:34 +0530)]
ASoC: Fix the device references to codec and platform drivers

The soc-core takes the platform and codec driver reference during probe. Few of
these references are not released during remove. This cause the platform and
codec driver module unload to fail.

This patch fixes by the taking only one reference to platform and codec module
during probe and releases them correctly during remove. This allows load/unload
properly

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Harsha Priya <priya.harsha@intel.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers
Jarkko Nikula [Wed, 5 Jan 2011 10:05:44 +0000 (12:05 +0200)]
ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers

After multi-component conversion these machine drivers don't actually need
anything from sound/soc/codecs/tlv320aic3x.h so don't include it.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'for-2.6.37' into for-2.6.38
Mark Brown [Wed, 5 Jan 2011 10:06:55 +0000 (10:06 +0000)]
Merge branch 'for-2.6.37' into for-2.6.38

Conflicts:
sound/soc/samsung/smartq_wm8987.c

13 years agoASoC: Fix SmartQ compilation
Maurus Cuelenaere [Sun, 2 Jan 2011 19:48:23 +0000 (20:48 +0100)]
ASoC: Fix SmartQ compilation

This makes the SmartQ sound driver compile again with recent ASoC changes.

Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_
Mark Brown [Sun, 2 Jan 2011 14:07:46 +0000 (14:07 +0000)]
ASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_

The rest of ASoC is using SND_SOC_ as the prefix for all the Kconfig
symbols so do so for the new Samsung drivers too, rather than using
ASOC_ as they currently are.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Seungwhan Youn <sw.youn@samsung.com>
Acked-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>