]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 15 Apr 2011 06:42:04 +0000 (08:42 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - sound/pci/hda/hda_codec.c: fix warning
Andrew Morton [Thu, 14 Apr 2011 22:06:13 +0000 (15:06 -0700)]
ALSA: hda - sound/pci/hda/hda_codec.c: fix warning

sound/pci/hda/hda_codec.c: In function 'snd_hda_get_connections':
sound/pci/hda/hda_codec.c:332: warning: unused variable 'j'

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Thu, 14 Apr 2011 10:09:30 +0000 (12:09 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents
Raymond Yau [Fri, 8 Apr 2011 07:46:17 +0000 (15:46 +0800)]
ALSA: emu10k1 - Fix "Music" controls to "Synth" controls in documents

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-linus
Takashi Iwai [Sat, 9 Apr 2011 08:05:53 +0000 (10:05 +0200)]
Merge branch 'fix/hda' into for-linus

13 years agoMerge branch 'fix/asoc' into for-linus
Takashi Iwai [Sat, 9 Apr 2011 08:05:30 +0000 (10:05 +0200)]
Merge branch 'fix/asoc' into for-linus

13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 14:07:57 +0000 (16:07 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Remember connection lists
Takashi Iwai [Thu, 7 Apr 2011 13:55:15 +0000 (15:55 +0200)]
ALSA: hda - Remember connection lists

The connection lists are static and we can reuse the previous results
instead of querying via verb at each time.  This will reduce the I/O
in the runtime especially for some codec auto-parsers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 12:57:11 +0000 (14:57 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - Don't query connections for widgets have no connections
Takashi Iwai [Thu, 7 Apr 2011 12:55:57 +0000 (14:55 +0200)]
ALSA: hda - Don't query connections for widgets have no connections

Fixes the kernel warnings with IDT codecs like
    hda_codec: connection list not available for 0x1e

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Thu, 7 Apr 2011 10:57:53 +0000 (12:57 +0200)]
Merge branch 'fix/hda' into topic/hda

13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 10:50:01 +0000 (12:50 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Fix unused variable warning in patch_realtek.c
Takashi Iwai [Thu, 7 Apr 2011 10:49:26 +0000 (12:49 +0200)]
ALSA: hda - Fix unused variable warning in patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Remove superfluous inits for ALC662 auto-parser
Takashi Iwai [Thu, 7 Apr 2011 10:34:26 +0000 (12:34 +0200)]
ALSA: hda - Remove superfluous inits for ALC662 auto-parser

Since we now set up the connections and mutes dynamically in the
auto-parser, all static initializations via alc662_init_verbs & co are
no longer needed.  Let's drop them.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Mute ADC as default in ALC882 and other auto-parsers
Takashi Iwai [Thu, 7 Apr 2011 10:46:45 +0000 (12:46 +0200)]
ALSA: hda - Mute ADC as default in ALC882 and other auto-parsers

Mute the ADC as default in the auto-parser dynamically instead of relying
on the static init verbs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Unmute mixer dynamically in alc662 auto-parser
Takashi Iwai [Thu, 7 Apr 2011 10:27:32 +0000 (12:27 +0200)]
ALSA: hda - Unmute mixer dynamically in alc662 auto-parser

Instead of static init array, better to determine the connection and
the mute status of the pin/mixer/DAC route dynamically.  This fixes the
uninitialized mixer 0x0f on ALC892.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 10:12:12 +0000 (12:12 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: HDA: Fix single internal mic on ALC275 (Sony Vaio VPCSB1C5E)
David Henningsson [Thu, 7 Apr 2011 09:43:00 +0000 (11:43 +0200)]
ALSA: HDA: Fix single internal mic on ALC275 (Sony Vaio VPCSB1C5E)

In cases where there is only one internal mic connected to ADC 0x11,
alc275_setup_dual_adc won't handle the case, so we need to add the
ADC node to the array of candidates.

Cc: stable@kernel.org
BugLink: http://bugs.launchpad.net/bugs/752792
Reported-by: Vincenzo Pii
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 10:04:32 +0000 (12:04 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - HDMI: Fix MCP7x audio infoframe checksums
Aaron Plattner [Thu, 7 Apr 2011 00:19:04 +0000 (17:19 -0700)]
ALSA: hda - HDMI: Fix MCP7x audio infoframe checksums

The MCP7x hardware computes the audio infoframe channel count
automatically, but requires the audio driver to set the audio
infoframe checksum manually via the Nv_VERB_SET_Info_Frame_Checksum
control verb.

When audio starts playing, nvhdmi_8ch_7x_pcm_prepare sets the checksum
to (0x71 - chan - chanmask).  For example, for 2ch audio, chan == 1
and chanmask == 0 so the checksum is set to 0x70.  When audio playback
finishes and the device is closed, nvhdmi_8ch_7x_pcm_close resets the
channel formats, causing the channel count to revert to 8ch.  Since
the checksum is not reset, the hardware starts generating audio
infoframes with invalid checksums.  This causes some displays to blank
the video.

Fix this by updating the checksum and channel mask when the device is
closed and also when it is first initialized.  In addition, make sure
that the channel mask is appropriate for an 8ch infoframe by setting
it to 0x13 (FL FR LFE FC RL RR RLC RRC).

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 7 Apr 2011 08:40:47 +0000 (10:40 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Rewrite alc269_suspend to alc269_shutup
Takashi Iwai [Thu, 7 Apr 2011 08:39:25 +0000 (10:39 +0200)]
ALSA: hda - Rewrite alc269_suspend to alc269_shutup

alc269_suspend is just calling the shut-up, so we can use the new shutup
callback for the purpose.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Introduce shutup callback to Realtek spec struct
Takashi Iwai [Thu, 7 Apr 2011 08:37:16 +0000 (10:37 +0200)]
ALSA: hda - Introduce shutup callback to Realtek spec struct

Add shutup callback to be called codec-specifically for avoiding pop
noises at suspend or shutdown.  As a generic callback, just turn EAPD
off.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Refactoring EAPD controls
Takashi Iwai [Thu, 7 Apr 2011 08:31:43 +0000 (10:31 +0200)]
ALSA: hda - Refactoring EAPD controls

Reduced the duplicated codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Split EAPD init to a separate array from alc662_init_verbs
Takashi Iwai [Thu, 7 Apr 2011 08:24:23 +0000 (10:24 +0200)]
ALSA: hda - Split EAPD init to a separate array from alc662_init_verbs

So far, alc662_init_verbs[] is used for all ALC662-compatible chips,
but the EAPD controls for 0x15 in there is invalid for ALC892.
Also, since EAPDs should be set up in alc_auto_init_amp(), these static
elements aren't needed for auto-parser, too.

In this patch, the EAPD init verbs are split from alc662_init_verbs,
and applied only to static quirks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 6 Apr 2011 13:18:28 +0000 (15:18 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Fix mix->DAC deduction for ALC892
Takashi Iwai [Wed, 6 Apr 2011 13:16:21 +0000 (15:16 +0200)]
ALSA: hda - Fix mix->DAC deduction for ALC892

The current alc662 parser doesn't set the DAC for the mixer 0x0f
properly for ALC892, which has 4 DACs while ALC662 has 3.
Fixed by implementing alc662_mix_to_dac() more genericly with the
dynamic widget list.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Correct initial dac_nids for some ALC272-quirks
Takashi Iwai [Wed, 6 Apr 2011 07:42:29 +0000 (09:42 +0200)]
ALSA: hda - Correct initial dac_nids for some ALC272-quirks

Some ALC272-quirks use alc662_dac_nids instead of alc272_dac_nids.
This patch fixes these entries.  No functional change since the first
two elements are identical in both arrays.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 6 Apr 2011 06:34:15 +0000 (08:34 +0200)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: emu10k1 - Remove CLFE-related controls for SB Live! Platinum CT4760P
Raymond Yau [Wed, 30 Mar 2011 12:00:39 +0000 (20:00 +0800)]
ALSA: emu10k1 - Remove CLFE-related controls for SB Live! Platinum CT4760P

SB Live! Platinum CT4760P is just a 4 channels sound card with STAC9721 and
Philips UDA1334 DAC.

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 6 Apr 2011 06:19:34 +0000 (08:19 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Fix alc662_dac_nid and change "6stack-dig" to "5stack-dig"
Raymond Yau [Tue, 5 Apr 2011 14:47:15 +0000 (22:47 +0800)]
ALSA: hda - Fix alc662_dac_nid and change "6stack-dig" to "5stack-dig"

alc662 series only have 3 DAC, so it can only support 5stack-dig
instead of 6stack-dig.

[updated HD-Audio-Models.txt as well by tiwai]

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Wed, 6 Apr 2011 06:05:48 +0000 (08:05 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: usb-audio: define another USB ID for a buggy USB MIDI cable
Tarek Soliman [Mon, 4 Apr 2011 14:23:53 +0000 (09:23 -0500)]
ALSA: usb-audio: define another USB ID for a buggy USB MIDI cable

There are many USB MIDI cables out there that have buggy
firmware that reports it can do more than 4 bytes in a
packet when they can only properly handle 4

This patch adds the ID of yet another one of those cables

Signed-off-by: Tarek Soliman <tarek@bashasoliman.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 5 Apr 2011 09:52:04 +0000 (11:52 +0200)]
Merge branch 'topic/asoc' into for-next

13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 5 Apr 2011 09:51:59 +0000 (11:51 +0200)]
Merge branch 'topic/misc' into for-next

13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 5 Apr 2011 09:51:56 +0000 (11:51 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: asihpi: Minor cleanups
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:48 +0000 (20:55 +1200)]
ALSA: asihpi: Minor cleanups

Remove some unneeded defintions
Use %pR to print resources
Make some data const
Consistent braces for else

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: Simplify driver unload cleanup
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:47 +0000 (20:55 +1200)]
ALSA: asihpi: Simplify driver unload cleanup

Replacing subsys_delete_adapter with adapter_delete
allows some special-case adapter lookup code to be removed.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: Standardise substream name generation
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:46 +0000 (20:55 +1200)]
ALSA: asihpi: Standardise substream name generation

Define and use pcm_debug_name if CONFIG_SND_DEBUG

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: Remove 2 unused functions
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:45 +0000 (20:55 +1200)]
ALSA: asihpi: Remove 2 unused functions

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: MMAP for non-busmaster cards
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:44 +0000 (20:55 +1200)]
ALSA: asihpi: MMAP for non-busmaster cards

Allow older non DMA capable cards to use MMAP by
emulating the DMA using read and write functions,
and getting rid of copy & silence callbacks that
were used only by older cards.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: Handle playback drained status better
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:43 +0000 (20:55 +1200)]
ALSA: asihpi: Handle playback drained status better

Use the card drained status reporting for playback,
but allow it to persist for a few timer cycles before
signalling XRUN, to allow card to recover by itself.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: asihpi: Update debug printing
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:42 +0000 (20:55 +1200)]
ALSA: asihpi: Update debug printing

Debug print full substream ID.
Other minor debug print updates.

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: snd-asihpi: Control naming
Eliot Blennerhassett [Tue, 5 Apr 2011 08:55:41 +0000 (20:55 +1200)]
ALSA: snd-asihpi: Control naming

Clock source is neither capture nor playback,
so change 'Capture Clock' to 'Clock'.
Add spaces to control name string for consistency,
always 'PCM 0' , never 'PCM0'

Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Tue, 5 Apr 2011 07:17:37 +0000 (09:17 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: HDA: Fix dock mic for Lenovo X220-tablet
David Henningsson [Tue, 5 Apr 2011 05:55:24 +0000 (07:55 +0200)]
ALSA: HDA: Fix dock mic for Lenovo X220-tablet

Without the "thinkpad" quirk, the dock mic in
Lenovo X220 tablet edition won't work.

BugLink: http://bugs.launchpad.net/bugs/751033
Cc: stable@kernel.org
Tested-by: James Ferguson <james.ferguson@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Tue, 5 Apr 2011 07:14:04 +0000 (09:14 +0200)]
Merge branch 'fix/asoc' into for-next

13 years agoMerge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Tue, 5 Apr 2011 07:12:41 +0000 (09:12 +0200)]
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc

13 years agoMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Tue, 5 Apr 2011 07:12:21 +0000 (09:12 +0200)]
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

13 years agoASoC: Add bias level data to DAPM context debugfs
Mark Brown [Mon, 4 Apr 2011 11:48:13 +0000 (20:48 +0900)]
ASoC: Add bias level data to DAPM context debugfs

This is also in the old sysfs diagnostics but it's nice to have everything
in one place.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Fix comment width in soc-cache.c
Mark Brown [Mon, 4 Apr 2011 08:55:42 +0000 (17:55 +0900)]
ASoC: Fix comment width in soc-cache.c

Lines should be less than 80 columns.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Remove excessively verbose logging on I2C write
Mark Brown [Mon, 4 Apr 2011 05:55:59 +0000 (14:55 +0900)]
ASoC: Remove excessively verbose logging on I2C write

We don't need to log every I2C transfer, and certainly not at error level.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Fix to avoid compile error
Seungwhan Youn [Mon, 4 Apr 2011 04:43:42 +0000 (13:43 +0900)]
ASoC: Fix to avoid compile error

This patch fixes to avoid compile error when ASoC codec doesn't use I2C
nor SPI on snd_soc_hw_bulk_write_raw().

Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoALSA: core - Don't use "default' for default
Takashi Iwai [Mon, 4 Apr 2011 10:43:23 +0000 (12:43 +0200)]
ALSA: core - Don't use "default' for default

The card-id parser assigns the string "default" when no appropriate word
is found in the card name.  But this string may confuse the alsa-lib, so
better to avoid.  Use "Default" now instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: 6fire - Add support of digital-thru mixer
Torsten Schenk [Mon, 4 Apr 2011 09:50:53 +0000 (11:50 +0200)]
ALSA: 6fire - Add support of digital-thru mixer

Digital Thru mixer element added (device can act as converter optical<->coax)

Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: 6fire - Improve firmware loader
Torsten Schenk [Mon, 4 Apr 2011 09:49:57 +0000 (11:49 +0200)]
ALSA: 6fire - Improve firmware loader

Firmware loader: magical device bytes check updated (accepts all device
versions now and accepts possibly loaded firmware, if it is knowing to
be working)

Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: 6fire - Add support for S32_LE format
Torsten Schenk [Mon, 4 Apr 2011 09:49:00 +0000 (11:49 +0200)]
ALSA: 6fire - Add support for S32_LE format

Added support for sample format s32_le.

Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: 6fire - Fix pcm rate assignment
Torsten Schenk [Mon, 4 Apr 2011 09:47:50 +0000 (11:47 +0200)]
ALSA: 6fire - Fix pcm rate assignment

Completion of signedness bug for pcm_runtime.rate: variable will never
get assigned a negative value now.

Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: 6fire - Update kernel configuration
Torsten Schenk [Mon, 4 Apr 2011 09:45:28 +0000 (11:45 +0200)]
ALSA: 6fire - Update kernel configuration

Kernel configuration updated:
- experimental dependency removed
- description updated

Signed-off-by: Torsten Schenk <torsten.schenk@zoho.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/misc' into topic/misc
Takashi Iwai [Mon, 4 Apr 2011 10:21:55 +0000 (12:21 +0200)]
Merge branch 'fix/misc' into topic/misc

13 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Sun, 3 Apr 2011 13:12:15 +0000 (22:12 +0900)]
Merge branch 'for-2.6.39' into for-2.6.40

13 years agoASoC: format_register_str: Don't clip register values
Stephen Warren [Fri, 1 Apr 2011 20:50:44 +0000 (14:50 -0600)]
ASoC: format_register_str: Don't clip register values

wordsize is used as the textual width of a register address.

regsize is used as the textual width of a register value.

The assignments to these values were swapped. In the case of WM8903, which
has 8-bit register addresses and 16-bit register values, this caused the
register values to be clipped to 2 digits instead of the full 4.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Properly handle spitz MIC GPIO
Marek Vasut [Sat, 2 Apr 2011 01:43:15 +0000 (03:43 +0200)]
ASoC: Properly handle spitz MIC GPIO

This patch firstly restructurizes the code a bit by getting rid of continuous
checking for machine type in spitz_mic_bias().

Then the patch properly requests the MIC GPIO in the spitz_init() and frees it
in spitz_exit().

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Name jack GPIOs based on jack not codec
Stephen Warren [Fri, 1 Apr 2011 20:50:43 +0000 (14:50 -0600)]
ASoC: Name jack GPIOs based on jack not codec

snd_soc_jack_gpio has a name field. Use that name when registering the IRQ,
since this is far more informative than the codec driver name. This shows
up in /proc/interrupts.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Sun, 3 Apr 2011 10:29:43 +0000 (19:29 +0900)]
Merge branch 'for-2.6.39' into for-2.6.40

13 years agoMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Mark Brown [Sun, 3 Apr 2011 10:28:29 +0000 (19:28 +0900)]
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.39

13 years agoASoC: PXA: Fix oops in __pxa2xx_pcm_prepare
Vasily Khoruzhick [Sat, 2 Apr 2011 07:54:47 +0000 (10:54 +0300)]
ASoC: PXA: Fix oops in __pxa2xx_pcm_prepare

pxa2xx_pcm_hw_free frees dma channel and sets prtd->dma_ch to -1,
but does not set prtd->params to NULL, so if pxa2xx_pcm_hw_params will
be called immediately, it leaves prtd->dma_ch initialized with -1,
and it results in oops in __pxa2xx_pcm_prepare. This bug is triggered
via SDL.

This patch adds check for prtd->dma_ch to __pxa2xx_pcm_prepare and
cleans prtd->params, so now it works properly.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'fix/asoc' into for-linus
Takashi Iwai [Fri, 1 Apr 2011 16:02:23 +0000 (18:02 +0200)]
Merge branch 'fix/asoc' into for-linus

13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Fri, 1 Apr 2011 16:01:57 +0000 (18:01 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()
Kelly Anderson [Fri, 1 Apr 2011 09:58:25 +0000 (11:58 +0200)]
ALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()

When period interrupts are disabled, snd_pcm_update_hw_ptr0() compares
the current time against the time estimated for the current hardware
pointer to detect xruns.  The somewhat fuzzy threshold in the while loop
makes it possible that hdelta becomes negative; the comparison being
done with unsigned types then makes the loop go through the entire 263
negative range, and, depending on the value, never reach an unsigned
value that is small enough to stop the loop.  Doing this with interrupts
disabled results in the machine locking up.

To prevent this, ensure that the loop condition uses signed types for
both operands so that the comparison is correctly done.

Many thanks to Kelly Anderson for debugging this.

Reported-by: Nix <nix@esperi.org.uk>
Reported-by: "Christopher K." <c.krooss@googlemail.com>
Reported-and-tested-by: Kelly Anderson <kelly@silka.with-linux.com>
Signed-off-by: Kelly Anderson <kelly@silka.with-linux.com>
[cl: remove unneeded casts; use a temp variable]
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: 2.6.38 <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 31 Mar 2011 18:28:57 +0000 (20:28 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220
David Henningsson [Thu, 31 Mar 2011 07:36:19 +0000 (09:36 +0200)]
ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220

This quirk is needed for the docking station mic of
Lenovo Thinkpad X220 to function correctly.

BugLink: http://bugs.launchpad.net/bugs/746259
Cc: stable@kernel.org
Tested-by: James Ferguson <james.ferguson@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: Use data based init for sn95031 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:17 +0000 (21:53 +0800)]
ASoC: Use data based init for sn95031 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for ak4535 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:07 +0000 (21:53 +0800)]
ASoC: Use data based init for ak4535 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for tlv320aic23 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:16 +0000 (21:53 +0800)]
ASoC: Use data based init for tlv320aic23 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for wm8711 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:15 +0000 (21:53 +0800)]
ASoC: Use data based init for wm8711 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for wm8728 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:14 +0000 (21:53 +0800)]
ASoC: Use data based init for wm8728 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for wm9705 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:13 +0000 (21:53 +0800)]
ASoC: Use data based init for wm9705 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for wm9712 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:12 +0000 (21:53 +0800)]
ASoC: Use data based init for wm9712 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for wm9713 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:11 +0000 (21:53 +0800)]
ASoC: Use data based init for wm9713 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for max98088 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:10 +0000 (21:53 +0800)]
ASoC: Use data based init for max98088 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for cx20442 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:09 +0000 (21:53 +0800)]
ASoC: Use data based init for cx20442 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Use data based init for ak4671 DAPM
Lu Guanqun [Wed, 30 Mar 2011 13:53:08 +0000 (21:53 +0800)]
ASoC: Use data based init for ak4671 DAPM

Signed-off-by: Lu Guanqun <guanqun.lu@intel.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: soc-cache: Warn on syncing any non-writable registers
Dimitris Papastamos [Mon, 28 Mar 2011 10:39:15 +0000 (11:39 +0100)]
ASoC: soc-cache: Warn on syncing any non-writable registers

When syncing the cache, if the driver has given us a writable_register()
callback, use it to check if we are syncing a non-writable register
and if so warn the user.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: soc-cache: Fix indentation issues
Dimitris Papastamos [Mon, 28 Mar 2011 10:39:14 +0000 (11:39 +0100)]
ASoC: soc-cache: Fix indentation issues

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Wed, 30 Mar 2011 06:57:58 +0000 (08:57 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: ens1371: fix Creative Ectiva support
Clemens Ladisch [Wed, 30 Mar 2011 06:24:25 +0000 (08:24 +0200)]
ALSA: ens1371: fix Creative Ectiva support

To make the EV1938 chip work, add a magic bit and an extra delay.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Tested-by: Tino Schmidt <mailtinoshomepage@gmx.net>
Cc: all 2.6.x <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: firewire-speakers: fix hang when unplugging a running device
Clemens Ladisch [Wed, 30 Mar 2011 06:24:00 +0000 (08:24 +0200)]
ALSA: firewire-speakers: fix hang when unplugging a running device

When aborting a PCM stream, the xrun is signaled only if the stream is
running.  When disconnecting a PCM stream, calling snd_card_disconnect()
too early would change the stream into a non-running state and thus
prevent the xrun from being noticed by user space.

To prevent this, move the snd_card_disconnect() call after the xrun.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Wed, 30 Mar 2011 06:35:43 +0000 (08:35 +0200)]
Merge branch 'fix/asoc' into for-next

13 years agoMerge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Wed, 30 Mar 2011 06:35:18 +0000 (08:35 +0200)]
Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc

13 years agoASoC: zylonite: set .codec_dai_name in initializer
Antonio Ospite [Fri, 18 Mar 2011 11:47:33 +0000 (12:47 +0100)]
ASoC: zylonite: set .codec_dai_name in initializer

Fix the initialization of .codec_dai_name in zylonite_dai initializer,
do not mix it with the initialization of .codec_name which is set
already a few lines above.

Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Blackfin: push down SPORT settings from global variables
Barry Song [Mon, 28 Mar 2011 05:45:10 +0000 (01:45 -0400)]
ASoC: Blackfin: push down SPORT settings from global variables

Now that we have multi-component support, take the time to unify the
SPORT implementations a bit and make the setup dynamic.  This kills
off the global sport_handle which was shared across all the Blackfin
machine drivers.  The pin management aspect is off loaded to platform
resources, and now multiple SPORTs can be instantiated simultaneously.

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Blackfin: standardize machine driver names
Mike Frysinger [Mon, 28 Mar 2011 05:45:09 +0000 (01:45 -0400)]
ASoC: Blackfin: standardize machine driver names

Some machine drivers were using "bf5xx-", others were using "bf5xx_",
while others were using "bfin-".  Further, some were using the same
name in the transport layer which makes it hard to use different codecs
at the same time.  So standardize all of them to "bfin-" and make sure
they are name spaced according to their driver name.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Blackfin: drop "-codec" from codec names
Mike Frysinger [Mon, 28 Mar 2011 05:45:08 +0000 (01:45 -0400)]
ASoC: Blackfin: drop "-codec" from codec names

The recent multi-component patch incorrectly added "-codec" suffixes to
parts which are not MFD.  Drop the suffix from the machine drivers too.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Blackfin: add ad193x sysclk configuration
Scott Jiang [Sun, 27 Mar 2011 09:33:04 +0000 (05:33 -0400)]
ASoC: Blackfin: add ad193x sysclk configuration

Signed-off-by: Scott Jiang <scott.jiang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: SSM2602: convert to soc-cache
Cliff Cai [Sun, 27 Mar 2011 21:22:57 +0000 (17:22 -0400)]
ASoC: SSM2602: convert to soc-cache

Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: ad1980: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:13 +0000 (00:44 -0400)]
ASoC: ad1980: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: ad193x: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:12 +0000 (00:44 -0400)]
ASoC: ad193x: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: ad73311: fix codec name
Mike Frysinger [Sun, 27 Mar 2011 04:44:11 +0000 (00:44 -0400)]
ASoC: ad73311: fix codec name

The codec name should not have a "-codec" suffix since this is not part of
a MFD.  This was incorrectly changed during the multi-component updated.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>