December 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] ASoC: SAMSUNG: Fix initial return value
by Seungwhan Youn 06 Dec '10

06 Dec '10

This patch fixed intial return value to be a '0' as asuccess on set_audio_clock_heirachy(). This avoids unintended error on initialize. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- sound/soc/samsung/smdk_spdif.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c index ca779ad..56d058d 100644 --- a/sound/soc/samsung/smdk_spdif.c +++ b/sound/soc/samsung/smdk_spdif.c @@ -28,7 +28,7 @@ static int set_audio_clock_heirachy(struct platform_device *pdev) { struct clk *fout_epll, *mout_epll, *sclk_audio0, *sclk_spdif; - int ret; + int ret = 0; fout_epll = clk_get(NULL, "fout_epll"); if (IS_ERR(fout_epll)) { -- 1.6.2.5

4 3

[alsa-devel] [PATCH 1/2] ASoC: Fix off by one error in WM8994 EQ register bank size
by Mark Brown 06 Dec '10

06 Dec '10

From: Uk Kim <w0806.kim(a)samsung.com> Signed-off-by: Uk Kim <w0806.kim(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/linux/mfd/wm8994/pdata.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index 5c51f36..add8a1b 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -29,7 +29,7 @@ struct wm8994_ldo_pdata { #define WM8994_CONFIGURE_GPIO 0x8000 #define WM8994_DRC_REGS 5 -#define WM8994_EQ_REGS 19 +#define WM8994_EQ_REGS 20 /** * DRC configurations are specified with a label and a set of register -- 1.7.2.3

2 2

[alsa-devel] [PATCH] ASoC: Add trace events for jack detection
by Mark Brown 06 Dec '10

06 Dec '10

As jack detection can trigger DAPM and the latency in debouncing can create confusing windows in operation provide some trace events which will hopefully help in diagnostics. The soc-jack core traces all reports that it gets and the resulting notifications to upper layers. An event for jack IRQs is also provided for instrumentation of debounce, and used in the GPIO jack code. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/trace/events/asoc.h | 58 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/soc-jack.c | 7 +++++ 2 files changed, 65 insertions(+), 0 deletions(-) diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index 9978856..4a7ab26 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h @@ -170,6 +170,64 @@ DEFINE_EVENT(snd_soc_dapm_widget, snd_soc_dapm_widget_event_done, ); +TRACE_EVENT(snd_soc_jack_irq, + + TP_PROTO(const char *name), + + TP_ARGS(name), + + TP_STRUCT__entry( + __string( name, name ) + ), + + TP_fast_assign( + __assign_str(name, w->name); + ), + + TP_printk("%s", __get_str(name)) +); + +TRACE_EVENT(snd_soc_jack_report, + + TP_PROTO(struct snd_soc_jack *jack, int mask, int val), + + TP_ARGS(jack, mask, val), + + TP_STRUCT__entry( + __string( name, jack->jack->name ) + __field( int, mask ) + __field( int, val ) + ), + + TP_fast_assign( + __assign_str(name, jack->jack->name); + __entry->mask = mask; + __entry->val = val; + ), + + TP_printk("jack=%s %x/%x", __get_str(name), (int)__entry->val, + (int)__entry->mask) +); + +TRACE_EVENT(snd_soc_jack_notify, + + TP_PROTO(struct snd_soc_jack *jack, int val), + + TP_ARGS(jack, val), + + TP_STRUCT__entry( + __string( name, jack->jack->name ) + __field( int, val ) + ), + + TP_fast_assign( + __assign_str(name, jack->jack->name); + __entry->val = val; + ), + + TP_printk("jack=%s %x", __get_str(name), (int)__entry->val) +); + #endif /* _TRACE_ASOC_H */ /* This part must be outside protection */ diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 0e9b071..ac5a5bc 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -17,6 +17,7 @@ #include <linux/interrupt.h> #include <linux/workqueue.h> #include <linux/delay.h> +#include <trace/events/asoc.h> /** * snd_soc_jack_new - Create a new jack @@ -64,6 +65,8 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) int enable; int oldstatus; + trace_snd_soc_jack_report(jack, mask, status); + if (!jack) return; @@ -82,6 +85,8 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) if (mask && (jack->status == oldstatus)) goto out; + trace_snd_soc_jack_notify(jack, status); + list_for_each_entry(pin, &jack->pins, list) { enable = pin->mask & jack->status; @@ -210,6 +215,8 @@ static irqreturn_t gpio_handler(int irq, void *data) struct snd_soc_jack_gpio *gpio = data; struct device *dev = gpio->jack->codec->card->dev; + trace_snd_soc_jack_irq(gpio->name); + if (device_may_wakeup(dev)) pm_wakeup_event(dev, gpio->debounce_time + 50); -- 1.7.2.3

2 1

[alsa-devel] [PATCH] ASoC: Add post-CODEC bias level callback for machine driver
by Mark Brown 06 Dec '10

06 Dec '10

Currently the machine driver can only do bias level configuration before the CODEC bias level is brought up. This means that the machine cannot do any configuration which depends on the CODEC bias level being maintained. Provide a post-CODEC callback which allows the machine driver to do things like enable the FLL on a CODEC which is brought down to BIAS_OFF when idle. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/soc.h | 2 ++ sound/soc/soc-dapm.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 0eea08e..4abc2f8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -632,6 +632,8 @@ struct snd_soc_card { /* callbacks */ int (*set_bias_level)(struct snd_soc_card *, enum snd_soc_bias_level level); + int (*set_bias_level_post)(struct snd_soc_card *, + enum snd_soc_bias_level level); long pmdown_time; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 6a29d59..9af2d8a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -162,6 +162,10 @@ static int snd_soc_dapm_set_bias_level(struct snd_soc_card *card, else dapm->bias_level = level; } + if (ret == 0) { + if (card && card->set_bias_level_post) + ret = card->set_bias_level_post(card, level); + } trace_snd_soc_bias_level_done(card, level); -- 1.7.2.3

2 1

[alsa-devel] [PATCH] ALSA: hda: Use position_fix=1 for Acer Aspire 5538 to enable capture on internal mic
by Daniel Chen 06 Dec '10

06 Dec '10

Hi, Attached is a patch against sound-2.6 master HEAD (c2e685d3) enabling internal microphone capture on the reporter's Acer Aspire 5538. Please apply. Thanks, -Dan

2 1

[alsa-devel] [PATCH 2/2] ASoC: SAMSUNG: Remove duplicated snd_card on smdk_spdif
by Seungwhan Youn 06 Dec '10

06 Dec '10

This patch remove duplicated snd_card defination on smdk_spdif. Signed-off-by: Seungwhan Youn <sw.youn(a)samsung.com> --- sound/soc/samsung/smdk_spdif.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/smdk_spdif.c b/sound/soc/samsung/smdk_spdif.c index 56d058d..cb2f4d0 100644 --- a/sound/soc/samsung/smdk_spdif.c +++ b/sound/soc/samsung/smdk_spdif.c @@ -152,8 +152,6 @@ static struct snd_soc_ops smdk_spdif_ops = { .hw_params = smdk_hw_params, }; -static struct snd_soc_card smdk; - static struct snd_soc_dai_link smdk_dai = { .name = "S/PDIF", .stream_name = "S/PDIF PCM Playback", -- 1.6.2.5

2 1

[alsa-devel] [PATCH] ALSA: hda - use generic hdmi parser for ATI R6xx codec
by Anssi Hannula 05 Dec '10

05 Dec '10

Switch to the generic hdmi parser for codec id 1002:aa01 (ATI R6xx HDMI), as the codec appears to work fine with it. Note that the codec is still limited to stereo output only, despite it reportedly being multichannel capable. Some as of yet unknown quirks will be needed to get that working. Testing was done on 2.6.36 by John Ettedgui. Signed-off-by: Anssi Hannula <anssi.hannula(a)iki.fi> Tested-by: John Ettedgui <john.ettedgui(a)gmail.com> --- As per the "ALSA Multichannel through HDMI" thread, the generic parser seems to work for this. So here's a patch against sound master. sound/pci/hda/patch_hdmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index d3e49aa..f2267cf 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1533,7 +1533,7 @@ static struct hda_codec_preset snd_hda_preset_hdmi[] = { { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi }, { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi }, { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi }, -{ .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi }, +{ .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_generic_hdmi }, { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_generic_hdmi }, { .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_generic_hdmi }, { .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_generic_hdmi }, -- 1.7.3

2 1

Re: [alsa-devel] poor sound from ALC 850/880 in alsa 1.0.21 and 1.0.23
by Colin Kincaid Williams 05 Dec '10

05 Dec '10

On Fri, Nov 26, 2010 at 8:35 PM, Daniel Chen <seven.steps(a)gmail.com> wrote: > Please use http://www.alsa-project.org/alsa-info.sh >

2 9

Re: [alsa-devel] Building alsa-driver-1.0.23 for sis7012
by JD 04 Dec '10

04 Dec '10

On 12/03/2010 10:32 PM, Daniel Chen wrote: > > No, it's probably because the capture and/or mic mixer levels are > muted. Please see https://wiki.ubuntu.com/Audio/AlsaInfo. > I checked. Nothing is muted. This is a big bummer for me because I cannot use Skype. I uploaded the output of the shell script your refered me to. The output is at http://www.alsa-project.org/db/?f=f4e4e92704c233d60d6b3fe9704b9ee4ea9e9f8f

2 2

[alsa-devel] ASoC updates for 2.6.38
by Mark Brown 04 Dec '10

04 Dec '10

The following changes since commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0: Merge branch 'for-2.6.37' into for-2.6.38 (2010-11-29 18:33:47 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.38 Axel Lin (4): ASoC: Fix missing spin_unlock_irqrestore ASoC: Simplify pm860x_probe error handling ASoC: ak4535: Improve readability for setting mute ASoC: Fix inconsistent meaning of default case while checking alc5623->id Daniel Glöckner (3): s6000-i2s: fix compilation s6000-pcm: fix compilation s6105-ipcam: fix compilation Dimitris Papastamos (7): ASoC: soc-cache: Fix memory overflow in LZO initialization ASoC: WM8731: Fix incorrect mask for bypass path disable ASoC: Add compress_type as a member to snd_soc_codec ASoC: Change the base value of compress_type ASoC: soc-core: Generalize snd_soc_prefix_map and rename to snd_soc_codec_conf ASoC: soc-cache: Use reg_def_copy instead of reg_cache_default ASoC: soc-core: Allow machine drivers to override compress_type Jarkko Nikula (4): ASoC: Add support for optional auxiliary dailess codecs ASoC: Fix build failure in soc-core.c ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependency ASoC: Don't oops in soc_probe_aux_dev in case of missing codec Jassi Brar (1): ASoC: WM8580: Debug interface index Kuninori Morimoto (8): ASoC: sh: fsi-ak4642: Add FSI port and ak464x selection ASoC: sh: fsi-ak4642: tidyup unnecessary variables ASoC: sh: fsi-ak4642: midify card name ASoC: sh: fsi: clean up SPDIF defines ASoC: sh: fsi: remove fsi_master_write ASoC: sh: fsi: change fsi->mst_ctrl to master->a/b_mclk ASoC: sh: fsi: remove runtime register check from fsi_reg_xxx ASoC: sh: fsi: remove runtime register check from fsi_master_xxx Mark Brown (14): Merge branch 'for-2.6.37' into for-2.6.38 Merge branch 'for-2.6.37' into for-2.6.38 ASoC: Correct event flags for WM8958 AIF DACs ASoC: Allow user-specified WM8958 multiband compressor configurations ASoC: Provide WM8731 microphone boost TLV information ASoC: Split WM8731 enumeration array into individual enums ASoC: Automatically manage WM8731 deemphasis ASoC: Tune performance of WM8958 revision A ASoC: Apostrophe patrol in soc-core.c ASoC: Make the DAI ops constant in the DAI structure ASoC: Move active copy of CODEC read and write into runtime structure ASoC: Constify struct snd_soc_codec_driver ASoC: When disabling WM8994 FLL force a source selection Merge branch 'for-2.6.37' into for-2.6.38 Takashi Iwai (1): Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into fix/asoc arch/arm/mach-shmobile/board-ap4evb.c | 5 + arch/sh/boards/mach-se/7724/setup.c | 5 + include/linux/mfd/wm8994/pdata.h | 17 ++ include/linux/mfd/wm8994/registers.h | 77 +++++++++ include/sound/soc-dai.h | 2 +- include/sound/soc.h | 46 +++++- sound/soc/codecs/88pm860x-codec.c | 12 +- sound/soc/codecs/ak4535.c | 10 +- sound/soc/codecs/alc5623.c | 10 +- sound/soc/codecs/wm8580.c | 8 +- sound/soc/codecs/wm8731.c | 88 ++++++++++- sound/soc/codecs/wm8994.c | 129 ++++++++++++++-- sound/soc/nuc900/nuc900-pcm.c | 9 +- sound/soc/omap/Kconfig | 2 +- sound/soc/s6000/s6000-i2s.c | 2 +- sound/soc/s6000/s6000-pcm.c | 2 +- sound/soc/s6000/s6105-ipcam.c | 2 +- sound/soc/sh/fsi-ak4642.c | 140 +++++++++++++++-- sound/soc/sh/fsi.c | 207 +++++++++++-------------- sound/soc/soc-cache.c | 58 ++++--- sound/soc/soc-core.c | 275 +++++++++++++++++++++++++++++--- 21 files changed, 867 insertions(+), 239 deletions(-)

2 1