]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge branch 'topic/lola' into for-next
Takashi Iwai [Wed, 4 May 2011 17:55:37 +0000 (19:55 +0200)]
Merge branch 'topic/lola' into for-next

13 years agoALSA: lola - fix lola build
Randy Dunlap [Wed, 4 May 2011 16:53:10 +0000 (09:53 -0700)]
ALSA: lola - fix lola build

sound/pci/lola/Makefile was trying to build lola modules even
when PCI and SND_LOLA were not enabled, causing build errors:

ERROR: "snd_pcm_hw_constraint_step" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_period_elapsed" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_dma_alloc_pages" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_hw_constraint_integer" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_sgbuf_ops_page" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_set_ops" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_lib_free_pages" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_lib_ioctl" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_lib_malloc_pages" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_sgbuf_get_chunk_size" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_dma_free_pages" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_lib_preallocate_pages_for_all" [sound/pci/lola/snd-lola.ko] undefined!
ERROR: "snd_pcm_new" [sound/pci/lola/snd-lola.ko] undefined!

Fix the Makefile to build only when CONFIG_SND_LOLA is enabled.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 4 May 2011 16:30:10 +0000 (18:30 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Use position_fix=3 as default for AMD chipsets
Takashi Iwai [Wed, 4 May 2011 16:28:50 +0000 (18:28 +0200)]
ALSA: hda - Use position_fix=3 as default for AMD chipsets

AMD chipsets often behave pretty badly regarding the DMA position
reporting.  It results in the bad quality audio recording.
Using position_fix=3 works well in general for them, so let's enable
it as default for AMD.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/lola' into for-next
Takashi Iwai [Tue, 3 May 2011 16:48:59 +0000 (18:48 +0200)]
Merge branch 'topic/lola' into for-next

13 years agoALSA: lola - Yet another linux/delay.h inclusion
Takashi Iwai [Tue, 3 May 2011 16:48:29 +0000 (18:48 +0200)]
ALSA: lola - Yet another linux/delay.h inclusion

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/lola' into for-next
Takashi Iwai [Tue, 3 May 2011 16:21:22 +0000 (18:21 +0200)]
Merge branch 'topic/lola' into for-next

13 years agoALSA: lola - Add missing inclusion of linux/delay.h
Takashi Iwai [Tue, 3 May 2011 16:21:01 +0000 (18:21 +0200)]
ALSA: lola - Add missing inclusion of linux/delay.h

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/lola' into for-next
Takashi Iwai [Tue, 3 May 2011 15:11:58 +0000 (17:11 +0200)]
Merge branch 'topic/lola' into for-next

13 years agoALSA: lola - Implement polling_mode like hd-audio
Takashi Iwai [Tue, 3 May 2011 15:06:53 +0000 (17:06 +0200)]
ALSA: lola - Implement polling_mode like hd-audio

Also protect the call of lola_update_rirb() with spinlock.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Rename to Digital SRC Capture Switch
Takashi Iwai [Tue, 3 May 2011 15:05:08 +0000 (17:05 +0200)]
ALSA: lola - Rename to Digital SRC Capture Switch

Renamed to Digial SRC Capture Switch for more correct representation.
Also fixed analog volume control on Lola161611 and lola881.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Add sync in loop implementation
Takashi Iwai [Tue, 3 May 2011 15:02:35 +0000 (17:02 +0200)]
ALSA: lola - Add sync in loop implementation

For assuring the synchronized state with the pause operation,
loop over the all linked streams and waits until all get ready
in a loop.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Add SRC refcounting
Takashi Iwai [Tue, 3 May 2011 14:59:27 +0000 (16:59 +0200)]
ALSA: lola - Add SRC refcounting

Added the refcounting for the exclusive SRC control.
Also, fixed the possible stall after PCM pause operations.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Allow granularity changes
Takashi Iwai [Tue, 3 May 2011 14:51:56 +0000 (16:51 +0200)]
ALSA: lola - Allow granularity changes

Add some sanity checks.
Change PCM parameters appropriately per granularity.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Use SG-buffer
Takashi Iwai [Tue, 3 May 2011 14:50:51 +0000 (16:50 +0200)]
ALSA: lola - Use SG-buffer

Completely switch to SG-buffer now, as it's working stably.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Add Lola-specific module options
Takashi Iwai [Tue, 3 May 2011 14:48:59 +0000 (16:48 +0200)]
ALSA: lola - Add Lola-specific module options

Added granularity and sample_rate_min module options.

The former controls the h/w access granularity.  As default, it's set
to the max value 32.

The latter controls the minimum sample rate in Hz, as default 16000.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Fix PCM stalls
Takashi Iwai [Tue, 3 May 2011 14:47:03 +0000 (16:47 +0200)]
ALSA: lola - Fix PCM stalls

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Use a single BDL
Takashi Iwai [Tue, 3 May 2011 14:41:02 +0000 (16:41 +0200)]
ALSA: lola - Use a single BDL

Use a single BDL for both buffers instead of allocating for each.

Also a few tune-up to avoid the stream stalls in the PCM code and
the prelimianry work for SG-buffer support are added, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Suppress the debug print
Takashi Iwai [Tue, 3 May 2011 14:36:09 +0000 (16:36 +0200)]
ALSA: lola - Suppress the debug print

Use snd_printdd() for less important debug messages.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Changes in proc file
Takashi Iwai [Tue, 3 May 2011 14:32:48 +0000 (16:32 +0200)]
ALSA: lola - Changes in proc file

The codec proc file becomes a read only that shows the codec widgets
in a text form.  A new proc file, codec_rw, is introduced instead for
accessing the Lola verb directly by reading and writing to it.

Also, regs proc file shows the contents of DSD, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: lola - Make SRC helper global
Takashi Iwai [Tue, 3 May 2011 14:39:37 +0000 (16:39 +0200)]
ALSA: lola - Make SRC helper global

Make lola_sample_rate_convert() global so that it can be accessed from
other files.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: Add the driver for Digigram Lola PCI-e boards
Takashi Iwai [Tue, 3 May 2011 14:14:46 +0000 (16:14 +0200)]
ALSA: Add the driver for Digigram Lola PCI-e boards

Added a new driver for supporting Digigram Lola PCI-e boards.

Lola has a similar h/w design like HD-audio but with extended verbs.
Thus the driver is written similarly like HD-audio driver in the bus
part.  The codec part is rather written in a fixed way specific to the
Lola board because of the verb incompatibility.

The driver provides basic PCM, supporting multi-streams and mixing.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 3 May 2011 10:53:05 +0000 (12:53 +0200)]
Merge branch 'topic/asoc' into for-next

13 years agoASoC: Declare const properly for enum texts
Takashi Iwai [Tue, 3 May 2011 10:50:29 +0000 (12:50 +0200)]
ASoC: Declare const properly for enum texts

The enum texts are supposed to be const char * const [].  Without the
second const, it gets compile warnings like
    sound/soc/codecs/max98095.c:607:2: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 3 May 2011 08:32:26 +0000 (10:32 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - fix NULL-dereference in patch_realtek
Raymond Yau [Tue, 3 May 2011 05:33:53 +0000 (13:33 +0800)]
ALSA: hda - fix NULL-dereference in patch_realtek

Fix NULL-dereference when try to use alt_playback since those codecs
which support multistreaming playback usually have more than 1 adc but
the driver should create alt_capture when spec->stream_analog_alt_capture
is also defined.

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 2 May 2011 11:58:23 +0000 (13:58 +0200)]
Merge branch 'fix/hda' into topic/hda

13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 2 May 2011 11:58:15 +0000 (13:58 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - Fix Realtek's chained fixup checks
Takashi Iwai [Mon, 2 May 2011 11:55:36 +0000 (13:55 +0200)]
ALSA: hda - Fix Realtek's chained fixup checks

The check of chained fixup list entry was done against the wrong element.
A stupid mistake during refactoring.

Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 2 May 2011 10:39:18 +0000 (12:39 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Constify fixup and other array data in patch_via.c
Takashi Iwai [Mon, 2 May 2011 10:38:19 +0000 (12:38 +0200)]
ALSA: hda - Constify fixup and other array data in patch_via.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_sigmatel.c
Takashi Iwai [Mon, 2 May 2011 10:33:43 +0000 (12:33 +0200)]
ALSA: hda - Constify fixup and other array data in patch_sigmatel.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_si3054.c
Takashi Iwai [Mon, 2 May 2011 10:22:39 +0000 (12:22 +0200)]
ALSA: hda - Constify fixup and other array data in patch_si3054.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_hdmi.c
Takashi Iwai [Mon, 2 May 2011 10:17:41 +0000 (12:17 +0200)]
ALSA: hda - Constify fixup and other array data in patch_hdmi.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_conexant.c
Takashi Iwai [Mon, 2 May 2011 09:38:21 +0000 (11:38 +0200)]
ALSA: hda - Constify fixup and other array data in patch_conexant.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_cirrus.c
Takashi Iwai [Mon, 2 May 2011 09:36:09 +0000 (11:36 +0200)]
ALSA: hda - Constify fixup and other array data in patch_cirrus.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_ca0110.c
Takashi Iwai [Mon, 2 May 2011 09:36:00 +0000 (11:36 +0200)]
ALSA: hda - Constify fixup and other array data in patch_ca0110.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_cmedia.c
Takashi Iwai [Mon, 2 May 2011 09:34:20 +0000 (11:34 +0200)]
ALSA: hda - Constify fixup and other array data in patch_cmedia.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_analog.c
Takashi Iwai [Mon, 2 May 2011 09:33:15 +0000 (11:33 +0200)]
ALSA: hda - Constify fixup and other array data in patch_analog.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_realtek.c
Takashi Iwai [Mon, 2 May 2011 09:30:18 +0000 (11:30 +0200)]
ALSA: hda - Constify fixup and other array data in patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify some API function arguments
Takashi Iwai [Mon, 2 May 2011 09:29:30 +0000 (11:29 +0200)]
ALSA: hda - Constify some API function arguments

Also fixed the assignment of multiout.dac_nids to satisfy const.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify fixup and other array data in patch_realtek.c
Takashi Iwai [Mon, 2 May 2011 09:30:18 +0000 (11:30 +0200)]
ALSA: hda - Constify fixup and other array data in patch_realtek.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Constify some API function arguments
Takashi Iwai [Mon, 2 May 2011 09:29:30 +0000 (11:29 +0200)]
ALSA: hda - Constify some API function arguments

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 2 May 2011 08:41:40 +0000 (10:41 +0200)]
Merge branch 'fix/hda' into topic/hda

13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Mon, 2 May 2011 08:40:29 +0000 (10:40 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoRevert "ALSA: hda - Fix pin-config of Gigabyte mobo"
Takashi Iwai [Mon, 2 May 2011 08:37:29 +0000 (10:37 +0200)]
Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"

This reverts commit c6b358748e19ce7e230b0926ac42696bc485a562.

It turned out that there are different pin configurations for this
PCI SSID, including multi-channel modes.  And more proper fix for
allowing line-out mutes will come up in 2.6.40 tree, so we won't need
this fixup any more there.

Reported-by: Andrew Clayton <andrew@digital-domain.net>
Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Fri, 29 Apr 2011 17:19:48 +0000 (19:19 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 29 Apr 2011 12:19:59 +0000 (14:19 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: HDA: Fix automute for Gateway NV79
David Henningsson [Fri, 29 Apr 2011 12:10:55 +0000 (14:10 +0200)]
ALSA: HDA: Fix automute for Gateway NV79

The PCI SSID is 1025:031c and the codec SSID is 1025:031d,
so the driver mistakes this for a SKU value, but looking at
the numbers, this is obviously wrong.

Cc: stable@kernel.org (2.6.38+)
BugLink: http://bugs.launchpad.net/bugs/761861
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Show the line-out type in snd_hda_parse_pin_def_config()
Takashi Iwai [Fri, 29 Apr 2011 11:00:40 +0000 (13:00 +0200)]
ALSA: hda - Show the line-out type in snd_hda_parse_pin_def_config()

Helpful for debugging.

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

13 years agoALSA: hda: add beep quirk for Realtek 0x1043:831a
Daniel Cordero [Fri, 29 Apr 2011 06:18:06 +0000 (08:18 +0200)]
ALSA: hda: add beep quirk for Realtek 0x1043:831a

PC Beep was not being reported as enabled on my EeePC 901:
        SKU: enable_pcbeep=0x0

Signed-off-by: Daniel Cordero <danielcordero@lavabit.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Thu, 28 Apr 2011 16:23:14 +0000 (18:23 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA: usb-audio - Terratec Aureon 7.1 USB ID as C-Media cm6206 quirks
Wolfgang Breyha [Thu, 28 Apr 2011 14:18:40 +0000 (16:18 +0200)]
ALSA: usb-audio - Terratec Aureon 7.1 USB ID as C-Media cm6206 quirks

This patch adds support for the Terratec Aureon 7.1 USB which uses a
C-Media cm6206 and needs all the quirks already found in the past.

Signed-off-by: Wolfgang Breyha <wbreyha@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add Auto-Mute Mode enum for two-output cases
Takashi Iwai [Thu, 28 Apr 2011 16:09:52 +0000 (18:09 +0200)]
ALSA: hda - Add Auto-Mute Mode enum for two-output cases

The Auto-Mute Mode control is useful even when only two outputs
(e.g. HP and speaker) are available.  Then user can enable/disable
the auto-mute behavior on the fly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - More line-out auto-mute support for Realtek
Takashi Iwai [Thu, 28 Apr 2011 15:57:46 +0000 (17:57 +0200)]
ALSA: hda - More line-out auto-mute support for Realtek

Not only supporting the line-out automute as additional feature
to the existing headphone automute, now the headphone jack can
mute the line-out alone even without the speaker outs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add support for Line-Out automute to Realtek auto-parser
Takashi Iwai [Thu, 28 Apr 2011 15:36:18 +0000 (17:36 +0200)]
ALSA: hda - Add support for Line-Out automute to Realtek auto-parser

By popular demands, I add the functionality to mute / unmute the
line-out jacks per the headphone plug / unplug.  For achieving this
and keeping the compatibility with the old behavior, the new mixer
enum "Auto-Mute Mode" is added.  With this, user can control the
auto-mute behavior either disabled, speaker-only or lineout+speaker.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - More reduction of redundant automute codes in Realtek parser
Takashi Iwai [Thu, 28 Apr 2011 14:26:24 +0000 (16:26 +0200)]
ALSA: hda - More reduction of redundant automute codes in Realtek parser

Removed the redundant codes by replacing with the common helper
functions.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Consolidate auto-mute with master-switch for Realtek
Takashi Iwai [Thu, 28 Apr 2011 13:46:07 +0000 (15:46 +0200)]
ALSA: hda - Consolidate auto-mute with master-switch for Realtek

Yet another consolidation of auto-mute functions for the devices
controlling the output muts together with the master mixer switch,
typically found for ALC262 machines.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add support of line-out automute for Realtek
Takashi Iwai [Thu, 28 Apr 2011 12:41:52 +0000 (14:41 +0200)]
ALSA: hda - Add support of line-out automute for Realtek

Add the common helper function and flags to support the auto-mute
per line-out jack detection, and also the mute of line-out jacks.

A few model-specific implementations are replaced with the common
helpers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add common automute support for mxier-amp on/off for Reatek
Takashi Iwai [Thu, 28 Apr 2011 12:03:24 +0000 (14:03 +0200)]
ALSA: hda - Add common automute support for mxier-amp on/off for Reatek

Some models do mute on/off the connected mixer widget for the automatic
muting, instead of controlling the pin widget itself.  This patch adds
the implementation of such type of auto-mute in the common helper
function, and reduces the redundant codes for each model preset.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Consolidate default automute functions for Realtek
Takashi Iwai [Thu, 28 Apr 2011 10:18:53 +0000 (12:18 +0200)]
ALSA: hda - Consolidate default automute functions for Realtek

There are two entry points for the headphone automute functions for
Realtek, alc_automute_amp() and alc_automute_pin().  These call the
same function in the end, so we can basically consolidate these
with a flag in spec.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: Don't specify the DMA driver for Goni baseband link
Mark Brown [Wed, 27 Apr 2011 17:25:34 +0000 (18:25 +0100)]
ASoC: Don't specify the DMA driver for Goni baseband link

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Don't specify the DMA driver for OpenMoko baseband link
Mark Brown [Wed, 27 Apr 2011 17:17:27 +0000 (18:17 +0100)]
ASoC: Don't specify the DMA driver for OpenMoko baseband link

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Thu, 28 Apr 2011 11:10:25 +0000 (12:10 +0100)]
Merge branch 'for-2.6.39' into for-2.6.40

13 years agoASoC: Fix CODEC DAI names for Goni
Mark Brown [Wed, 27 Apr 2011 17:24:35 +0000 (18:24 +0100)]
ASoC: Fix CODEC DAI names for Goni

Immediately after sending the last fix I realised that the CODEC DAI names
also don't correspond to the WM8994 driver. Update the DAI names to match.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Fix CODEC name in Goni
Mark Brown [Wed, 27 Apr 2011 17:19:17 +0000 (18:19 +0100)]
ASoC: Fix CODEC name in Goni

This was typoed at some point in the multi-component merge, though the
driver was added along with that.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Work around allmodconfig failure
Mark Brown [Thu, 28 Apr 2011 09:57:54 +0000 (10:57 +0100)]
ASoC: Work around allmodconfig failure

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 28 Apr 2011 09:36:13 +0000 (11:36 +0200)]
Merge branch 'fix/hda' into for-next

13 years agoALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.
Lydia Wang [Thu, 28 Apr 2011 08:03:39 +0000 (16:03 +0800)]
ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.

In notify_aa_path_ctls(), adds 'rear mic' item and confirms the A-A
path control existing before notifying card that the A-A path volume
is muted if smart5.1 is enabled.

Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 28 Apr 2011 08:02:21 +0000 (10:02 +0200)]
Merge branch 'topic/misc' into for-next

13 years agoALSA: usb-audio - Don't expose broken dB ranges
Takashi Iwai [Thu, 28 Apr 2011 07:58:43 +0000 (09:58 +0200)]
ALSA: usb-audio - Don't expose broken dB ranges

Some crappy USB-audio devices give broken dB ranges, e.g. both min and max
are 0dB.  This confuses the volume control that prefers dB expression such
as alsactl or PulseAudio.  In such a case, it's much better not to expose
the broken dB information.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoASoC: Implement WM8962 ADC high pass filter configuration
Mark Brown [Tue, 26 Apr 2011 15:04:37 +0000 (16:04 +0100)]
ASoC: Implement WM8962 ADC high pass filter configuration

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Add dapm_find_widget helper
Lars-Peter Clausen [Wed, 27 Apr 2011 16:34:31 +0000 (18:34 +0200)]
ASoC: Add dapm_find_widget helper

This patch adds a helper function for searching DAPM widgets by name.
This allows to streamline functions which operate on widgets by name.
It also allows to get rid of copy'n'pasted code which was added to fallback to
widgets from other contexts if the widget was not found in the current context.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: Don't specify the DMA driver for Speyside baseband link
Mark Brown [Wed, 27 Apr 2011 17:17:01 +0000 (18:17 +0100)]
ASoC: Don't specify the DMA driver for Speyside baseband link

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Add more natural support for no-DMA DAIs
Mark Brown [Wed, 27 Apr 2011 17:16:32 +0000 (18:16 +0100)]
ASoC: Add more natural support for no-DMA DAIs

Since we can now support multiple platforms allow machines to not specify
a platform in a DAI link. Since the rest of the code requires that we have
a struct device for all objects we do this by substituting in a dummy
device that we register automatically.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Allow platform drivers to have no ops structure
Mark Brown [Wed, 27 Apr 2011 17:58:17 +0000 (18:58 +0100)]
ASoC: Allow platform drivers to have no ops structure

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Wed, 27 Apr 2011 15:00:17 +0000 (17:00 +0200)]
Merge branch 'fix/misc' into for-next

13 years agoALSA - au88x0 - Add buffer bytes constraints
Raymond Yau [Mon, 25 Apr 2011 04:05:45 +0000 (12:05 +0800)]
ALSA - au88x0 - Add buffer bytes constraints

This allow application such as gstreamer and wine which use
snd_pcm_hw_params_set_buffer_time_near() won't fail any more
since sound chips require special containt power 2 period bytes

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Add channel-mode support to Realtek auto-parser
Takashi Iwai [Wed, 27 Apr 2011 14:35:23 +0000 (16:35 +0200)]
ALSA: hda - Add channel-mode support to Realtek auto-parser

This patch adds the support of "Channel Mode" enum control to Realtek
auto-parser.  When line-in or mic-in jacks are capable to output and
free DACs are available, the driver allows to switch to multi-channel
mode via "Channel Mode" enum switch, as already implemented in some
preset cases.

Not implemented in all Realtek codecs.  Currently, ALC880, 882, 861,
662 and the compatible codecs are supported.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Minor update for alc662-parser functions
Takashi Iwai [Wed, 27 Apr 2011 13:14:23 +0000 (15:14 +0200)]
ALSA: hda - Minor update for alc662-parser functions

Allow alc662_dac_to_mix() and alc662_look_for_dac() to parse
down the selector widget that is found in ALC880-type codecs,
and rename them to alc_auto_*() accordingly.
This is for the next coming multi-io extensions.

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

13 years agoALSA: hda - VIA: Fix Smart5.1 isn't useful for 6 audio jacks motherboard.
Lydia Wang [Wed, 27 Apr 2011 09:44:16 +0000 (17:44 +0800)]
ALSA: hda - VIA: Fix Smart5.1 isn't useful for 6 audio jacks motherboard.

For some motherboards with 5 or 6 audio jacks which had six or eight multiple
channels output, smart5.1 item is no useful and should be removed.

Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 26 Apr 2011 13:34:18 +0000 (15:34 +0200)]
Merge branch 'topic/hda' into for-next

13 years agoALSA: hda - Enable sync_write workaround for AMD generically
Takashi Iwai [Tue, 26 Apr 2011 13:25:02 +0000 (15:25 +0200)]
ALSA: hda - Enable sync_write workaround for AMD generically

The workaround for AMD chipset via sync_write flag seems needed for
machines with Realtek codecs.  So, it's better to activate it
generically in hda_intel.c from the beginning.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoALSA: hda - Move EAPD power-down into shutup callback for AD codecs
Takashi Iwai [Tue, 26 Apr 2011 13:18:33 +0000 (15:18 +0200)]
ALSA: hda - Move EAPD power-down into shutup callback for AD codecs

EAPD power-down should be called also for normal shutup cases.
Let's move to there.   This also fixes the compile warnings when
CONFIG_PM isn't set automatically.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Tue, 26 Apr 2011 13:05:39 +0000 (15:05 +0200)]
Merge branch 'fix/hda' into topic/hda

13 years agoASoC: Don't warn if the WM8962 SYSCLK FLL setting doesn't match reality
Mark Brown [Mon, 25 Apr 2011 17:27:35 +0000 (18:27 +0100)]
ASoC: Don't warn if the WM8962 SYSCLK FLL setting doesn't match reality

When bringing up audio low power modes boards may configure SYSCLK before
they actually start the FLL as we do much of the clocking setup prior to
the power up sequence.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Implement WM8962 DMIC support
Mark Brown [Mon, 25 Apr 2011 19:14:21 +0000 (20:14 +0100)]
ASoC: Implement WM8962 DMIC support

DMIC support is automatically disabled when none of the GPIOs are set up
to bring out the DMICCLK and DMICDAT pins at startup.

Note that there's no support for controlling DMIC routing except the power
control so the board DAPM configuration will need to manage DMIC enable and
disable if analogue mics (eg, a headset) also exist.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Define constants for WM8962 GPIO functions
Mark Brown [Mon, 25 Apr 2011 19:01:42 +0000 (20:01 +0100)]
ASoC: Define constants for WM8962 GPIO functions

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Move WM8962 FLL configuration to CODEC
Mark Brown [Mon, 25 Apr 2011 17:44:01 +0000 (18:44 +0100)]
ASoC: Move WM8962 FLL configuration to CODEC

There's only one DAI anyway.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Support FLL lock interrupt on WM8962
Mark Brown [Mon, 25 Apr 2011 16:53:43 +0000 (17:53 +0100)]
ASoC: Support FLL lock interrupt on WM8962

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoASoC: Support 24.576MHz MCLKs in WM8915
Mark Brown [Thu, 21 Apr 2011 13:16:14 +0000 (14:16 +0100)]
ASoC: Support 24.576MHz MCLKs in WM8915

We can safely divide these down to within the supported SYSCLK range.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
13 years agoMerge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Tue, 26 Apr 2011 10:46:47 +0000 (11:46 +0100)]
Merge branch 'for-2.6.39' into for-2.6.40

13 years agodavinci-mcasp: fix _CBM_CFS pin directions
Ben Gardiner [Thu, 21 Apr 2011 18:19:04 +0000 (14:19 -0400)]
davinci-mcasp: fix _CBM_CFS pin directions

The current davinci_mcasp_set_dai_fmt() sets bits ACLKX and ACLKR in the PDIR
register for the codec clock-master/frame-slave mode; however, this results in
the ACLKX and ACLKR pins being outputs according to SPRUFM1 [1]  which
conflicts with "codec is clock master."

Similarly to the previous patch in this series, "fix _CBM_CFS hw_params" --
For codec clock-master/frame-slave mode (_CMB_CFS), clear bits ACLKX and ACLKR
in the PDIR register to set the pins as inputs and hence allow externally
sourced bit-clocks.

[1] http://www.ti.com/litv/pdf/sprufm1

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: James Nuss <jamesnuss@nanometrics.ca>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agodavinci-mcasp: fix _CBM_CFS hw_params
Ben Gardiner [Thu, 21 Apr 2011 18:19:03 +0000 (14:19 -0400)]
davinci-mcasp: fix _CBM_CFS hw_params

The current davinci_mcasp_set_dai_fmt() sets bits ACLKXE and ACLKRE (CLKXM
and CLKRM as they are reffered to in SPRUFM1 [1]) for codec clock-slave/
frame-slave mode (_CBS_CFS) which selects internally generated bit-clock and
frame-sync signals; however, it does the same thing again for codec
clock-master/frame-slave mode (_CBM_CFS) in the very next case statement which
is incorrectly selecting internally generated bit-clocks in this mode.

For codec clock-master/frame-slave mode (_CBM_CFS), clear bits ACLKXE and
ACLKRE to select externally-generated bit-clocks.

[1] http://www.ti.com/litv/pdf/sprufm1

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: James Nuss <jamesnuss@nanometrics.ca>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agodavinci-mcasp: use bitfield definitions for PDIR
Ben Gardiner [Thu, 21 Apr 2011 18:19:02 +0000 (14:19 -0400)]
davinci-mcasp: use bitfield definitions for PDIR

The current driver creates value for set/clr of PDIR using (x<<26) instead
of the #defines that are convieniently made available.

Update the driver to use the bitfield definitions of PDIR. There is no
functional change introduced by this patch.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: James Nuss <jamesnuss@nanometrics.ca>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: davinci-mcasp: correct tdm_slots limit
Ben Gardiner [Thu, 21 Apr 2011 18:19:01 +0000 (14:19 -0400)]
ASoC: davinci-mcasp: correct tdm_slots limit

The current check for the number of tdm-slots specified by platform data is
always true (x >= 2 || x <= 32); therefore the else branch that warns of an
incorrect number of slots can never be taken.

Check that the number of tdm slots specified by platform data is between 2
and 32, inclusive.

Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: James Nuss <jamesnuss@nanometrics.ca>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: sh: fsi: Add module/port clock control function
Kuninori Morimoto [Thu, 21 Apr 2011 01:33:52 +0000 (10:33 +0900)]
ASoC: sh: fsi: Add module/port clock control function

The FIFO of each port were always working though it was not used
in current FSI driver.
This patch add module/port clock control function for fixing it.
This patch is also caring suspend/resume.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Simon Horman <simon@horms.net>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
13 years agoASoC: sh: fsi: add dev_pm_ops :: suspend/resume
Kuninori Morimoto [Thu, 21 Apr 2011 01:33:47 +0000 (10:33 +0900)]
ASoC: sh: fsi: add dev_pm_ops :: suspend/resume

Current FSI driver sets important settings when probing.
And it are not set again as long as driver is not bind again.
This mean FSI driver will lost it from register
if suspend/resume are happen.
This patch save important settings for suspend/resume.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Simon Horman <simon@horms.net>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>