]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Tue, 18 Jan 2011 14:26:04 +0000 (15:26 +0100)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: ice1712 delta - initialize SPI clock
Brian Bloniarz [Tue, 18 Jan 2011 07:20:03 +0000 (23:20 -0800)]
ALSA: ice1712 delta - initialize SPI clock

The driver was using an initial value for the clock on the SPI bus
which was read from ICE1712 EEPROM,
ice->eeprom.data[ICE_EEP1_GPIO_STATE] & ICE1712_DELTA_AP_CCLK (0x02)

It appears some cards have it default high, some cards
have it default low. On my Delta 66 rev. E:
$ cat /proc/asound/M66/ice1712 | grep 'GPIO state'
  GPIO state       : 0x70 /* ICE1712_DELTA_AP_CCLK bit is zero */
On my Audiophile 2496:
$ cat /proc/asound/M2496/ice1712 | grep 'GPIO state'
  GPIO state       : 0xfe /* ICE1712_DELTA_AP_CCLK bit is one */

It must be raised before the first SPI write happens, or the write will
fail, leading to:

[   23.248721] invalid CS8427 signature 0x0: let me try again...

I theorize that 4eb4550ab37d351ab0973ccec921a5a2d8560ec7
is no longer needed, it was a different way to workaround
the problem.

[fixed variable decleration by tiwai]

Signed-off-by: Brian Bloniarz <brian.bloniarz@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Tue, 18 Jan 2011 13:06:01 +0000 (14:06 +0100)]
Merge branch 'fix/asoc' into for-next

13 years agoMerge branch 'fix/asoc' into for-linus
Takashi Iwai [Tue, 18 Jan 2011 13:05:44 +0000 (14:05 +0100)]
Merge branch 'fix/asoc' into for-linus

13 years agoMerge branch 'fix/hda' into for-linus
Takashi Iwai [Tue, 18 Jan 2011 06:44:55 +0000 (07:44 +0100)]
Merge branch 'fix/hda' into for-linus

13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Tue, 18 Jan 2011 06:44:14 +0000 (07:44 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - Fix initialization for HP 2011 notebooks
Vitaliy Kulikov [Fri, 14 Jan 2011 23:21:13 +0000 (17:21 -0600)]
ALSA: hda - Fix initialization for HP 2011 notebooks

Fixes for HP 2011 notebooks: enable dock ports and disable BTL
initialization in the driver.

Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add support for VMware controller
Bankim Bhavsar [Mon, 17 Jan 2011 14:23:21 +0000 (15:23 +0100)]
ALSA: hda - Add support for VMware controller

Add the new PCI ID 0x15ad and device ID 0x1977 for VMware HDAudio
Controller.

[changed to use AZX_DRIVER_GENERIC by tiwai]

Signed-off-by: Bankim Bhavsar <bbhavsar@vmware.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - consitify string arrays
Takashi Iwai [Mon, 17 Jan 2011 10:29:34 +0000 (11:29 +0100)]
ALSA: hda - consitify string arrays

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add add multi-streaming playback for AD1988
Raymond Yau [Mon, 17 Jan 2011 10:19:03 +0000 (11:19 +0100)]
ALSA: hda - Add add multi-streaming playback for AD1988

Attached a patch which add a new model to support multi-streaming
playback for ad1988.

playback another stereo stream through the front panel headphone on
device 2 while playback through the speakers connected to rear panel
on device 0 at the same time.

Tested with ad1988a rev2 codec on asus P5B-V motherboard.

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 17 Jan 2011 14:27:01 +0000 (15:27 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - Add support for VMware controller
Takashi Iwai [Mon, 17 Jan 2011 14:23:21 +0000 (15:23 +0100)]
ALSA: hda - Add support for VMware controller

Add the new PCI ID 0x15ad and device ID 0x1977 for VMware HDAudio
Controller.

[changed to use AZX_DRIVER_GENERIC by tiwai]

Signed-off-by: Bankim Bhavsar <bbhavsar@vmware.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code
Alexander Sverdlin [Sun, 16 Jan 2011 12:48:05 +0000 (15:48 +0300)]
ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code

Changelog:
1. I2S module of EP93xx should be feed by 32bit DMA transfers. This is
hardware limitation and that's the way original Cirrus's driver worked.
This will fix distorted sound playback and make capture actually work in
present ep93xx drivers.

I've found, that author of code, on which modern ep93xx-i2s.c and
ep93xx-pcm.c are based, had faced this problem also in 2007:
http://blog.gmane.org/gmane.linux.ports.arm.cirrus/month=20070101/page=3

Now SoC code uses his developments, but not overcomes the hardware
issues. Some details from EP93xx users guide:

Both I2S transmitter and receiver have similar 16x32bit FIFO, where they
store 8 samples for both left and right channels. The FIFO is always
32bit wide and should be properly aligned if you use samples of other
width. Transmitter and receiver have configuration registers for
selection of I2S word length (16, 24, 32). They are I2STXWrdLen and
I2SRXWrdLen.

Yes, EP93xx DMA can do byte, word and quad-word transfers. The width for
transfers to and from peripherals is selected by particular module
configuration. Lucky AC97 module has such configuration: AC97RXCRx
registers, bit CM (Compact mode enable) switches between 16 and 32 bit
samples. AC97TXCRx registers have the same bits for transmitters.
ep93xx-ac97.c enables this compact mode and so has all the rights to use
S16_LE format.
No one has found such a configuration in I2S module until now in any
Cirrus manuals. I2S module always feeds it's 32bit wide FIFO with 32bit
samples consecutively for left and right channels. You cannot use 32-bit
DMA transfers to transfer two 16-bit samples.

So we can use two formats for AC97, but should remove all but S32_LE for
I2S. Always using 32 bit chunks is not a problem for I2S, the codec I
use uses less bits too (24), it's permitted by I2S standard.

In proposed patch formats list shortened to just S32_LE, this makes all
the DMA transactions right, while ALSA will do all sample format
translation for us.

2. Incorrect setting of LRCLK (2 times slower) in original ep93xx-i2s.c
masks the first problem.

DMA takes two 16 bit samples instead of one, overall sound speed seems
to be normal, but you get actually 4000 sampling rate instead of
requested 8000 and therefore some noise... This is also the reason why
the capture function not worked at all in this driver...

If we take a look into I2S specification, we will figure that LRCLK MUST
be equal to sample rate, if we are talking about stereo (in mono too,
but it's not our case at all).

In proposed patch SCLK and LRCLK rates are corrected, assuming we always
send 32 bits * 2 channels to codec.

Signed-off-by: Alexander Sverdlin <subaparts@yandex.ru>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: WM8990: msleep() takes milliseconds not jiffies
Dimitris Papastamos [Fri, 14 Jan 2011 15:59:13 +0000 (15:59 +0000)]
ASoC: WM8990: msleep() takes milliseconds not jiffies

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>
Cc: stable@kernel.org
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 17 Jan 2011 10:38:32 +0000 (11:38 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 17 Jan 2011 10:38:27 +0000 (11:38 +0100)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: hda - consitify string arrays
Takashi Iwai [Mon, 17 Jan 2011 10:29:34 +0000 (11:29 +0100)]
ALSA: hda - consitify string arrays

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add add multi-streaming playback for AD1988
Takashi Iwai [Mon, 17 Jan 2011 10:19:03 +0000 (11:19 +0100)]
ALSA: hda - Add add multi-streaming playback for AD1988

Attached a patch which add a new model to support multi-streaming
playback for ad1988.

playback another stereo stream through the front panel headphone on
device 2 while playback through the speakers connected to rear panel
on device 0 at the same time.

Tested with ad1988a rev2 codec on asus P5B-V motherboard.

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA : au88x0 - Limit number of channels to fix Oops via OSS emu
Raymond Yau [Sun, 16 Jan 2011 02:55:54 +0000 (10:55 +0800)]
ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu

Fix playback/capture channels patch to change supported playback
channels of au8830 to 1,2,4 and capture channels to 1,2.
This prevent oops when oss emulation use SNDCTL_DSP_CHANNELS to
set 3 Channels

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 14 Jan 2011 18:20:28 +0000 (19:20 +0100)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: constify functions in ac97
Hanno Boeck [Fri, 14 Jan 2011 18:14:47 +0000 (19:14 +0100)]
ALSA: constify functions in ac97

Signed-off-by: Hanno Boeck <hanno@hboeck.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: WL1273 FM radio: Fix breakage with MFD API changes
Matti J. Aaltonen [Thu, 13 Jan 2011 13:22:45 +0000 (15:22 +0200)]
ASoC: WL1273 FM radio: Fix breakage with MFD API changes

These changes are needed to keep up with the changes in the
MFD core and V4L2 parts of the wl1273 FM radio driver.

Use function pointers instead of exported functions for I2C IO.
Also move all preprocessor constants from the wl1273.h to
include/linux/mfd/wl1273-core.h.

Signed-off-by: Matti J. Aaltonen <matti.j.aaltonen@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 14 Jan 2011 09:35:04 +0000 (10:35 +0100)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - More coverage for odd-number channels elimination for HDMI
Takashi Iwai [Fri, 14 Jan 2011 09:33:26 +0000 (10:33 +0100)]
ALSA: hda - More coverage for odd-number channels elimination for HDMI

The commit ad09fc9d2156f3d37537b34418a6b79309013d33 didn't cover the
case for Intel and Nvidia HDMIs, where hdmi_pcm_open() is called.
Put the hw_constraint there, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Store PCM parameters properly in HDMI open callback
Takashi Iwai [Fri, 14 Jan 2011 09:30:46 +0000 (10:30 +0100)]
ALSA: hda - Store PCM parameters properly in HDMI open callback

In hdmi_pcm_open(), the evaluated PCM hw parameters are stored in
hinfo, but these aren't properly set back to the current runtime
record since these have been set beforehand in azx_pcm_open().
This patch fixes the behavior.

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

13 years agoALSA: hda - Rearrange fixup struct in patch_realtek.c
Takashi Iwai [Fri, 14 Jan 2011 08:55:32 +0000 (09:55 +0100)]
ALSA: hda - Rearrange fixup struct in patch_realtek.c

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

13 years agoALSA: oxygen: Xonar DG: fix CS4245 register writes
Clemens Ladisch [Fri, 14 Jan 2011 07:07:50 +0000 (08:07 +0100)]
ALSA: oxygen: Xonar DG: fix CS4245 register writes

Accidentally exchanging register addresses and register values leads to
many strange errors ...

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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>