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

[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

[alsa-devel] [patch] oss/sb_audio: prevent divide by zero bug
by Dan Carpenter 20 Aug '12

20 Aug '12

Speed comes from get_user() in audio_ioctl(). We use it to set the "s" variable before clamping it to valid values so it could lead to a divide by zero bug. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c index 733b014..b2b3c01 100644 --- a/sound/oss/sb_audio.c +++ b/sound/oss/sb_audio.c @@ -575,13 +575,15 @@ static int jazz16_audio_set_speed(int dev, int speed) if (speed > 0) { int tmp; - int s = speed * devc->channels; + int s; if (speed < 5000) speed = 5000; if (speed > 44100) speed = 44100; + s = speed * devc->channels; + devc->tconst = (256 - ((1000000 + s / 2) / s)) & 0xff; tmp = 256 - devc->tconst;

2 1

Re: [alsa-devel] Question about Conversion to S24_LE from S24_3LE
by Takashi Iwai 20 Aug '12

20 Aug '12

At Mon, 20 Aug 2012 14:57:51 +0900 (JST), etsuko suzuki wrote: > > Hello, Takashi. > > > Hm, I guess your message didn't reach properly, or was filtered by some spam > filter. > > Better to contact with Jaroslav (Cc'ed), who maintains alsa-devel ML. > > I contacted him in August 17. > However, there is no reply yet. Didn't you read his mail in Aug. 16? You were in Cc. > > [No.1] > > > > http://msdn.microsoft.com/en-us/windows/hardware/gg463006.aspx > > > > > > In this, I found the statement 'left-alinged'. > > > (In 'Details about wValidBitsPerSample') > > > > > > I understood 'left-alinged' was 'LSB padding'. > > > So I thought S24_LE was LSB padding. > > > > No. S24_LE has the MSB padding of 8 bits in 32 bit container. > > That is, does it mean that this document is not correct? > (I don't understand why this document differs from what you say.) Well, Microsoft doesn't conquer the whole world yet. Their definition isn't what we define for our purpose. > http://www-mmsp.ece.mcgill.ca/documents/audioformats/wave/Docs/multichaudP.… > (This PDF is the same as what was written before. > The page is written on this.) > > On the 6 page of this PDF, it is written to like this. > > 'If wValidBitsPerSample is less than wBitsPerSample, > then the actual > PCM data is "left-aligned" within the container. > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > The sample itself is justified most significant; > all extra bits are at the least-significant > portion of the container. > All non-valid data bits must be set to 0.' > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ > > In S24_LE, I think 'wBitsPerSample' indicates > 'the container size'(=32) and > 'wValidBitsPerSample' indicates 'the bit of actual valid data'(=24). You _think_ but you utterly misunderstand the terms. ALSA S24 is not what you think. S24 is a special format, 3 bytes LSB in 4 bytes container. This _is_ the definition. There is no such a format in MS's WAV definition. wValidBitsPerSample is rather corresponding to hw_params ms_bits parameter. > > [No.2] > > It was written that Microsoft has defined > the new structure 'WAVE_FORMAT_EXTENSIBLE'(FORMAT_CODE:0xFFFE). > (On the 4 page of this PDF.) > > I think that the new structure should be used > in this(the container size > the bit of actual valid data) case. > > But the structure recording > by arecord was 'WAVE_FORMAT_PCM'(FORMAT_CODE:0x0001). > > > % od -t x4 ubuntu_rec_S24_LE_48000.wav > > 0000000 46464952 003a9824 45564157 20746d66 > > 0000010 00000010 00020001 0000bb80 0005dc00 > ^^^^ 0x0001:WAVE_FORMAT_PCM > > (The 'FORMAT_CODE' is written in this page. > http://www-mmsp.ece.mcgill.ca/documents/audioformats/wave/wave.html) > > > Why does ALSA NOT use the new structure? Because it's new, and no one cared such a thing. > Has ALSA corresponded to the new structure? Please send a fix patch if you'd like to improve :) thanks, Takashi

1 0

[alsa-devel] [PATCH 2/2] snd-ad1816a: Implement suspend/resume
by Ondrej Zary 19 Aug '12

19 Aug '12

Implement suspend/resume support for AD1816 chips. Tested with Terratec SoundSystem Base-1. Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> diff --git a/include/sound/ad1816a.h b/include/sound/ad1816a.h index 62da41e..2a89f0d 100644 --- a/include/sound/ad1816a.h +++ b/include/sound/ad1816a.h @@ -147,6 +147,9 @@ struct snd_ad1816a { unsigned int c_dma_size; struct snd_timer *timer; +#ifdef CONFIG_PM + unsigned short image[48]; +#endif }; @@ -171,5 +174,9 @@ extern int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm extern int snd_ad1816a_mixer(struct snd_ad1816a *chip); extern int snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer); +#ifdef CONFIG_PM +extern void snd_ad1816a_suspend(struct snd_ad1816a *chip); +extern void snd_ad1816a_resume(struct snd_ad1816a *chip); +#endif #endif /* __SOUND_AD1816A_H */ diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c index 1a374e6..2c2f829 100644 --- a/sound/isa/ad1816a/ad1816a.c +++ b/sound/isa/ad1816a/ad1816a.c @@ -244,13 +244,37 @@ static void __devexit snd_ad1816a_pnp_remove(struct pnp_card_link * pcard) pnp_set_card_drvdata(pcard, NULL); } +#ifdef CONFIG_PM +static int snd_ad1816a_pnp_suspend(struct pnp_card_link *pcard, + pm_message_t state) +{ + struct snd_card *card = pnp_get_card_drvdata(pcard); + + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); + snd_ad1816a_suspend(card->private_data); + return 0; +} + +static int snd_ad1816a_pnp_resume(struct pnp_card_link *pcard) +{ + struct snd_card *card = pnp_get_card_drvdata(pcard); + + snd_ad1816a_resume(card->private_data); + snd_power_change_state(card, SNDRV_CTL_POWER_D0); + return 0; +} +#endif + static struct pnp_card_driver ad1816a_pnpc_driver = { .flags = PNP_DRIVER_RES_DISABLE, .name = "ad1816a", .id_table = snd_ad1816a_pnpids, .probe = snd_ad1816a_pnp_detect, .remove = __devexit_p(snd_ad1816a_pnp_remove), - /* FIXME: suspend/resume */ +#ifdef CONFIG_PM + .suspend = snd_ad1816a_pnp_suspend, + .resume = snd_ad1816a_pnp_resume, +#endif }; static int __init alsa_card_ad1816a_init(void) diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c index de5cc1c..db64df6 100644 --- a/sound/isa/ad1816a/ad1816a_lib.c +++ b/sound/isa/ad1816a/ad1816a_lib.c @@ -491,7 +491,7 @@ static int snd_ad1816a_capture_close(struct snd_pcm_substream *substream) } -static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip) +static void snd_ad1816a_init(struct snd_ad1816a *chip) { unsigned long flags; @@ -511,6 +511,32 @@ static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip) spin_unlock_irqrestore(&chip->lock, flags); } +#ifdef CONFIG_PM +void snd_ad1816a_suspend(struct snd_ad1816a *chip) +{ + int reg; + unsigned long flags; + + snd_pcm_suspend_all(chip->pcm); + spin_lock_irqsave(&chip->lock, flags); + for (reg = 0; reg < 48; reg++) + chip->image[reg] = snd_ad1816a_read(chip, reg); + spin_unlock_irqrestore(&chip->lock, flags); +} + +void snd_ad1816a_resume(struct snd_ad1816a *chip) +{ + int reg; + unsigned long flags; + + snd_ad1816a_init(chip); + spin_lock_irqsave(&chip->lock, flags); + for (reg = 0; reg < 48; reg++) + snd_ad1816a_write(chip, reg, chip->image[reg]); + spin_unlock_irqrestore(&chip->lock, flags); +} +#endif + static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip) { unsigned long flags; -- Ondrej Zary

1 0

Re: [alsa-devel] M-Audio FastTrack C400
by Grant Diffey 18 Aug '12

18 Aug '12

So this looks reasonably familiar, int0 is DFU int1 is mixer int2 is audio out int3 is audio in int4 is midi int5 is HID Quirk should look like the fast track ultra basically. maybe the mixer is less broken in this device? Should we start with just QUIRK_STANDARD_AUDIO_INTERFACE or copy the whole data section from the Ultra quirk? This has isosyncronous feedback for clock control needs current sound tree usb-audio tree Grant On Wed, Apr 18, 2012 at 8:45 AM, Chris Cavey <chris-alsa(a)rauros.net> wrote: > Will to help with development, may need pointers to get started and > willing to test things. I am mostly concerned with simple playback. > Recording, DSP, and Midi can all come later if at all. > > As requested the output of sudo lsusb -v -d 0763:2030" > > Bus 002 Device 003: ID 0763:2030 Midiman > Device Descriptor: > bLength 18 > bDescriptorType 1 > bcdUSB 2.00 > bDeviceClass 239 Miscellaneous Device > bDeviceSubClass 2 ? > bDeviceProtocol 1 Interface Association > bMaxPacketSize0 64 > idVendor 0x0763 Midiman > idProduct 0x2030 > bcdDevice 1.01 > iManufacturer 1 M-Audio > iProduct 2 Fast Track C400 > iSerial 0 > bNumConfigurations 1 > Configuration Descriptor: > bLength 9 > bDescriptorType 2 > wTotalLength 455 > bNumInterfaces 6 > bConfigurationValue 1 > iConfiguration 0 > bmAttributes 0x80 > (Bus Powered) > MaxPower 500mA > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 0 > bAlternateSetting 0 > bNumEndpoints 0 > bInterfaceClass 254 Application Specific Interface > bInterfaceSubClass 1 Device Firmware Update > bInterfaceProtocol 0 > iInterface 6 Fast Track C400 DFU > Device Firmware Upgrade Interface Descriptor: > bLength 9 > bDescriptorType 33 > bmAttributes 1 > Will Not Detach > Manifestation Intolerant > Upload Unsupported > Download Supported > wDetachTimeout 2000 milliseconds > wTransferSize 1024 bytes > bcdDFUVersion 1.10 > Interface Association: > bLength 8 > bDescriptorType 11 > bFirstInterface 1 > bInterfaceCount 4 > bFunctionClass 255 Vendor Specific Class > bFunctionSubClass 0 > bFunctionProtocol 32 > iFunction 2 Fast Track C400 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 1 > bAlternateSetting 0 > bNumEndpoints 0 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 1 > bInterfaceProtocol 32 > iInterface 2 Fast Track C400 > ** UNRECOGNIZED: 09 24 01 00 02 0a a3 00 00 > ** UNRECOGNIZED: 09 24 0b 80 02 81 82 03 00 > ** UNRECOGNIZED: 08 24 0a 81 03 03 03 00 > ** UNRECOGNIZED: 08 24 0a 82 00 05 03 00 > ** UNRECOGNIZED: 11 24 02 00 01 01 00 80 06 00 00 00 00 00 00 00 00 > ** UNRECOGNIZED: 0c 24 03 01 01 01 00 02 80 00 00 00 > ** UNRECOGNIZED: 11 24 02 02 03 06 00 80 04 00 00 00 00 00 00 00 00 > ** UNRECOGNIZED: 0c 24 03 03 03 06 00 40 80 00 00 00 > ** UNRECOGNIZED: 11 24 09 20 00 00 02 02 00 04 00 00 00 00 00 00 00 > ** UNRECOGNIZED: 15 24 04 40 03 02 00 43 04 00 00 00 00 00 ff ff ff > ff 0f 00 00 > ** UNRECOGNIZED: 10 24 04 42 02 02 00 01 00 00 00 00 00 ff 00 00 > ** UNRECOGNIZED: 10 24 07 43 02 00 42 fd 03 00 00 fd 03 00 00 00 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 2 > bAlternateSetting 0 > bNumEndpoints 0 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 2 > bInterfaceProtocol 32 > iInterface 0 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 2 > bAlternateSetting 1 > bNumEndpoints 1 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 2 > bInterfaceProtocol 32 > iInterface 4 Line > ** UNRECOGNIZED: 10 24 01 00 00 01 01 00 00 00 06 00 00 00 00 00 > ** UNRECOGNIZED: 06 24 02 01 03 18 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x01 EP 1 OUT > bmAttributes 37 > Transfer Type Isochronous > Synch Type Asynchronous > Usage Type Implicit feedback Data > wMaxPacketSize 0x00ea 1x 234 bytes > bInterval 1 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 2 > bAlternateSetting 2 > bNumEndpoints 1 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 2 > bInterfaceProtocol 32 > iInterface 4 Line > ** UNRECOGNIZED: 10 24 01 00 00 01 d0 00 00 00 02 00 00 00 00 00 > ** UNRECOGNIZED: 06 24 02 03 02 10 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x01 EP 1 OUT > bmAttributes 37 > Transfer Type Isochronous > Synch Type Asynchronous > Usage Type Implicit feedback Data > wMaxPacketSize 0x004e 1x 78 bytes > bInterval 1 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 3 > bAlternateSetting 0 > bNumEndpoints 0 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 2 > bInterfaceProtocol 32 > iInterface 4 Line > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 3 > bAlternateSetting 1 > bNumEndpoints 1 > bInterfaceClass 255 Vendor Specific Class > bInterfaceSubClass 2 > bInterfaceProtocol 32 > iInterface 4 Line > ** UNRECOGNIZED: 10 24 01 00 00 01 01 00 00 00 04 00 00 00 00 00 > ** UNRECOGNIZED: 06 24 02 01 03 18 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x81 EP 1 IN > bmAttributes 5 > Transfer Type Isochronous > Synch Type Asynchronous > Usage Type Data > wMaxPacketSize 0x009c 1x 156 bytes > bInterval 1 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 4 > bAlternateSetting 0 > bNumEndpoints 2 > bInterfaceClass 1 Audio > bInterfaceSubClass 3 MIDI Streaming > bInterfaceProtocol 0 > iInterface 0 > MIDIStreaming Interface Descriptor: > bLength 7 > bDescriptorType 36 > bDescriptorSubtype 1 (HEADER) > bcdADC 1.00 > wTotalLength 35 > MIDIStreaming Interface Descriptor: > bLength 6 > bDescriptorType 36 > bDescriptorSubtype 2 (MIDI_IN_JACK) > bJackType 1 Embedded > bJackID 1 > iJack 0 > MIDIStreaming Interface Descriptor: > bLength 6 > bDescriptorType 36 > bDescriptorSubtype 2 (MIDI_IN_JACK) > bJackType 2 External > bJackID 2 > iJack 0 > MIDIStreaming Interface Descriptor: > bLength 8 > bDescriptorType 36 > bDescriptorSubtype 3 (MIDI_OUT_JACK) > Warning: Descriptor too short > bJackType 1 Embedded > bJackID 3 > bNrInputPins 1 > baSourceID( 0) 2 > BaSourcePin( 0) 1 > iJack 8 > MIDIStreaming Interface Descriptor: > bLength 8 > bDescriptorType 36 > bDescriptorSubtype 3 (MIDI_OUT_JACK) > Warning: Descriptor too short > bJackType 2 External > bJackID 4 > bNrInputPins 1 > baSourceID( 0) 1 > BaSourcePin( 0) 1 > iJack 105 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x07 EP 7 OUT > bmAttributes 2 > Transfer Type Bulk > Synch Type None > Usage Type Data > wMaxPacketSize 0x0200 1x 512 bytes > bInterval 0 > MIDIStreaming Endpoint Descriptor: > bLength 5 > bDescriptorType 37 > bDescriptorSubtype 1 (GENERAL) > bNumEmbMIDIJack 1 > baAssocJackID( 0) 1 > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x87 EP 7 IN > bmAttributes 2 > Transfer Type Bulk > Synch Type None > Usage Type Data > wMaxPacketSize 0x0200 1x 512 bytes > bInterval 0 > MIDIStreaming Endpoint Descriptor: > bLength 5 > bDescriptorType 37 > bDescriptorSubtype 1 (GENERAL) > bNumEmbMIDIJack 1 > baAssocJackID( 0) 3 > Interface Descriptor: > bLength 9 > bDescriptorType 4 > bInterfaceNumber 5 > bAlternateSetting 0 > bNumEndpoints 1 > bInterfaceClass 3 Human Interface Device > bInterfaceSubClass 0 No Subclass > bInterfaceProtocol 1 Keyboard > iInterface 0 > HID Device Descriptor: > bLength 9 > bDescriptorType 33 > bcdHID 1.10 > bCountryCode 0 Not supported > bNumDescriptors 1 > bDescriptorType 34 Report > wDescriptorLength 63 > Report Descriptors: > ** UNAVAILABLE ** > Endpoint Descriptor: > bLength 7 > bDescriptorType 5 > bEndpointAddress 0x86 EP 6 IN > bmAttributes 3 > Transfer Type Interrupt > Synch Type None > Usage Type Data > wMaxPacketSize 0x0008 1x 8 bytes > bInterval 8 > Device Qualifier (for other device speed): > bLength 10 > bDescriptorType 6 > bcdUSB 2.00 > bDeviceClass 239 Miscellaneous Device > bDeviceSubClass 2 ? > bDeviceProtocol 1 Interface Association > bMaxPacketSize0 64 > bNumConfigurations 1 > Device Status: 0x0000 > (Bus Powered) > > > On 04/17/2012 09:15 AM, Grant Diffey wrote: > > start with an lsusb -v -d (vid:pid) pasted here > > On Tue, Apr 17, 2012 at 10:37 PM, Chris Cavey <chris-alsa(a)rauros.net>wrote: > >> I'd love to be able to help ALSA support this USB sound device. I've >> currently got the device working in a VM on my Ubuntu 12.04 workstation. >> I believe I can capture USB packets. Would this be helpful to anyone? >> Any pointers on where to get started? >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel(a)alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> > > >

6 26

[alsa-devel] [PATCH 1/2 v2] ASoC: bf5xx-ad1836: convert to use snd_soc_register_card
by Scott Jiang 18 Aug '12

18 Aug '12

Cpu dai and codec name are passed in through platform data. Signed-off-by: Scott Jiang <scott.jiang.linux(a)gmail.com> --- sound/soc/blackfin/bf5xx-ad1836.c | 73 +++++++++++++++++++------------------ 1 files changed, 37 insertions(+), 36 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index d542d40..16b9c9e 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c @@ -59,62 +59,63 @@ static struct snd_soc_ops bf5xx_ad1836_ops = { #define BF5XX_AD1836_DAIFMT (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_IF | \ SND_SOC_DAIFMT_CBM_CFM) -static struct snd_soc_dai_link bf5xx_ad1836_dai[] = { - { - .name = "ad1836", - .stream_name = "AD1836", - .cpu_dai_name = "bfin-tdm.0", - .codec_dai_name = "ad1836-hifi", - .platform_name = "bfin-tdm-pcm-audio", - .codec_name = "spi0.4", - .ops = &bf5xx_ad1836_ops, - .dai_fmt = BF5XX_AD1836_DAIFMT, - }, - { - .name = "ad1836", - .stream_name = "AD1836", - .cpu_dai_name = "bfin-tdm.1", - .codec_dai_name = "ad1836-hifi", - .platform_name = "bfin-tdm-pcm-audio", - .codec_name = "spi0.4", - .ops = &bf5xx_ad1836_ops, - .dai_fmt = BF5XX_AD1836_DAIFMT, - }, +static struct snd_soc_dai_link bf5xx_ad1836_dai = { + .name = "ad1836", + .stream_name = "AD1836", + .codec_dai_name = "ad1836-hifi", + .platform_name = "bfin-tdm-pcm-audio", + .ops = &bf5xx_ad1836_ops, + .dai_fmt = BF5XX_AD1836_DAIFMT, }; static struct snd_soc_card bf5xx_ad1836 = { .name = "bfin-ad1836", .owner = THIS_MODULE, - .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM], + .dai_link = &bf5xx_ad1836_dai, .num_links = 1, }; -static struct platform_device *bfxx_ad1836_snd_device; - -static int __init bf5xx_ad1836_init(void) +static __devinit int bf5xx_ad1836_driver_probe(struct platform_device *pdev) { + struct snd_soc_card *card = &bf5xx_ad1836; + const char **link_name; int ret; - bfxx_ad1836_snd_device = platform_device_alloc("soc-audio", -1); - if (!bfxx_ad1836_snd_device) - return -ENOMEM; + link_name = pdev->dev.platform_data; + if (!link_name) { + dev_err(&pdev->dev, "No platform data supplied\n"); + return -EINVAL; + } + bf5xx_ad1836_dai.cpu_dai_name = link_name[0]; + bf5xx_ad1836_dai.codec_name = link_name[1]; - platform_set_drvdata(bfxx_ad1836_snd_device, &bf5xx_ad1836); - ret = platform_device_add(bfxx_ad1836_snd_device); + card->dev = &pdev->dev; + platform_set_drvdata(pdev, card); + ret = snd_soc_register_card(card); if (ret) - platform_device_put(bfxx_ad1836_snd_device); - + dev_err(&pdev->dev, "Failed to register card\n"); return ret; } -static void __exit bf5xx_ad1836_exit(void) +static int __devexit bf5xx_ad1836_driver_remove(struct platform_device *pdev) { - platform_device_unregister(bfxx_ad1836_snd_device); + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); + return 0; } -module_init(bf5xx_ad1836_init); -module_exit(bf5xx_ad1836_exit); +static struct platform_driver bf5xx_ad1836_driver = { + .driver = { + .name = "bfin-snd-ad1836", + .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, + }, + .probe = bf5xx_ad1836_driver_probe, + .remove = __devexit_p(bf5xx_ad1836_driver_remove), +}; +module_platform_driver(bf5xx_ad1836_driver); /* Module information */ MODULE_AUTHOR("Barry Song"); -- 1.7.0.4

2 2

Re: [alsa-devel] [PATCH 1/5] ARM: tegra: config: enable dmaengine based APB DMA driver
by Stephen Warren 17 Aug '12

17 Aug '12

On 08/17/2012 12:38 AM, Laxman Dewangan wrote: > On Thursday 16 August 2012 11:23 PM, Stephen Warren wrote: >> On 08/16/2012 08:13 AM, Laxman Dewangan wrote: >>> Enable config for dmaengine based Tegra APB DMA driver and >>> disable the legacy APB DMA driver (SYSTEM_DMA). >> Laxman, if I apply this series to next-20120816 (plus a few patches in >> my local work branch plus the CPU hotplug patches from Joseph, although >> I suspect none of that matters), then audio playback on Tegra20 is >> broken; the pitch is far too high. Audio playback on Tegra30 works as >> expected. > > I run the test again on ventana and did not see any issue. > I play one song and saw similar behavior with/without this series. OK, I'll test some other boards. I tested Whistler, although all the clocking logic is identical between all Tegra20 boards. > With this series: > -------------------- > > ubuntu@tegra-ubuntu:/home$ aplay "1-04 Hungry Like The Wolf.wav" > Playing WAVE '1-04 Hungry Like The Wolf.wav' : Signed 16 bit Little > Endian, Rate > 44100 Hz, Stereo > underrun!!! (at least 5039.388 ms long) Why are you getting all these underruns? I almost never see this, except when something else is hammering the SD card containing the .wav file. If I saw those, I'd count it as a test failure.

1 1

[alsa-devel] How to define card specific pcm devices?
by Tanu Kaskinen 17 Aug '12

17 Aug '12

Hi, I'm writing UCM configuration for RX-51 (Nokia N900), and I have a problem: "hw:RX51" can't be opened in mono mode, but there's only one integrated mono microphone, and its audio is routed to the left input channel. Applications will get only silence in the right channel when they use "hw:RX51". The best solution that I have come up is to define a pcm that converts "hw:RX51" into a mono device. The problem is that I don't know how exactly to do that. I guess the route plugin can be used for that: pcm.rx51_mono_from_left { type route slave.pcm hw:RX51 slave.channels 2 ttable.0.0 1 } I tried putting that definition in /usr/share/alsa/cards/RX-51.conf (and also RX51.conf, since it's not entirely clear to me when the dash should be omitted). I have this in the UCM configuration: Value { CapturePCM "rx51_mono_from_left" CaptureChannels "1" } This is printed to the PulseAudio log: (alsa-lib)pcm.c: Unknown PCM rx51_mono_from_left So the rx51_mono_from_left definition is not loaded. I'm not terribly surprised: I guess the card configuration files are loaded only when necessary, and when PulseAudio tries to open "rx51_mono_from_left", alsa-lib can't really know that it's somehow related to the RX-51 card. How should I solve this? -- Tanu

1 1

[alsa-devel] [PATCH V6 12/15] ALSA: HDA: Make hda sound card usable for Loongson
by Huacai Chen 17 Aug '12

17 Aug '12

Lemote A1004(Laptop) and A1205(All-In-One) use Conexant's hda codec, this patch modify patch_conexant.c to add Lemote specific code. Both A1004 and A1205 use the same pin configurations, but A1004 need to increase the default boost of internal mic. Signed-off-by: Jie Chen <chenj(a)lemote.com> Signed-off-by: Huacai Chen <chenhc(a)lemote.com> Signed-off-by: Hongliang Tao <taohl(a)lemote.com> Signed-off-by: Hua Yan <yanh(a)lemote.com> Cc: alsa-devel(a)alsa-project.org --- sound/pci/hda/patch_conexant.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 5e22a8f..3cc265e 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -4408,7 +4408,10 @@ static const struct hda_codec_ops cx_auto_patch_ops = { enum { CXT_PINCFG_LENOVO_X200, CXT_PINCFG_LENOVO_TP410, + CXT_PINCFG_LEMOTE_A1004, + CXT_PINCFG_LEMOTE_A1205, CXT_FIXUP_STEREO_DMIC, + CXT_FIXUP_INC_MIC_BOOST, }; static void cxt_fixup_stereo_dmic(struct hda_codec *codec, @@ -4418,6 +4421,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec, spec->fixup_stereo_dmic = 1; } +static void cxt5066_increase_mic_boost(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action != HDA_FIXUP_ACT_PRE_PROBE) + return; + + snd_hda_override_amp_caps(codec, 0x17, HDA_OUTPUT, + (0x3 << AC_AMPCAP_OFFSET_SHIFT) | + (0x4 << AC_AMPCAP_NUM_STEPS_SHIFT) | + (0x27 << AC_AMPCAP_STEP_SIZE_SHIFT) | + (0 << AC_AMPCAP_MUTE_SHIFT)); +} + /* ThinkPad X200 & co with cxt5051 */ static const struct hda_pintbl cxt_pincfg_lenovo_x200[] = { { 0x16, 0x042140ff }, /* HP (seq# overridden) */ @@ -4435,6 +4451,18 @@ static const struct hda_pintbl cxt_pincfg_lenovo_tp410[] = { {} }; +/* Lemote A1004/A1205 with cxt5066 */ +static const struct hda_pintbl cxt_pincfg_lemote[] = { + { 0x1a, 0x90a10020 }, /* Internal mic */ + { 0x1b, 0x03a11020 }, /* External mic */ + { 0x1d, 0x400101f0 }, /* Not used */ + { 0x1e, 0x40a701f0 }, /* Not used */ + { 0x20, 0x404501f0 }, /* Not used */ + { 0x22, 0x404401f0 }, /* Not used */ + { 0x23, 0x40a701f0 }, /* Not used */ + {} +}; + static const struct hda_fixup cxt_fixups[] = { [CXT_PINCFG_LENOVO_X200] = { .type = HDA_FIXUP_PINS, @@ -4444,10 +4472,24 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_PINS, .v.pins = cxt_pincfg_lenovo_tp410, }, + [CXT_PINCFG_LEMOTE_A1004] = { + .type = HDA_FIXUP_PINS, + .chained = true, + .chain_id = CXT_FIXUP_INC_MIC_BOOST, + .v.pins = cxt_pincfg_lemote, + }, + [CXT_PINCFG_LEMOTE_A1205] = { + .type = HDA_FIXUP_PINS, + .v.pins = cxt_pincfg_lemote, + }, [CXT_FIXUP_STEREO_DMIC] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_stereo_dmic, }, + [CXT_FIXUP_INC_MIC_BOOST] = { + .type = HDA_FIXUP_FUNC, + .v.func = cxt5066_increase_mic_boost, + }, }; static const struct snd_pci_quirk cxt5051_fixups[] = { @@ -4463,6 +4505,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x21cf, "Lenovo T520", CXT_PINCFG_LENOVO_TP410), SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), + SND_PCI_QUIRK(0x1c06, 0x2012, "Lemote A1205", CXT_PINCFG_LEMOTE_A1205), {} }; -- 1.7.7.3

2 2

Re: [alsa-devel] [Bug 46011] Capture of sound from USB connected audio card (UGM96) doesn't work in 3.5.1 - kernel bug generated: scheduling while atomic
by Daniel Mack 17 Aug '12

17 Aug '12

On 15.08.2012 12:40, Takashi Iwai wrote: >>> Could you try the patch below? Clemens, the patch below fixes a "sleeping while atomic" bug in the USB audio driver, but it raises a new "not enough bandwidth" issue, which might even be unreleated. I currently don't see the root cause here, but I might be blind. Do you have any idea? Thanks, Daniel > --- > From: Takashi Iwai <tiwai(a)suse.de> > Subject: [PATCH] ALSA: usb-audio: Fix scheduling-while-atomic bug in PCM > capture stream > > A PCM capture stream on usb-audio causes a scheduling-while-atomic > BUG, as reported in the bugzilla entry below. It's because > snd_usb_endpoint_start() is called at first at trigger START for a > capture stream, and this function contains the left-over EP > deactivation codes. The problem doesn't happen for a playback stream > because the function is called at PCM prepare time, which can sleep. > > This patch fixes the BUG by moving the EP deactivation code into the > PCM prepare callback. > > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=46011 > Cc: <stable(a)vger.kernel.org> [v3.5+] > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > --- > sound/usb/endpoint.c | 4 ---- > sound/usb/pcm.c | 3 +++ > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c > index 0f647d2..c411812 100644 > --- a/sound/usb/endpoint.c > +++ b/sound/usb/endpoint.c > @@ -821,10 +821,6 @@ int snd_usb_endpoint_start(struct snd_usb_endpoint *ep) > if (++ep->use_count != 1) > return 0; > > - /* just to be sure */ > - deactivate_urbs(ep, 0, 1); > - wait_clear_urbs(ep); > - > ep->active_mask = 0; > ep->unlink_mask = 0; > ep->phase = 0; > diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c > index a1298f3..62ec808 100644 > --- a/sound/usb/pcm.c > +++ b/sound/usb/pcm.c > @@ -544,6 +544,9 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) > subs->last_frame_number = 0; > runtime->delay = 0; > > + /* clear the pending deactivation on the target EPs */ > + deactivate_endpoints(subs); > + > /* for playback, submit the URBs now; otherwise, the first hwptr_done > * updates for all URBs would happen at the same time when starting */ > if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) >

3 2