August 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] ASoC updates for 3.6
by Mark Brown 20 Aug '12

20 Aug '12

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.6 for you to fetch changes up to 28c42c28309244d0b15d1b385e33429d59997679: ASoC: wm9712: Fix inverted capture volume (2012-08-17 22:43:18 +0100) ---------------------------------------------------------------- ASoC: Additional updates for 3.6 A batch more bugfixes, all driver-specific and fairly small and unremarkable in a global context. The biggest batch are for the newly added Arizona drivers. ---------------------------------------------------------------- Chris Rattray (1): ASoC: wm8994: Add missing dapm routes for WM8958 rev A Fabio Estevam (2): ASoC: mxs: Fix the name of the SoC family ASoC: imx-ssi: Remove mono support Mark Brown (10): Merge tag 'asoc-3.6' of git://git.kernel.org/.../broonie/sound into for-3.6 ASoC: wm8962: Don't duplicate bias level management in resume ASoC: core: Upgrade the severity of probe deferral errors to dev_err() MAINTAINERS: Add entries for Wolfson Arizona class devices ASoC: wm5102: Add missing input PGA routes ASoC: wm5110: Add missing input PGA routes ASoC: jack: Always notify full jack status ASoC: wm5102: Remove DRC2 ASoC: wm9712: Fix microphone source selection ASoC: wm9712: Fix inverted capture volume Peter Ujfalusi (1): ASoC: omap-mcbsp: Fix 6pin mux configuration Sachin Kamat (1): ASoC: Samsung: Fix build error Scott Jiang (1): ASoC: bfin: fix memory leak in sport3 controller driver Vaibhav Bedia (1): ASoC: Davinci: McASP: Flush the FIFO before enabling MAINTAINERS | 7 ++++++- sound/soc/blackfin/bf6xx-sport.c | 7 +++++++ sound/soc/codecs/ab8500-codec.c | 4 ++++ sound/soc/codecs/ad1980.c | 1 + sound/soc/codecs/mc13783.c | 2 ++ sound/soc/codecs/sgtl5000.c | 3 +-- sound/soc/codecs/stac9766.c | 1 + sound/soc/codecs/wm5102.c | 25 +++++++++---------------- sound/soc/codecs/wm5110.c | 12 ++++++++++++ sound/soc/codecs/wm8962.c | 18 +++--------------- sound/soc/codecs/wm8994.c | 17 ++++++++++++++++- sound/soc/codecs/wm9712.c | 22 +++++++++++++++++++--- sound/soc/codecs/wm9713.c | 1 + sound/soc/davinci/davinci-mcasp.c | 10 ++++++++-- sound/soc/fsl/imx-ssi.c | 5 +++-- sound/soc/mxs/Kconfig | 2 +- sound/soc/mxs/mxs-saif.c | 24 ++++++++++++++++++++++++ sound/soc/omap/mcbsp.c | 2 +- sound/soc/omap/omap-mcbsp.c | 1 + sound/soc/omap/omap-pcm.c | 1 + sound/soc/samsung/pcm.c | 2 +- sound/soc/soc-core.c | 12 +++++++----- sound/soc/soc-jack.c | 2 +- sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 10 +++++----- sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_msp_i2s.c | 2 +- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 28 files changed, 139 insertions(+), 60 deletions(-)

2 1

[alsa-devel] [PATCH 0/3] ASoC: add compress stream support
by Vinod Koul 20 Aug '12

20 Aug '12

Here is the much delayed support for compress audio streams in ASoC. The v2 incorprates feedback discussed on v1 patches and this also adds the support in Intel drivers. Namarta Kohli (1): ASoC: add compress stream support Vinod Koul (2): ASoC: add definations for compressed operations ASoC: mid-x86 - add support for compressed streams include/sound/compress_driver.h | 1 + include/sound/soc-dai.h | 3 + include/sound/soc.h | 16 ++- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/mid-x86/mfld_machine.c | 9 ++ sound/soc/mid-x86/sst_dsp.h | 134 +++++++++++++++++ sound/soc/mid-x86/sst_platform.c | 204 ++++++++++++++++++++++++++- sound/soc/mid-x86/sst_platform.h | 26 ++++- sound/soc/soc-compress.c | 295 ++++++++++++++++++++++++++++++++++++++ sound/soc/soc-core.c | 57 +++++--- 11 files changed, 721 insertions(+), 27 deletions(-) create mode 100644 sound/soc/mid-x86/sst_dsp.h create mode 100644 sound/soc/soc-compress.c

2 4

[alsa-devel] [PATCH 0/10] fix error return code
by Julia Lawall 20 Aug '12

20 Aug '12

These patches fix cases where the return code appears to be unintentially nonnegative. The complete semantic match that finds the problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @ok exists@ identifier f,ret,i; expression e; constant c; @@ f(...) { <+... ( return -c@i; | ret = -c@i; ... when != ret = e return ret; | if (ret < 0) { ... return ret; } ) ...+> } @r exists@ identifier ret,l,ok.f; expression e1,e2,e3; statement S; position p1,p2,p3; @@ f(...) { ... when any ( if@p1 ($ret < 0\|ret != 0$) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret ( if (<+... ret = e3 ...+>) S | if (<+... &ret ...+>) S | if@p2(...) { ... when != ret = e2 when forall return@p3 ret; } ) ... when any } @bad exists@ position r.p1,r.p2; statement S1,S2; identifier r.ret; expression e1; @@ ( if@p1 ($ret < 0\|ret != 0$) S1 | ret@p1 = 0 ) ... when any ret = e1 ... when any if@p2(...) S2 @bad2@ position r.p1,r.p2; identifier r.ret; expression e1; statement S2; @@ ret@p1 = 0 ... when != if (...) { ... ret = e1 ... return ret; } when any if@p2(...) S2 @script:python depends on !bad && !bad2@ p1 << r.p1; p2 << r.p2; p3 << r.p3; @@ cocci.print_main("",p1) cocci.print_secs("",p2) cocci.print_secs("",p3) // </smpl>

4 13

Re: [alsa-devel] [sound:master 88/92] sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count'
by Takashi Iwai 20 Aug '12

20 Aug '12

At Mon, 20 Aug 2012 23:51:31 +0800, Fengguang Wu wrote: > > Hi Takashi, > > FYI, kernel build failed on > > tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git master > head: b9687805cf4e70e08221856b1bbadfa5e37c3342 > commit: b244d335609f9bbf4c0204a365bf03b7ac53c3c8 [88/92] ALSA: hda - Add tracepoints at snd_hda_power_up/down entrances. > config: i386-randconfig-k767 (attached as .config) > > All related error/warning messages: > > make[4]: *** [sound/pci/hda/hda_codec.o] Error 1 > make[4]: Target `__build' not remade because of errors. > -- > In file included from include/trace/ftrace.h:567:0, > from include/trace/define_trace.h:86, > from sound/pci/hda/hda_trace.h:141, > from sound/pci/hda/hda_codec.c:41: > sound/pci/hda/./hda_trace.h: In function 'ftrace_raw_event_hda_power_count': > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_on' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_transition' > In file included from include/trace/ftrace.h:775:0, > from include/trace/define_trace.h:86, > from sound/pci/hda/hda_trace.h:141, > from sound/pci/hda/hda_codec.c:41: > sound/pci/hda/./hda_trace.h: In function 'perf_trace_hda_power_count': > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_on' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_transition' > > vim +90 sound/pci/hda/./hda_trace.h > 87 TP_ARGS(codec) > 88 ); > 89 > > 90 TRACE_EVENT(hda_power_count, > 91 TP_PROTO(struct hda_codec *codec), > 92 TP_ARGS(codec), > 93 TP_STRUCT__entry( Thanks, looks like the missing ifdef. Fixed now. Takashi

1 0

[alsa-devel] Lockups reading from i.MX51 SSI registers
by Mark Brown 20 Aug '12

20 Aug '12

Hi, I'm trying to use -next to test AC'97 register I/O on an i.MX51 board but I'm seeing the CPU hang during probe at: lreg = (reg & 0x7f) << 12 ; writel(lreg, base + SSI_SACADD); in imx_ssi_ac97_read(). I'm somewhat suspicious this might be because the IP block isn't clocked properly, I do notice the recent conversion to the clock API which looks rather involved but it's possible something else broke. Does anyone have any bright ideas what might be going on here? The board doesn't have the reste functions defined so this is the first interaction with the hardware block AFAICT. Thanks, Mark

5 11

[alsa-devel] [alsa-plugins PATCH] pulse: Support 24-bit formats
by Andrew Eikum 20 Aug '12

20 Aug '12

These formats were introduced in PulseAudio 0.9.15. There aren't any new formats supported since then, so this also brings the PulseAudio plugin in sync with current PulseAudio. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- There was a problem once before with a patch I submitted. This is using format-patch and imap-send, so hopefully it goes through better than it did before :) pulse/pcm_pulse.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

2 4

[alsa-devel] [PATCH 0/2] Two fixes for ca0132
by David Henningsson 20 Aug '12

20 Aug '12

I came across the following codec: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1038651/+attachment/32… ...and the codec wouldn't load due to mixer errors. I don't know more about the codec than the codec proc shows, and looking at that file it seems a bit broken, but maybe Ian would be able to make it work, with the help of some secret verbs? At least now the codec would load correctly, so that the output side could be used. David Henningsson (2): ALSA: hda - Fix "Line" and "Mic" names for CA0132 ALSA: hda - don't create dysfunctional mixer controls for ca0132 sound/pci/hda/patch_ca0132.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 1.7.9.5

2 6

[alsa-devel] Broken powersave in 3.5.2, codec is always active
by ValdikSS 20 Aug '12

20 Aug '12

Hello! I have a Lenovo ThinkPad X220 laptop with a conexant codec and recently (after kernel 3.5.2) it is active all the time after KDE login, as powertop says. This couldn't be fixed by logging of from KDE or playing some music in mplayer from console. The only kernel I tried in 3.5.x is 3.5.2, so I can't say is this bug reproducible in 3.5.0 or 3.5.1, but everything is fine with 3.4.9. This never happens if you don't start KDE after reboot, you can listen to some music in mplayer in console and everything seems to be fine. lsof and fuser /dev/snd/* shows nothing. Thank you! $ cat /etc/modprobe.d/options.conf options snd-hda-intel power_save=1 power_save_controller=1 $ lspci -nn | grep Audio 00:1b.0 Audio device [0403]: Intel Corporation 6 Series/C200 Series Chipset Family High Definition Audio Controller [8086:1c20] (rev 04) $ lsmod | grep snd snd_hda_codec_hdmi 23704 1 snd_hda_codec_conexant 47158 1 snd_hda_intel 25700 2 snd_hda_codec 97400 3 snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_hda_intel snd_hwdep 6300 1 snd_hda_codec snd_pcm 74926 3 snd_hda_codec_hdmi,snd_hda_codec,snd_hda_intel snd_page_alloc 7185 2 snd_pcm,snd_hda_intel snd_timer 18966 1 snd_pcm snd 60021 12 snd_hwdep,snd_timer,snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_pcm,snd_hda_codec,snd_hda_intel,thinkpad_acpi soundcore 5442 1 snd

2 1

[alsa-devel] [PATCH 1/2] snd-ad1816a: remove useless struct snd_card_ad1816a
by Ondrej Zary 20 Aug '12

20 Aug '12

struct snd_card_ad1816a is only set but the values are never used then. Removing it allows struct snd_card's private_data to be used for struct snd_ad1816a, simplifying the code. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h index d010858..62da41e 100644 --- a/include/sound/ad1816a.h +++ b/include/sound/ad1816a.h @@ -165,7 +165,7 @@ struct snd_ad1816a { extern int snd_ad1816a_create(struct snd_card *card, unsigned long port, int irq, int dma1, int dma2, - struct snd_ad1816a **chip); + struct snd_ad1816a *chip); extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm); extern int snd_ad1816a_mixer(struct snd_ad1816a *chip); diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c index 94b83b6..1a374e6 100644 --- a/sound/isa/ad1816a/ad1816a.c +++ b/sound/isa/ad1816a/ad1816a.c @@ -63,11 +63,6 @@ MODULE_PARM_DESC(enable, "Enable ad1816a based soundcard."); module_param_array(clockfreq, int, NULL, 0444); MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0)."); -struct snd_card_ad1816a { - struct pnp_dev *dev; - struct pnp_dev *devmpu; -}; - static struct pnp_card_device_id snd_ad1816a_pnpids[] = { /* Analog Devices AD1815 */ { .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } }, @@ -99,25 +94,16 @@ MODULE_DEVICE_TABLE(pnp_card, snd_ad1816a_pnpids); #define DRIVER_NAME "snd-card-ad1816a" -static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acard, - struct pnp_card_link *card, +static int __devinit snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card, const struct pnp_card_device_id *id) { struct pnp_dev *pdev; int err; - acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL); - if (acard->dev == NULL) + pdev = pnp_request_card_device(card, id->devs[0].id, NULL); + if (pdev == NULL) return -EBUSY; - acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL); - if (acard->devmpu == NULL) { - mpu_port[dev] = -1; - snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n"); - } - - pdev = acard->dev; - err = pnp_activate_dev(pdev); if (err < 0) { printk(KERN_ERR PFX "AUDIO PnP configure failure\n"); @@ -130,16 +116,17 @@ static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acar dma2[dev] = pnp_dma(pdev, 1); irq[dev] = pnp_irq(pdev, 0); - if (acard->devmpu == NULL) + pdev = pnp_request_card_device(card, id->devs[1].id, NULL); + if (pdev == NULL) { + mpu_port[dev] = -1; + snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n"); return 0; - - pdev = acard->devmpu; + } err = pnp_activate_dev(pdev); if (err < 0) { printk(KERN_ERR PFX "MPU401 PnP configure failure\n"); mpu_port[dev] = -1; - acard->devmpu = NULL; } else { mpu_port[dev] = pnp_port_start(pdev, 0); mpu_irq[dev] = pnp_irq(pdev, 0); @@ -153,18 +140,17 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard { int error; struct snd_card *card; - struct snd_card_ad1816a *acard; struct snd_ad1816a *chip; struct snd_opl3 *opl3; struct snd_timer *timer; error = snd_card_create(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_card_ad1816a), &card); + sizeof(struct snd_ad1816a), &card); if (error < 0) return error; - acard = card->private_data; + chip = card->private_data; - if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) { + if ((error = snd_card_ad1816a_pnp(dev, pcard, pid))) { snd_card_free(card); return error; } @@ -174,7 +160,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard irq[dev], dma1[dev], dma2[dev], - &chip)) < 0) { + chip)) < 0) { snd_card_free(card); return error; } diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index 177eed3..de5cc1c 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c @@ -548,7 +548,6 @@ static int snd_ad1816a_free(struct snd_ad1816a *chip) snd_dma_disable(chip->dma2); free_dma(chip->dma2); } - kfree(chip); return 0; } @@ -573,19 +572,13 @@ static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip) int __devinit snd_ad1816a_create(struct snd_card *card, unsigned long port, int irq, int dma1, int dma2, - struct snd_ad1816a **rchip) + struct snd_ad1816a *chip) { static struct snd_device_ops ops = { .dev_free = snd_ad1816a_dev_free, }; int error; - struct snd_ad1816a *chip; - *rchip = NULL; - - chip = kzalloc(sizeof(*chip), GFP_KERNEL); - if (chip == NULL) - return -ENOMEM; chip->irq = -1; chip->dma1 = -1; chip->dma2 = -1; @@ -631,7 +624,6 @@ int __devinit snd_ad1816a_create(struct snd_card *card, return error; } - *rchip = chip; return 0; } -- Ondrej Zary

2 1

[alsa-devel] [PATCH] sound: fix pcm.h kernel-doc warning and notation
by Randy Dunlap 20 Aug '12

20 Aug '12

From: Randy Dunlap <rdunlap(a)xenotime.net> Fix kernel-doc warning in <sound/pcm.h> and add function name to make the kernel-doc notation complete. Warning(include/sound/pcm.h:1081): No description found for parameter 'substream' Signed-off-by: Randy Dunlap <rdunlap(a)xenotime.net> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org (moderated for non-subscribers) --- include/sound/pcm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- lnx-36-rc2.orig/include/sound/pcm.h +++ lnx-36-rc2/include/sound/pcm.h @@ -1075,7 +1075,8 @@ static inline void snd_pcm_limit_isa_dma const char *snd_pcm_format_name(snd_pcm_format_t format); /** - * Get a string naming the direction of a stream + * snd_pcm_stream_str - Get a string naming the direction of a stream + * @substream: the pcm substream instance */ static inline const char *snd_pcm_stream_str(struct snd_pcm_substream *substream) {

2 1