January 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [sound:for-linus 4/4] sound/oss/pas2_card.c:338:5: warning: too many arguments for format
by kbuild test robot 04 Jan '13

04 Jan '13

tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git for-linus head: b56458b36c8922d1d57c2320151194059dfb9a31 commit: b56458b36c8922d1d57c2320151194059dfb9a31 [4/4] sound: oss/pas2: Fix possible access out of array config: make ARCH=x86_64 allyesconfig All warnings: sound/oss/pas2_card.c: In function 'attach_pas_card': sound/oss/pas2_card.c:338:5: warning: too many arguments for format [-Wformat-extra-args] vim +338 sound/oss/pas2_card.c ^1da177e Linus Torvalds 2005-04-16 322 return pas_model; ^1da177e Linus Torvalds 2005-04-16 323 } ^1da177e Linus Torvalds 2005-04-16 324 ^1da177e Linus Torvalds 2005-04-16 325 static void __init attach_pas_card(struct address_info *hw_config) ^1da177e Linus Torvalds 2005-04-16 326 { ^1da177e Linus Torvalds 2005-04-16 327 pas_irq = hw_config->irq; ^1da177e Linus Torvalds 2005-04-16 328 ^1da177e Linus Torvalds 2005-04-16 329 if (detect_pas_hw(hw_config)) ^1da177e Linus Torvalds 2005-04-16 330 { ^1da177e Linus Torvalds 2005-04-16 331 ^1da177e Linus Torvalds 2005-04-16 332 if ((pas_model = pas_read(0xFF88))) ^1da177e Linus Torvalds 2005-04-16 333 { ^1da177e Linus Torvalds 2005-04-16 334 char temp[100]; ^1da177e Linus Torvalds 2005-04-16 335 b56458b3 Asim Kadav 2013-01-03 336 if (pas_model < 0 || b56458b3 Asim Kadav 2013-01-03 337 pas_model >= ARRAY_SIZE(pas_model_names)) { b56458b3 Asim Kadav 2013-01-03 @338 printk(KERN_ERR, "pas2 unrecognized model.\n"); b56458b3 Asim Kadav 2013-01-03 339 return; b56458b3 Asim Kadav 2013-01-03 340 } ^1da177e Linus Torvalds 2005-04-16 341 sprintf(temp, ^1da177e Linus Torvalds 2005-04-16 342 "%s rev %d", pas_model_names[(int) pas_model], ^1da177e Linus Torvalds 2005-04-16 343 pas_read(0x2789)); ^1da177e Linus Torvalds 2005-04-16 344 conf_printf(temp, hw_config); ^1da177e Linus Torvalds 2005-04-16 345 } ^1da177e Linus Torvalds 2005-04-16 346 if (config_pas_hw(hw_config)) --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

3 2

[alsa-devel] [Tiny6410/Mini6410] Sound support
by Alexander Nestorov 03 Jan '13

03 Jan '13

I'm working on a Tiny6410 device (S3C6410) on top of a 3.7 kernel and sound isn't working with the default settings. I also wasn't able to make it work enablig the related stuff to AC97 in menuconfig so I'm wondering if there is actually any support for this device? Looking at the code in sound/soc, there is something for the SMDK6410 but I'm not really sure if that's compatible with my device or even if that code is fully functional. Can I get some help with this, please? I'll appreciate any kind of help. Regards PS: I'm including Kukjin Kim and Sangbeom Kim as of recomendation of <broonie> from #alsa-soc at Freenode -- alexandernst

1 0

[alsa-devel] [PATCH v2] ASoC: pxa2xx-ac97: fix oops when codec_driver probe runs
by Mike Dunn 03 Jan '13

03 Jan '13

Change log: v2: pxa2xx_ac97_hw_probe() is called *before* snd_soc_register_dais(), and likewise pxa2xx_ac97_hw_remove() is called after snd_soc_unregister_dais(). Thanks much Mark. This patch fixes a kernel oops that occurs when the snd_soc_codec_driver probe function runs. The exception occurs when the codec calls soc_ac97_ops.reset(). The pxa2xx-ac97's clocks have not been initialized at this point, but the cpu's reset function (pxa_ac97_cold_pxa27x()) expects them to be, resulting in a NULL pointer dereference in the pxa's clk_enable(). The pxa2xx-ac97's clocks are initialized in pxa2xx_ac97_hw_probe(). To ensure that the clocks are initialized when the codec_driver probe runs, the calls to pxa2xx_ac97_hw_{probe,remove}() are moved from the cpu's dai_driver probe/remove functions to those of its platform_driver. This is necessary because snd_soc_instantiate_card() always calls the codec_driver probe before any of the dai_drivers' probes. This change leaves nothing in the cpu's dai_driver probe/remove functions, so those functions are eliminated. Tested on the pxa27x; palmtreo680 machine using the wm9712 codec. Signed-off-by: Mike Dunn <mikedunn(a)newsguy.com> --- sound/soc/pxa/pxa2xx-ac97.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 4b0a009..ba04f49 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -104,17 +104,6 @@ static int pxa2xx_ac97_resume(struct snd_soc_dai *dai) #define pxa2xx_ac97_resume NULL #endif -static int pxa2xx_ac97_probe(struct snd_soc_dai *dai) -{ - return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev)); -} - -static int pxa2xx_ac97_remove(struct snd_soc_dai *dai) -{ - pxa2xx_ac97_hw_remove(to_platform_device(dai->dev)); - return 0; -} - static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) @@ -184,8 +173,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { { .name = "pxa2xx-ac97", .ac97_control = 1, - .probe = pxa2xx_ac97_probe, - .remove = pxa2xx_ac97_remove, .suspend = pxa2xx_ac97_suspend, .resume = pxa2xx_ac97_resume, .playback = { @@ -236,15 +223,20 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops); static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { + int ret; + if (pdev->id != -1) { dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); return -ENXIO; } - /* Punt most of the init to the SoC probe; we may need the machine - * driver to do interesting things with the clocking to get us up - * and running. - */ + ret = pxa2xx_ac97_hw_probe(pdev); + if (ret < 0) { + dev_err(&pdev->dev, "pxa2xx_ac97_hw_probe failed with %d\n", + ret); + return ret; + } + return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver, ARRAY_SIZE(pxa_ac97_dai_driver)); } @@ -252,6 +244,7 @@ static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver)); + pxa2xx_ac97_hw_remove(pdev); return 0; } -- 1.7.8.6

1 0

[alsa-devel] [PATCH] ALSA: hda - Switch "On" and "Off" for "Mute-LED Mode" kcontrol
by David Henningsson 03 Jan '13

03 Jan '13

The vmaster hook sends 1 for enabled/unmuted and 0 for disabled/muted, but "Mute-LED Mode" being "On" refers to the LED being on, not the volume being on. Therefore "On" and "Off" should be switched. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 8353c77..b8fb0a5 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2531,7 +2531,7 @@ static int vmaster_mute_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { static const char * const texts[] = { - "Off", "On", "Follow Master" + "On", "Off", "Follow Master" }; unsigned int index; -- 1.7.9.5

2 1

Re: [alsa-devel] [PATCH] sound: Add support for Creative BT-D1 via usb sound quirks
by Takashi Iwai 03 Jan '13

03 Jan '13

At Sat, 29 Dec 2012 14:26:25 +0100, Alexander Schremmer wrote: > > From: Alexander Schremmer <alex(a)alexanderweb.de> > > Support the Creative BT-D1 Bluetooth USB audio device. Before this > patch, Linux had trouble finding the correct USB descriptors and bailed > out with these messages: > > no or invalid class specific endpoint descriptor > > Now it still prints these messages on hotplug: > > snd-usb-audio: probe of ...:1.0 failed with error -5 > snd-usb-audio: probe of ...:1.2 failed with error -5 > snd-usb-audio: probe of ...:1.3 failed with error -5 > > But the device works correctly, including the HID support. > > The patch is diff'ed against 3.8-rc1 but should apply to older kernels > as well. > > Signed-off-by: Alexander Schremmer <alex(a)alexanderweb.de> Thanks for the patch. The changes look OK, but could you fix trivial coding issues reported by scripts/checkpatch.pl and resend? Takashi > > --- > diff -uprN linux-3.8-rc1/sound/usb/quirks-table.h > linux-3.8-rc1-mod/sound/usb/quirks-table.h > --- linux-3.8-rc1/sound/usb/quirks-table.h 2012-12-22 > 02:19:00.000000000 +0100 > +++ linux-3.8-rc1-mod/sound/usb/quirks-table.h 2012-12-26 > 11:41:28.000000000 +0100 > @@ -50,6 +50,28 @@ > } > }, > > +{ > + /* Creative BT-D1 */ > + USB_DEVICE(0x041e, 0x0005), > + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { > + .ifnum = 1, > + .type = QUIRK_AUDIO_FIXED_ENDPOINT, > + .data = &(const struct audioformat) { > + .formats = SNDRV_PCM_FMTBIT_S16_LE, > + .channels = 2, > + .iface = 1, > + .altsetting = 1, > + .altset_idx = 1, > + .endpoint = 0x03, > + .ep_attr = USB_ENDPOINT_XFER_ISOC, > + .attributes = 0, > + .rates = SNDRV_PCM_RATE_CONTINUOUS, > + .rate_min = 48000, > + .rate_max = 48000, > + } > + } > +}, > + > /* Creative/Toshiba Multimedia Center SB-0500 */ > { > USB_DEVICE(0x041e, 0x3048), >

1 0

Re: [alsa-devel] [PATCH] pas2: Added a fix where a sound card failure should not result in reading beyond array memory index.
by Takashi Iwai 03 Jan '13

03 Jan '13

At Fri, 28 Dec 2012 12:28:57 -0600, Asim Kadav wrote: > > Signed-off-by: Asim Kadav <kadav(a)cs.wisc.edu> > --- > sound/oss/pas2_card.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c > index dabf8a8..0b8cf64 100644 > --- a/sound/oss/pas2_card.c > +++ b/sound/oss/pas2_card.c > @@ -332,6 +332,10 @@ static void __init attach_pas_card(struct address_info *hw_config) > if ((pas_model = pas_read(0xFF88))) > { > char temp[100]; > + if ((int )pas_model < 0 || (int )pas_model >= 5) { Try to run scripts/checkpatch.pl. You'll get a few errors there. But, you can simply remove the cast to int instead of fixing the coding style issues since the cast is superfluous. Also, use ARRAY_SIZE() instead of a magic number 5. > + printk ("pas2card unrecognized model.\n"); Put a KERN_ERR prefix. thanks, Takashi > + return; > + } > > sprintf(temp, > "%s rev %d", pas_model_names[(int) pas_model], > -- > 1.7.11.3

1 0

[alsa-devel] ASoC: EA3250 V2 machine driver
by Bryan Kaminski 02 Jan '13

02 Jan '13

Hello, I have an Embedded Artists LPC3250 V2 development board, which has the NXP UDA1380 audio codec on-board. I'm wondering if someone could help me get started on making an ASoC driver for it. There already exists a machine driver for a similar Phytec 3250 development board, with the same audio codec. I think it should be possible to modify the existing Phytec driver, but I'm unable to accomplish that. I modified some source and everything compiled, but I can't get the driver to load correctly. After loading the module with 'modprobe', I'm unable to get ALSA to recognize any sound cards. Can anyone give me a jump-start on this? Sorry if this is the wrong list to post on. I would post at the LPCLinux official site but it has been down for multiple weeks now. :| Bryan

1 0

[alsa-devel] [PATCH 0/2] ASoC: palm27x: machine driver fixes and updates
by Mike Dunn 02 Jan '13

02 Jan '13

Hi, A fix and an update to the palm27x machine driver. Happy New Year! Mike Dunn (2): ASoC: palm27x: fix widgets and routes in dai_link init ASoC: palm27x: register card in platform_driver probe sound/soc/pxa/palm27x.c | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) -- 1.7.8.6

2 3

[alsa-devel] [PATCH 0/8] ASoC: OMAP-twl4030: Add support for more3 boards
by Peter Ujfalusi 02 Jan '13

02 Jan '13

Hello, This series will update the omap-twl4030 machine driver and the twl4030 codec driver to enable support for more boards. With this change we can remove two more machine drivers: zoom2 and sdp3430 since they will be supported by the common omap-twl4030 machine driver. The arch/arm/mach-omap2/ patches will go as a separate series to avoid cross tree issues. Regards, Peter --- Peter Ujfalusi (8): ASoC: twl4030: Correct the support for Voice port ASoC: zoom2: No need to configure the Voice port anymore ASoC: sdp3430: No need to configure the Voice port anymore ASoC: twl4030: Convert MICBIAS to SUPPLY widget ASoC: twl4030: Configure extmute pinmux when the dedicated pin is in use ASoC: sdp3430: No need to configure pin mux for extmute ASoC: omap-twl4030: Add support for routing, voice port and jack detect ASoC: OMAP: Remove obsolete machine drivers for Zoom2 and SDP3430 .../devicetree/bindings/sound/omap-twl4030.txt | 46 ++++ sound/soc/codecs/twl4030.c | 71 ++++-- sound/soc/omap/Kconfig | 19 +- sound/soc/omap/Makefile | 4 - sound/soc/omap/omap-twl4030.c | 204 ++++++++++++++- sound/soc/omap/omap3pandora.c | 8 +- sound/soc/omap/sdp3430.c | 278 --------------------- sound/soc/omap/zoom2.c | 207 --------------- 8 files changed, 304 insertions(+), 533 deletions(-) delete mode 100644 sound/soc/omap/sdp3430.c delete mode 100644 sound/soc/omap/zoom2.c -- 1.8.0.2

2 9

[alsa-devel] [PATCH] ASoC: pxa2xx-ac97: fix oops when codec_driver probe runs
by Mike Dunn 02 Jan '13

02 Jan '13

This patch fixes a kernel oops that occurs when the snd_soc_codec_driver probe function runs. The exception occurs when the codec calls soc_ac97_ops.reset(). The pxa2xx-ac97's clocks have not been initialized at this point, but the cpu's reset function (pxa_ac97_cold_pxa27x()) expects them to be, resulting in a NULL pointer dereference in the pxa's clk_enable(). The pxa2xx-ac97's clocks are initialized in pxa2xx_ac97_hw_probe(). To ensure that the clocks are initialized when the codec_driver probe runs, the calls to pxa2xx_ac97_hw_{probe,remove}() are moved from the cpu's dai_driver probe/remove functions to those of its platform_driver. This is necessary because snd_soc_instantiate_card() always calls the codec_driver probe before any of the dai_drivers' probes. This change leaves nothing in the cpu's dai_driver probe/remove functions, so those functions are eliminated. Tested on the pxa27x; palmtreo680 machine using the wm9712 codec. Signed-off-by: Mike Dunn <mikedunn(a)newsguy.com> --- I'm new to the ASoC code. Experts, please have a look. Thanks! sound/soc/pxa/pxa2xx-ac97.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 4b0a009..940e9f4 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -104,17 +104,6 @@ static int pxa2xx_ac97_resume(struct snd_soc_dai *dai) #define pxa2xx_ac97_resume NULL #endif -static int pxa2xx_ac97_probe(struct snd_soc_dai *dai) -{ - return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev)); -} - -static int pxa2xx_ac97_remove(struct snd_soc_dai *dai) -{ - pxa2xx_ac97_hw_remove(to_platform_device(dai->dev)); - return 0; -} - static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *cpu_dai) @@ -184,8 +173,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { { .name = "pxa2xx-ac97", .ac97_control = 1, - .probe = pxa2xx_ac97_probe, - .remove = pxa2xx_ac97_remove, .suspend = pxa2xx_ac97_suspend, .resume = pxa2xx_ac97_resume, .playback = { @@ -236,21 +223,34 @@ EXPORT_SYMBOL_GPL(soc_ac97_ops); static int pxa2xx_ac97_dev_probe(struct platform_device *pdev) { + int ret; + if (pdev->id != -1) { dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n"); return -ENXIO; } - /* Punt most of the init to the SoC probe; we may need the machine - * driver to do interesting things with the clocking to get us up - * and running. - */ - return snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver, - ARRAY_SIZE(pxa_ac97_dai_driver)); + ret = snd_soc_register_dais(&pdev->dev, pxa_ac97_dai_driver, + ARRAY_SIZE(pxa_ac97_dai_driver)); + if (ret < 0) { + dev_err(&pdev->dev, "snd_soc_register_dais failed with %d\n", + ret); + return ret; + } + + ret = pxa2xx_ac97_hw_probe(pdev); + if (ret < 0) { + dev_err(&pdev->dev, "pxa2xx_ac97_hw_probe failed with %d\n", + ret); + snd_soc_unregister_dais(&pdev->dev, + ARRAY_SIZE(pxa_ac97_dai_driver)); + } + return ret; } static int pxa2xx_ac97_dev_remove(struct platform_device *pdev) { + pxa2xx_ac97_hw_remove(pdev); snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(pxa_ac97_dai_driver)); return 0; } -- 1.7.8.6

2 1