]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 18 Nov 2009 15:36:34 +0000 (16:36 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoMerge branch 'fix/asoc' into for-next
Takashi Iwai [Wed, 18 Nov 2009 15:36:31 +0000 (16:36 +0100)]
Merge branch 'fix/asoc' into for-next

14 years agoMerge branch 'for-2.6.32' into for-2.6.33
Mark Brown [Wed, 18 Nov 2009 13:54:51 +0000 (13:54 +0000)]
Merge branch 'for-2.6.32' into for-2.6.33

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 18 Nov 2009 13:53:19 +0000 (14:53 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoASoC: tlv320aic23 fix rate selection
Troy Kisky [Tue, 17 Nov 2009 20:51:01 +0000 (13:51 -0700)]
ASoC: tlv320aic23 fix rate selection

Fix the ordering of sr_valid_mask array.
The lower bit of the index represents USB
not bosr.

Reported-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: OMAP3 Pandora: update for TWL4030 codec changes
Grazvydas Ignotas [Sat, 7 Nov 2009 21:16:12 +0000 (23:16 +0200)]
ASoC: OMAP3 Pandora: update for TWL4030 codec changes

A while ago TWL4030 had it's playback stream name changed, but
pandora needs it for it's playback path. Update to correct stream
name so that playback works again.

Also mark VIBRA output as not connected.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Modifying the license string GPLv2 for OMAP3 EVM
Anuj Aggarwal [Tue, 17 Nov 2009 16:13:42 +0000 (21:43 +0530)]
ASoC: Modifying the license string GPLv2 for OMAP3 EVM

Correcting the license string from GPLv2 -> GPL v2.
Found the problem while building OMAP3 ASoC driver as
module.

Signed-off-by: Anuj Aggarwal <anuj.aggarwal@ti.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
Mark Brown [Wed, 18 Nov 2009 13:42:05 +0000 (13:42 +0000)]
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.33

14 years agoASoC: DaVinci: remove requirement that dma_params is 1st in structure
Troy Kisky [Mon, 16 Nov 2009 23:52:31 +0000 (16:52 -0700)]
ASoC: DaVinci: remove requirement that dma_params is 1st in structure

Remove requirement that dma_params is 1st in the structures
davinci_audio_dev and davinci_mcbsp_dev.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Added the CPU driver for PCM controllers
Jassi Brar [Tue, 17 Nov 2009 07:54:03 +0000 (16:54 +0900)]
ASoC: Added the CPU driver for PCM controllers

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoARM: S3C64XX: Defined PCM controller platform devices
Jassi Brar [Tue, 17 Nov 2009 07:53:56 +0000 (16:53 +0900)]
ARM: S3C64XX: Defined PCM controller platform devices

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoARM: S3C64XX: Added platform data header
Jassi Brar [Tue, 17 Nov 2009 07:53:50 +0000 (16:53 +0900)]
ARM: S3C64XX: Added platform data header

Many SoCs have their I2S pins MUXed with other functions. So we need
to pass a callback for driver to configure the pins appropriately.
Hence, the need of platform data and this header.

As and when needed new callbacks and structure pointers maybe added to this
header.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoARM: S3C64XX: Define PCM Controller base registers
Jassi Brar [Tue, 17 Nov 2009 07:53:38 +0000 (16:53 +0900)]
ARM: S3C64XX: Define PCM Controller base registers

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Rename 's3c24xx-pcm' driver to 's3c-dma'
Jassi Brar [Tue, 17 Nov 2009 07:53:31 +0000 (16:53 +0900)]
ASoC: Rename 's3c24xx-pcm' driver to 's3c-dma'

Making room for namespace for the PCM Controller driver
the platform driver(s3c24xx-pcm) has been renamed to SoC
agnostic name 's3c-dma'.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Rename s3c24xx_pcm prefix to s3c_dma
Jassi Brar [Tue, 17 Nov 2009 07:53:23 +0000 (16:53 +0900)]
ASoC: Rename s3c24xx_pcm prefix to s3c_dma

The s3c24xx_pcm prefix for the soc_platform is inappropriate when
some Samsung SoCs have PCM controllers which will eventually have
drivers and hence namespace ambiguities.

To resolve naming ambiguities in future the following have been
renamed in order
1) s3c24xx_pcm_dma_params -> s3c_dma_params
2) s3c24xx_pcm_preallocate_dma_buffer -> s3c_preallocate_dma_buffer
3) s3c24xx_pcm_dmamask -> s3c_dma_mask
4) s3c24xx_pcm_XXX -> s3c_dma_XXX

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoALSA: hda - Fix detection of dual headphones
Takashi Iwai [Wed, 18 Nov 2009 13:23:37 +0000 (14:23 +0100)]
ALSA: hda - Fix detection of dual headphones

The dual-headphone mode with STAC/IDT codecs is useful only for machines
that have two (or more) built-in headphones.

But, some HP laptops give multiple headphone pin configs, one for the
built-in and another for the separate (likely a docking station) one.
This results in a missing speaker volume control.

This patch adds more check for the dual-headphone mode to avoid this
problem.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 18 Nov 2009 08:59:57 +0000 (09:59 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: remove unnecessary null check
Dan Carpenter [Wed, 18 Nov 2009 08:31:57 +0000 (10:31 +0200)]
ALSA: remove unnecessary null check

This function is only called from snd_ctl_ioctl() and the file parameter
can never be null so there is no need to check it here.

We dereference file at the start of the function:
        struct snd_card *card = file->card;
and it confuses static checkers to dereference a pointer before
checking it.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 18 Nov 2009 07:39:39 +0000 (08:39 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: opti-miro: Fix missing semicolon
Takashi Iwai [Wed, 18 Nov 2009 07:37:59 +0000 (08:37 +0100)]
ALSA: opti-miro: Fix missing semicolon

To fix a build error
  sound/isa/opti9xx/miro.c:1281: error: expected ';' before '}' token

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Wed, 18 Nov 2009 07:02:44 +0000 (08:02 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Replace the rest of jack-detections with snd_hda_jack_detect()
Takashi Iwai [Wed, 18 Nov 2009 07:00:14 +0000 (08:00 +0100)]
ALSA: hda - Replace the rest of jack-detections with snd_hda_jack_detect()

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - show EPSS capability in proc
Wu Fengguang [Wed, 18 Nov 2009 04:38:08 +0000 (12:38 +0800)]
ALSA: hda - show EPSS capability in proc

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - sticky channel count
Wu Fengguang [Wed, 18 Nov 2009 04:38:07 +0000 (12:38 +0800)]
ALSA: intelhdmi - sticky channel count

Don't change channel count if not necessary.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - sticky stream id and format
Wu Fengguang [Wed, 18 Nov 2009 04:38:06 +0000 (12:38 +0800)]
ALSA: intelhdmi - sticky stream id and format

We tracked down the first-0.5s-hdmi-audio-samples-lost problem to the
AC_VERB_SET_CHANNEL_STREAMID command. It is suspected that many HDMI
sinks need some time to adapt to the new state.

The workaround is to avoid changing stream id/format whenever possible.
Proposed by David.

Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - sticky infoframe
Wu Fengguang [Wed, 18 Nov 2009 04:38:05 +0000 (12:38 +0800)]
ALSA: intelhdmi - sticky infoframe

Remember the active infoframe, so as to avoid stop/restart infoframe
transmission when switching between audio clips of the same format.

Proposed by Shang and David.

CC: Shane W <shane-alsa@csy.ca>
CC: David Härdeman <david@hardeman.nu>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - separate out infoframe checksum routine
Wu Fengguang [Wed, 18 Nov 2009 04:38:04 +0000 (12:38 +0800)]
ALSA: intelhdmi - separate out infoframe checksum routine

And make it right when called for more than one times.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - probe for monitor/eld presence at module init time
Wu Fengguang [Wed, 18 Nov 2009 04:38:03 +0000 (12:38 +0800)]
ALSA: intelhdmi - probe for monitor/eld presence at module init time

This avoids lost of presence info on module reloading.
The presence info used to be only updated at the (rare) hotplug events.

Proposed by David, thanks!

CC: David Härdeman <david@hardeman.nu>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - introduce snd_hda_jack_detect() and snd_hda_pin_sense()
Wu Fengguang [Wed, 18 Nov 2009 04:38:02 +0000 (12:38 +0800)]
ALSA: hda - introduce snd_hda_jack_detect() and snd_hda_pin_sense()

This helps merge duplicate code.

v2: add snd_hda_jack_detect() and comments recommended by Takashi.

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - export monitor-presence and ELD-valid status
Wu Fengguang [Wed, 18 Nov 2009 04:38:01 +0000 (12:38 +0800)]
ALSA: intelhdmi - export monitor-presence and ELD-valid status

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - fix channel mapping slot mask
Wu Fengguang [Wed, 18 Nov 2009 04:38:00 +0000 (12:38 +0800)]
ALSA: intelhdmi - fix channel mapping slot mask

Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: intelhdmi - fix audio infoframe fill size
Wu Fengguang [Wed, 18 Nov 2009 04:37:59 +0000 (12:37 +0800)]
ALSA: intelhdmi - fix audio infoframe fill size

Reported-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Wed, 18 Nov 2009 06:24:47 +0000 (07:24 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: opti-miro: use variables directly in the probe function
Krzysztof Helt [Tue, 17 Nov 2009 17:35:41 +0000 (18:35 +0100)]
ALSA: opti-miro: use variables directly in the probe function

Use the fm_port and mpu_port variables directly in a probe function.
This completely eliminates a need to copy the fm_port value to
the snd_miro structure.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: cs4236: update control names
Krzysztof Helt [Tue, 17 Nov 2009 17:34:54 +0000 (18:34 +0100)]
ALSA: cs4236: update control names

Update control names to be more closer to their meaning.
Change the "Mono" name to the "Beep" as this line is usually
used to forward the PC beeper signal to sound card's output.
Update names for both cs423x and wss.

Clean up cs4235 controls according to the cs4235 doc. Rename
some of the cs4235 controls to be consistent with the cs4236's
ones.

Also, delete one misnamed cs4231 register define.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Tue, 17 Nov 2009 15:03:57 +0000 (16:03 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Disable default quirk for Sony VAIO with ALC262 codec
Takashi Iwai [Tue, 17 Nov 2009 15:01:58 +0000 (16:01 +0100)]
ALSA: hda - Disable default quirk for Sony VAIO with ALC262 codec

The ALC262 has a quirk entry matching with all Sony Vaio laptops
to use model=sony-assamd as default.  But, model=auto works much better
for new models in the recent driver versions, thus it's safer to disable
that default quirk entry.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Tue, 17 Nov 2009 15:00:33 +0000 (16:00 +0100)]
Merge branch 'fix/hda' into topic/hda

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Tue, 17 Nov 2009 15:00:22 +0000 (16:00 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Fix quirk for VAIO type G
Takashi Iwai [Tue, 17 Nov 2009 14:58:35 +0000 (15:58 +0100)]
ALSA: hda - Fix quirk for VAIO type G

Vaio type G laptop doesn't work with the current quirk setup.
After some tests, it turned out that it should be model=auto as default.

Reported-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Tue, 17 Nov 2009 14:49:51 +0000 (15:49 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: usb - Quirk to disable master volume control in PCM2702
Javier Kohen [Tue, 17 Nov 2009 14:36:13 +0000 (15:36 +0100)]
ALSA: usb - Quirk to disable master volume control in PCM2702

Disable the master volume control in the PCM2702 chipset.

The datasheet documents two independent channel volume controls, one
master mute control and one master volume control. All controls are
fully functional except for the master volume control, which returns
USB stalls on all GET requests.

Signed-off-by: Javier Kohen <jkohen@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Tue, 17 Nov 2009 08:04:29 +0000 (09:04 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK
Marin Mitov [Mon, 16 Nov 2009 19:39:26 +0000 (21:39 +0200)]
ASoC: Use DMA_BIT_MASK(32) instead of deprecated DMA_32BIT_MASK

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Tue, 17 Nov 2009 08:00:20 +0000 (09:00 +0100)]
Merge branch 'topic/misc' into for-next

14 years agosound: Kconfig typo fix
Timothy Knoll [Tue, 17 Nov 2009 00:55:46 +0000 (19:55 -0500)]
sound: Kconfig typo fix

Fix a typo in the help text in sound/Kconfig.

Signed-off-by: Timothy Knoll <knollbert@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Mon, 16 Nov 2009 16:46:25 +0000 (17:46 +0100)]
Merge branch 'topic/misc' into for-next

14 years agosound: OSS: keep index within bounds of midi_devs[]
Roel Kluin [Mon, 16 Nov 2009 16:05:02 +0000 (17:05 +0100)]
sound: OSS: keep index within bounds of midi_devs[]

When the {orig,midi}_dev equals num_midis, that's one too
large already.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: OMAP: enable Overo driver for CM-T35
Mike Rapoport [Mon, 16 Nov 2009 14:19:25 +0000 (16:19 +0200)]
ASoC: OMAP: enable Overo driver for CM-T35

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Acked-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 16 Nov 2009 14:38:13 +0000 (15:38 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix build errors with CONFIG_SND_HDA_INPUT_BEEP=n
Takashi Iwai [Mon, 16 Nov 2009 14:35:59 +0000 (15:35 +0100)]
ALSA: hda - Fix build errors with CONFIG_SND_HDA_INPUT_BEEP=n

Disable beep-related codes when CONFIG_SND_HDA_INPUT_BEEP isn't set.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Fix beep_mode option value
Takashi Iwai [Mon, 16 Nov 2009 14:33:49 +0000 (15:33 +0100)]
ALSA: hda - Fix beep_mode option value

The beep_mode option value was wrongly defined: it must be 0 = off and
1 = on.

Also, evaluate the beep_mode value at snd_hda_attach_beep_device()
properly so that no device is created when beep_mode=0 is given.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 16 Nov 2009 13:58:53 +0000 (14:58 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Update / add kerneldoc comments to exported functions
Takashi Iwai [Mon, 16 Nov 2009 13:58:17 +0000 (14:58 +0100)]
ALSA: hda - Update / add kerneldoc comments to exported functions

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 16 Nov 2009 13:14:37 +0000 (14:14 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - move snd_hda_pcm_type_name from hda_codec.h to hda_local.h
Jaroslav Kysela [Wed, 11 Nov 2009 12:49:07 +0000 (13:49 +0100)]
ALSA: hda - move snd_hda_pcm_type_name from hda_codec.h to hda_local.h

The snd_hda_pcm_type_name array is local only.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-linus
Takashi Iwai [Mon, 16 Nov 2009 11:20:02 +0000 (12:20 +0100)]
Merge branch 'fix/hda' into for-linus

14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Mon, 16 Nov 2009 11:05:16 +0000 (12:05 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Add description of beep_mode in ALSA-Configuration.txt
Takashi Iwai [Mon, 16 Nov 2009 11:03:49 +0000 (12:03 +0100)]
ALSA: hda - Add description of beep_mode in ALSA-Configuration.txt

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - Get rid of magic digits for subdev hack
Takashi Iwai [Mon, 16 Nov 2009 10:25:33 +0000 (11:25 +0100)]
ALSA: hda - Get rid of magic digits for subdev hack

Define a proper const for a magic 31bit flag for subdev / NID setup
with a brief comment.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - proc - add support for dynamic controls to mixer<->NID mapping
Jaroslav Kysela [Thu, 12 Nov 2009 09:15:48 +0000 (10:15 +0100)]
ALSA: hda - proc - add support for dynamic controls to mixer<->NID mapping

This patch adds support for dynamically created controls to proc codec file
(Control: lines).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - proc - introduce Control: lines to show mixer<->NID assignment
Jaroslav Kysela [Wed, 11 Nov 2009 12:43:01 +0000 (13:43 +0100)]
ALSA: hda - proc - introduce Control: lines to show mixer<->NID assignment

This is an initial patch to show universal control<->NID assigment in
proc codec file. The change helps to debug codec related problems.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda - add beep_mode module parameter
Jaroslav Kysela [Fri, 13 Nov 2009 17:41:52 +0000 (18:41 +0100)]
ALSA: hda - add beep_mode module parameter

The beep_mode parameter for snd-hda-intel module allows to choose among
different digital beep device registation to the input layer.

0 = do not register to the input layer
1 = register to the input layer all time
2 = use "Beep Switch" control exported to user space mixer applications

Also, introduce CONFIG_SND_HDA_INPUT_BEEP_MODE for default value.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda: beep - add missing cancel_delayed_work
Jaroslav Kysela [Wed, 4 Nov 2009 11:46:49 +0000 (12:46 +0100)]
ALSA: hda: beep - add missing cancel_delayed_work

The unregister work should be also canceled in snd_hda_detach_beep_device()
function.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda_intel: Digital PC Beep - delay input device unregistration
Jaroslav Kysela [Tue, 3 Nov 2009 13:29:50 +0000 (14:29 +0100)]
ALSA: hda_intel: Digital PC Beep - delay input device unregistration

The massive register/unregister calls for input device layer might be
overkill. Delay unregister call by one HZ as workaround.

Also, as benefit, beep->enabled variable is changed immediately now
(not from workqueue).

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: hda_intel: Digital PC Beep - change behaviour for input layer
Jaroslav Kysela [Wed, 21 Oct 2009 12:48:23 +0000 (14:48 +0200)]
ALSA: hda_intel: Digital PC Beep - change behaviour for input layer

Original implementation was keeping registered input device for SND_BEEP
and SND_TONE events all time. This patch changes this behaviour:
If digital PC Beep is turned off using universal control switch,
the input device is unregistered.

Explanation: The kd_mksound() send SND_BEEP and SND_TONE only to last
registered device acceping those events. It means that the HDA Intel
audio driver blocks also the internal PC Speaker device (pcspkr.c
driver) even if the HDA Beep is muted. The user can easy disable
all beeps using 'setterm -blength 0' or 'xset b off' command.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/beep-rename' into topic/hda
Takashi Iwai [Mon, 16 Nov 2009 10:33:41 +0000 (11:33 +0100)]
Merge branch 'topic/beep-rename' into topic/hda

14 years agoMerge branch 'fix/hda' into topic/hda
Takashi Iwai [Mon, 16 Nov 2009 10:33:35 +0000 (11:33 +0100)]
Merge branch 'fix/hda' into topic/hda

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Mon, 16 Nov 2009 09:13:50 +0000 (10:13 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoALSA: ice1724 - make some bitfields unsigned
Dan Carpenter [Mon, 16 Nov 2009 09:07:17 +0000 (11:07 +0200)]
ALSA: ice1724 - make some bitfields unsigned

This is a clean up and doesn't change the behavior.

Bit fields should always be unsigned.  Otherwise pm_suspend_enabled will
be -1 when you want it to be 1.  The other bad thing is that the sparse
checker will complain 36 times if they aren't unsigned.

The other bitfields in that struct are unsigned already.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Sun, 15 Nov 2009 10:10:29 +0000 (11:10 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Dell Studio 1557 hd-audio quirk
Daniel J Blueman [Sat, 14 Nov 2009 18:20:04 +0000 (18:20 +0000)]
ALSA: hda - Dell Studio 1557 hd-audio quirk

Add the Dell Studio 15 (model 1557, Core i7) laptop to the hd-audio
quirk list, enabling audio.

Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Sat, 14 Nov 2009 13:38:57 +0000 (14:38 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoMerge branch 'fix/misc' into for-next
Takashi Iwai [Sat, 14 Nov 2009 13:38:52 +0000 (14:38 +0100)]
Merge branch 'fix/misc' into for-next

14 years agoMerge branch 'fix/misc' into topic/misc
Takashi Iwai [Sat, 14 Nov 2009 13:38:28 +0000 (14:38 +0100)]
Merge branch 'fix/misc' into topic/misc

14 years agoALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume()
Takashi Iwai [Sat, 14 Nov 2009 13:37:19 +0000 (14:37 +0100)]
ALSA: ice1724 - Fix section mismatch in prodigy_hd2_resume()

Remove invlid __devinit prefix from the suspend callback.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoALSA: ice1724 - Patch for suspend/resume for ESI Juli@
Aleksey Kunitskiy [Sat, 14 Nov 2009 13:18:54 +0000 (15:18 +0200)]
ALSA: ice1724 - Patch for suspend/resume for ESI Juli@

Add proper suspend/resume code for Juli@ cards. Based on ice1724
suspend/resume work of Igor Chernyshev.
Fixes bug https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4413
Tested on linux-2.6.31.6

Signed-off-by: Aleksey Kunitskiy <alexey.kv@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Sat, 14 Nov 2009 08:53:50 +0000 (09:53 +0100)]
Merge branch 'topic/hda' into for-next

14 years agosound/pci/hda/patch_via.c: work around gcc-4.0.2 ICE
akpm@linux-foundation.org [Sat, 14 Nov 2009 00:47:10 +0000 (16:47 -0800)]
sound/pci/hda/patch_via.c: work around gcc-4.0.2 ICE

sound/pci/hda/patch_via.c: In function 'via_hp_bind_automute':
sound/pci/hda/patch_via.c:2074: internal compiler error: in do_SUBST, at combine.c:462
Please submit a full bug report,
with preprocessed source if appropriate.
See <URL:http://gcc.gnu.org/bugs.html> for instructions.

[added a comment by tiwai]

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Fri, 13 Nov 2009 07:36:20 +0000 (08:36 +0100)]
Merge branch 'topic/misc' into for-next

14 years agoALSA: ice1712: Use bitrev8
Akinobu Mita [Fri, 13 Nov 2009 07:02:56 +0000 (16:02 +0900)]
ALSA: ice1712: Use bitrev8

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Fri, 13 Nov 2009 07:29:48 +0000 (08:29 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda - Add another Nvidia HDMI codec id (10de:0005)
Takashi Iwai [Fri, 13 Nov 2009 07:28:03 +0000 (08:28 +0100)]
ALSA: hda - Add another Nvidia HDMI codec id (10de:0005)

Found on Nvidia 9800M GTS.

Reported-by: Chris Balcum <sherl0k@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoASoC: Remove redundant snd_soc_dapm_new_widgets() calls
Mark Brown [Thu, 12 Nov 2009 23:15:08 +0000 (23:15 +0000)]
ASoC: Remove redundant snd_soc_dapm_new_widgets() calls

The DAPM widgets are now insntantiated by the core when creating the card
so there is no need for the individual CODEC drivers to do so.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoMerge branch 'topic/misc' into for-next
Takashi Iwai [Thu, 12 Nov 2009 20:10:03 +0000 (21:10 +0100)]
Merge branch 'topic/misc' into for-next

14 years agosound: OSS: fix error return in dma_ioctl()
Roel Kluin [Thu, 12 Nov 2009 16:43:11 +0000 (17:43 +0100)]
sound: OSS: fix error return in dma_ioctl()

The returned error should stay negative

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Thu, 12 Nov 2009 17:01:58 +0000 (18:01 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoASoC: Add jack_status_check callback function for GPIO jacks
Joonyoung Shim [Thu, 12 Nov 2009 08:14:04 +0000 (17:14 +0900)]
ASoC: Add jack_status_check callback function for GPIO jacks

The jack_status_check callback function is the interface to check the
status of the jack. Some target provides the method to distinguish what
is the jack inserted - headphone jack, microphone jack, tvout jack, etc,
so we can implement it using the jack_status_check function.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: move setting ac97 platformdata earlier than ac97 read/write
Barry Song [Thu, 12 Nov 2009 04:01:47 +0000 (12:01 +0800)]
ASoC: move setting ac97 platformdata earlier than ac97 read/write

While probing, AC97 codec drivers and soc-core generically execute the
following sequence:
snd_soc_new_ac97_codec -> snd_soc_new_pcms -> reset ac-link/read AC97 ID
to detect ->...  -> set platform_data to ac97 by soc-core

commit 474828a40f6ddab6e2a3475a19c5c84aa3ec7d60 adds platform_data to
snd_ac97 instance. But ac97 platform data hasn't given to snd_ac97
before actual ac97 operations. Then while ac97_read access platform_data
of snd_ac97 for detecting, NULL pointer oops will fire. That means old
platform_data patch doesn't work in real-life cases.

This patch moves the operation of setting ac97 platform_data earlier
than ac97 reading/writing operations. Then it makes platform_data of
AC97 become practically useful.

Signed-off-by: Barry Song <21cnbao@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Fixed arguments passed to SMDK64xx set_pll
Jassi Brar [Wed, 11 Nov 2009 05:02:18 +0000 (14:02 +0900)]
ASoC: Fixed arguments passed to SMDK64xx set_pll

Corrected the order of 'source' and 'pll_id' arguments.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
14 years agoASoC: Add bit clock rate calculator utility functions
Mark Brown [Tue, 10 Nov 2009 16:08:04 +0000 (16:08 +0000)]
ASoC: Add bit clock rate calculator utility functions

Many devices need to calculate the bit clock rate desired to
work out the clock configuration required for the device.
Provide utility functions to do this using both hw_params
structures and raw numbers.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 12 Nov 2009 09:03:08 +0000 (10:03 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Fix build error without CONFIG_SND_HDA_HWDEP=y
Takashi Iwai [Thu, 12 Nov 2009 09:01:18 +0000 (10:01 +0100)]
ALSA: hda - Fix build error without CONFIG_SND_HDA_HWDEP=y

CONFIG_SND_HDA_POWER_SAVE is independent from CONFIG_SND_HDA_HWDEP.
Thus snd_hda_hwdep_add_power_sysfs() needs the check of both kconfigs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 12 Nov 2009 08:56:51 +0000 (09:56 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoALSA: hda - Don't access invalid substream in proc file
Takashi Iwai [Thu, 12 Nov 2009 08:50:28 +0000 (09:50 +0100)]
ALSA: hda - Don't access invalid substream in proc file

The commit e3303235209c0496b490e10ab131e72a9568c153
"ALSA: hda - proc - show which I/O NID is associated to PCM device"
introduces the access to substream pointer.  But, PCMs may have no
substreams in one or both directions, and this results in NULL
dereference.  Also, print the first substream number doesn't make
sense.

This patch removes the access to the substream pointer, and reformat
to fit to the standard coding style.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/hda' into for-next
Takashi Iwai [Thu, 12 Nov 2009 06:40:30 +0000 (07:40 +0100)]
Merge branch 'topic/hda' into for-next

14 years agoMerge branch 'fix/hda' into for-next
Takashi Iwai [Thu, 12 Nov 2009 06:40:26 +0000 (07:40 +0100)]
Merge branch 'fix/hda' into for-next

14 years agoALSA: hda: Use model=mb5 for MacBookPro 5,2
Daniel T Chen [Wed, 11 Nov 2009 19:32:10 +0000 (14:32 -0500)]
ALSA: hda: Use model=mb5 for MacBookPro 5,2

BugLink: https://bugs.launchpad.net/bugs/462098
Until we can look closer at the verbs, let's use ALC885_MB5 for
codec SSID 0x106b4600 to enable playback and capture for MacBookPro
5,2s.

Signed-off-by: Daniel T Chen <crimsun@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
14 years agoMerge branch 'topic/asoc' into for-next
Takashi Iwai [Wed, 11 Nov 2009 10:19:53 +0000 (11:19 +0100)]
Merge branch 'topic/asoc' into for-next

14 years agoALSA: hda - Add power on/off counter
Takashi Iwai [Wed, 11 Nov 2009 08:34:25 +0000 (09:34 +0100)]
ALSA: hda - Add power on/off counter

Added the power on/off counter and expose via sysfs files.
The sysfs files, power_on_acct and power_off_acct, are created under
each codec hwdep sysfs directory (e.g. /sys/class/sound/hwC0D0).
The files show the msec length of the codec power-on and power-off,
respectively.

Signed-off-by: Takashi Iwai <tiwai@suse.de>