November 2008 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/3] ASoC updates
by Mark Brown 27 Nov '08

27 Nov '08

The following changes since commit 5c0d7bb797a975691ca8bbc38e53da03c6e151bb: Dmitry Baryshkov (1): ASoC: tosa: move gpio probing to machine callbacks are available in the git repository at: git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai Daniel Mack (1): ASoC: Allow more routing features for tlv320aic3x Mark Brown (1): ASoC: Fix word wrapping in OMAP Kconfig Qinghuang Feng (1): ASoC: Clean up kernel-doc for snd_soc_dai_set_fmt sound/soc/codecs/tlv320aic3x.c | 96 +++++++++++++++++++++++++++------------ sound/soc/codecs/tlv320aic3x.h | 12 +++++ sound/soc/omap/Kconfig | 5 +- sound/soc/soc-core.c | 1 - 4 files changed, 80 insertions(+), 34 deletions(-)

2 4

Re: [alsa-devel] [PATCH] sound/pci/mixart/mixart.c: Add missing snd_card_free
by Takashi Iwai 27 Nov '08

27 Nov '08

At Thu, 27 Nov 2008 15:40:40 +0100 (CET), Julia Lawall wrote: > > From: Julia Lawall <julia(a)diku.dk> > > The function snd_mixart_create creates a link between mgr and card that > allows snd_mixart_free to free card as well. But if snd_mixart_create > fails, then the link has not been created and card has to be freed explicitly. > > > The semantic match that finds the problem is as follows: > (http://www.emn.fr/x-info/coccinelle/) (snip) > Signed-off-by: Julia Lawall <julia(a)diku.dk> Thanks, applied now. Takashi

1 0

Re: [alsa-devel] [PATCH] sound/pci/mixart/mixart.c: Add missing snd_card_free
by Takashi Iwai 27 Nov '08

27 Nov '08

At Thu, 27 Nov 2008 15:01:51 +0100 (CET), Julia Lawall wrote: > > On Thu, 27 Nov 2008, Takashi Iwai wrote: > > > At Thu, 27 Nov 2008 14:33:30 +0100 (CET), > > Julia Lawall wrote: > > > > > > Oops, please ignore this patch. There is a problem, but the modification > > > is not correct. > > > > How about the patch below? > > My solution was to move the initialization of mgr->chip[idx] down below > the last error return in snd_mixart_create. I think it depends on what is > going to happen to the structure ops. In your solution, if ops.dev_free > is used later on, then the link between mgr and card will be broken, and > no one will know to free card. > > There is the same code and the same problem in sound/pci/pcxhr/pcxhr.c > > I attach a proposed patch for both below. Looks good. Could you repost with a readable comment? thanks, Takashi > > julia > > > Takashi > > > > --- > > diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c > > index ae7601f..3cccfed 100644 > > --- a/sound/pci/mixart/mixart.c > > +++ b/sound/pci/mixart/mixart.c > > @@ -989,6 +989,7 @@ static int snd_mixart_pcm_digital(struct snd_mixart *chip) > > > > static int snd_mixart_chip_free(struct snd_mixart *chip) > > { > > + chip->mgr->chip[chip->chip_idx] = NULL; > > kfree(chip); > > return 0; > > } > > -- > > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > > the body of a message to majordomo(a)vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > --- > sound/pci/mixart/mixart.c | 4 +++- > sound/pci/pcxhr/pcxhr.c | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c > index ae7601f..f23a735 100644 > --- a/sound/pci/mixart/mixart.c > +++ b/sound/pci/mixart/mixart.c > @@ -1010,7 +1010,7 @@ static int __devinit snd_mixart_create(struct mixart_mgr *mgr, struct snd_card * > .dev_free = snd_mixart_chip_dev_free, > }; > > - mgr->chip[idx] = chip = kzalloc(sizeof(*chip), GFP_KERNEL); > + chip = kzalloc(sizeof(*chip), GFP_KERNEL); > if (! chip) { > snd_printk(KERN_ERR "cannot allocate chip\n"); > return -ENOMEM; > @@ -1025,6 +1025,7 @@ static int __devinit snd_mixart_create(struct mixart_mgr *mgr, struct snd_card * > return err; > } > > + mgr->chip[idx] = chip; > snd_card_set_dev(card, &mgr->pci->dev); > > return 0; > @@ -1377,6 +1378,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci, > sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i); > > if ((err = snd_mixart_create(mgr, card, i)) < 0) { > + snd_card_free(card); > snd_mixart_free(mgr); > return err; > } > diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c > index 73de6e9..7d2b136 100644 > --- a/sound/pci/pcxhr/pcxhr.c > +++ b/sound/pci/pcxhr/pcxhr.c > @@ -1024,7 +1024,7 @@ static int __devinit pcxhr_create(struct pcxhr_mgr *mgr, struct snd_card *card, > .dev_free = pcxhr_chip_dev_free, > }; > > - mgr->chip[idx] = chip = kzalloc(sizeof(*chip), GFP_KERNEL); > + chip = kzalloc(sizeof(*chip), GFP_KERNEL); > if (! chip) { > snd_printk(KERN_ERR "cannot allocate chip\n"); > return -ENOMEM; > @@ -1050,6 +1050,7 @@ static int __devinit pcxhr_create(struct pcxhr_mgr *mgr, struct snd_card *card, > return err; > } > > + mgr->chip[idx] = chip; > snd_card_set_dev(card, &mgr->pci->dev); > > return 0; > @@ -1310,6 +1311,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id > sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i); > > if ((err = pcxhr_create(mgr, card, i)) < 0) { > + snd_card_free(card); > pcxhr_free(mgr); > return err; > } >

1 0

Re: [alsa-devel] [PATCH] sound/pci/mixart/mixart.c: Add missing snd_card_free
by Takashi Iwai 27 Nov '08

27 Nov '08

At Thu, 27 Nov 2008 14:33:30 +0100 (CET), Julia Lawall wrote: > > Oops, please ignore this patch. There is a problem, but the modification > is not correct. How about the patch below? Takashi --- diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index ae7601f..3cccfed 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c @@ -989,6 +989,7 @@ static int snd_mixart_pcm_digital(struct snd_mixart *chip) static int snd_mixart_chip_free(struct snd_mixart *chip) { + chip->mgr->chip[chip->chip_idx] = NULL; kfree(chip); return 0; }

1 0

[alsa-devel] [PATCH] OMAP general SOC driver.
by Stanley.Miao 27 Nov '08

27 Nov '08

Add a shared omap SoC driver to avoid reduplicate code among omap soc drivers. Signed-off-by: Stanley.Miao <stanley.miao(a)windriver.com> --- sound/soc/omap/Kconfig | 49 +++++++++++++ sound/soc/omap/Makefile | 13 ++++ sound/soc/omap/omap-general.c | 155 +++++++++++++++++++++++++++++++++++++++++ sound/soc/omap/omap-general.h | 70 ++++++++++++++++++ 4 files changed, 287 insertions(+), 0 deletions(-) create mode 100644 sound/soc/omap/omap-general.c create mode 100644 sound/soc/omap/omap-general.h diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 8b7766b..92a557f 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -14,6 +14,14 @@ config SND_OMAP_SOC_N810 help Say Y if you want to add support for SoC audio on Nokia N810. +config SND_OMAP_SOC_OMAP3_BEAGLE + tristate "SoC Audio support for OMAP3 Beagle" + depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the Beagleboard. + config SND_OMAP_SOC_OSK5912 tristate "SoC Audio support for omap osk5912" depends on SND_OMAP_SOC && MACH_OMAP_OSK @@ -21,3 +29,44 @@ config SND_OMAP_SOC_OSK5912 select SND_SOC_TLV320AIC23 help Say Y if you want to add support for SoC audio on osk5912. + +config SND_OMAP_SOC_OVERO + tristate "SoC Audio support for Gumstix Overo" + depends on SND_OMAP_SOC && MACH_OVERO + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the Gumstix Overo. + +config SND_OMAP_SOC_3430SDP + tristate "SoC Audio support for OMAP 3430SDP" + depends on SND_OMAP_SOC && MACH_OMAP_3430SDP + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the OMAP 3430SDP. + +config SND_OMAP_SOC_LDP + tristate "SoC Audio support for OMAP ZOOM SDK" + depends on SND_OMAP_SOC && MACH_OMAP_LDP + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the OMAP ZOOM MDK. + +config SND_OMAP_SOC_OMAP2EVM + tristate "SoC Audio support for OMAP2EVM" + depends on SND_OMAP_SOC && MACH_OMAP2EVM + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the OMAP2EVM. + +config SND_OMAP_SOC_OMAP3EVM + tristate "SoC Audio support for OMAP3EVM" + depends on SND_OMAP_SOC && MACH_OMAP3EVM + select SND_OMAP_SOC_MCBSP + select SND_SOC_TWL4030 + help + Say Y if you want to add support for SoC audio on the OMAP3EVM. + diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index e09d1f2..de9163b 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -7,7 +7,20 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o # OMAP Machine Support snd-soc-n810-objs := n810.o +snd-soc-omap3beagle-objs := omap-general.o snd-soc-osk5912-objs := osk5912.o +snd-soc-overo-objs := omap-general.o +snd-soc-3430sdp-objs := omap-general.o +snd-soc-ldp-objs := omap-general.o +snd-soc-omap2evm-objs := omap-general.o +snd-soc-omap3evm-objs := omap-general.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o +obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o +obj-$(CONFIG_SND_OMAP_SOC_3430SDP) += snd-soc-3430sdp.o +obj-$(CONFIG_SND_OMAP_SOC_LDP) += snd-soc-ldp.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o + diff --git a/sound/soc/omap/omap-general.c b/sound/soc/omap/omap-general.c new file mode 100644 index 0000000..a3fa647 --- /dev/null +++ b/sound/soc/omap/omap-general.c @@ -0,0 +1,155 @@ +/* + * omap-general.c -- OMAP SoC general machine file. + * + * Author: Stanley Miao <stanley.miao(a)windriver.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include <asm/mach-types.h> +#include <mach/hardware.h> +#include <mach/gpio.h> +#include <mach/mcbsp.h> + +#include "omap-mcbsp.h" +#include "omap-pcm.h" +#include "omap-general.h" + +static int general_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + int ret; + + /* Set codec DAI configuration */ + ret = snd_soc_dai_set_fmt(codec_dai, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set codec DAI configuration\n"); + return ret; + } + + /* Set cpu DAI configuration */ + ret = snd_soc_dai_set_fmt(cpu_dai, + SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM); + if (ret < 0) { + printk(KERN_ERR "can't set cpu DAI configuration\n"); + return ret; + } + + /* Set the codec system clock for DAC and ADC */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, CODEC_SYS_CLOCK, + SND_SOC_CLOCK_IN); + if (ret < 0) { + printk(KERN_ERR "can't set codec system clock\n"); + return ret; + } + + return 0; +} + +static struct snd_soc_ops general_ops = { + .startup = SOC_OPS_STARTUP, + .shutdown = SOC_OPS_SHUTDOWN, + .hw_params = general_hw_params, +}; + +/* Digital audio interface glue - connects codec <--> CPU */ +static struct snd_soc_dai_link general_dai = { + .name = CODEC_NAME, + .stream_name = STREAM_NAME, + .cpu_dai = &omap_mcbsp_dai[0], + .codec_dai = CODEC_DAI, + .ops = &general_ops, + .init = DAI_LINK_INIT, +}; + +/* Audio machine driver */ +static struct snd_soc_machine snd_soc_omap_general = { + .name = "omap_general", + .dai_link = &general_dai, + .num_links = 1, +}; + +/* Audio subsystem */ +static struct snd_soc_device general_snd_devdata = { + .machine = &snd_soc_omap_general, + .platform = &omap_soc_platform, + .codec_dev = CODEC_DEV, + .codec_data = CODEC_SETUP_DATA, +}; + +static struct platform_device *general_snd_device; + +static int __init general_soc_init(void) +{ + int ret; + + if (!MACHINE_IS_OMAP_GENERAL) { + pr_debug("Not supported board!\n"); + return -ENODEV; + } + printk(KERN_INFO "OMAP General SoC init\n"); + + general_snd_device = platform_device_alloc("soc-audio", -1); + if (!general_snd_device) { + printk(KERN_ERR "Platform device allocation failed\n"); + return -ENOMEM; + } + + platform_set_drvdata(general_snd_device, &general_snd_devdata); + general_snd_devdata.dev = &general_snd_device->dev; + *(unsigned int *)general_dai.cpu_dai->private_data = 1; /* McBSP2 */ + + ret = platform_device_add(general_snd_device); + if (ret) + goto err1; + ret = omap_board_soc_init(general_snd_device); + if (ret) + goto err1; + + return 0; + +err1: + platform_device_put(general_snd_device); + + return ret; +} +module_init(general_soc_init); + +static void __exit general_soc_exit(void) +{ + omap_board_soc_exit(general_snd_device); + platform_device_unregister(general_snd_device); +} +module_exit(general_soc_exit); + +MODULE_AUTHOR("Stanley Miao <stanley.miao(a)windriver.com>"); +MODULE_DESCRIPTION("ALSA SoC OMAP GENERAL"); +MODULE_LICENSE("GPL"); diff --git a/sound/soc/omap/omap-general.h b/sound/soc/omap/omap-general.h new file mode 100644 index 0000000..8b9515c --- /dev/null +++ b/sound/soc/omap/omap-general.h @@ -0,0 +1,70 @@ +/* + * omap-general.h + * + * Copyright (C) 2008 Wind River Systems, Inc. + * + * Author: Stanley Miao <stanley.miao(a)windriver.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + * + */ + +#ifdef CONFIG_SND_OMAP_SOC_N810 +#include "../codecs/tlv320aic3x.h" +#define CODEC_SYS_CLOCK 12000000 +#define CODEC_NAME "TLV320AIC33" +#define STREAM_NAME "AIC33" +#define CODEC_DEV (&soc_codec_dev_aic3x) +#define CODEC_DAI (&aic3x_dai) +#define CODEC_SETUP_DATA (&&n810_aic33_setup) +#define DAI_LINK_INIT (n810_aic33_init) +#define SOC_OPS_STARTUP (n810_startup) +#define SOC_OPS_SHUTDOWN (n810_shutdown) +#else +#include "../codecs/twl4030.h" +#define CODEC_SYS_CLOCK 26000000 +#define CODEC_NAME "TWL4030" +#define STREAM_NAME "TWL4030" +#define CODEC_DEV (&soc_codec_dev_twl4030) +#define CODEC_DAI (&twl4030_dai) +#define CODEC_SETUP_DATA NULL +#define DAI_LINK_INIT NULL +#define SOC_OPS_STARTUP NULL +#define SOC_OPS_SHUTDOWN NULL +#endif /* CONFIG_SND_OMAP_SOC_N810 */ + +#ifdef CONFIG_SND_OMAP_SOC_N810 +#define MACHINE_IS_OMAP_GENERAL (machine_is_nokia_n810() || machine_is_nokia_n810_wimax()) +#elif defined(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) +#define MACHINE_IS_OMAP_GENERAL machine_is_omap3_beagle() +#elif defined(CONFIG_SND_OMAP_SOC_OVERO) +#define MACHINE_IS_OMAP_GENERAL machine_is_overo() +#elif defined(CONFIG_SND_OMAP_SOC_3430SDP) +#define MACHINE_IS_OMAP_GENERAL machine_is_omap_3430sdp() +#elif defined(CONFIG_SND_OMAP_SOC_LDP) +#define MACHINE_IS_OMAP_GENERAL machine_is_omap_ldp() +#elif defined(CONFIG_SND_OMAP_SOC_OMAP2EVM) +#define MACHINE_IS_OMAP_GENERAL machine_is_omap2evm() +#elif defined(CONFIG_SND_OMAP_SOC_OMAP3EVM) +#define MACHINE_IS_OMAP_GENERAL machine_is_omapevm() +#endif + +#ifndef omap_board_soc_init +#define omap_board_soc_init(x) 0 +#endif +#ifndef omap_board_soc_exit +#define omap_board_soc_exit +#endif + -- 1.5.6.3

8 15

Re: [alsa-devel] [PATCH] OMAP general SOC driver.
by Mark Brown 27 Nov '08

27 Nov '08

On Thu, Nov 27, 2008 at 12:42:12PM +0200, Grazvydas Ignotas wrote: > Pandora board uses different master/slave configuration for McBSP bus, > compared to most other boards. It also has another audio path (in > addition to TWL4030) - another McBSP link connected to external DAC. > The DAC needs 256*Fs clock from TWL4030 to function, and is used for > main audio output. TWL4030 is to be used for 2 MIC + line inputs only, > and has no outputs connected. This definitely needs to be a separate machine driver. > I have main audio path working (McBSP2 to DAC), but not inputs (McBSP4 > to TWL4030). How can this be implemented using current framework? > Should I register 2 platform devices? Sorry for possible derail or > stupid questions. This should all be one ASoC device, especially given that the fact that all the paths use the TWL4030 somehow. Have a look at how, eg, the neo1973 driver handles the bluetooth. For now there's not *particularly* sane support for multiple codecs. Does the DAC have any software control? If not it should be fairly straightforward to handle.

1 0

[alsa-devel] Alsa Driver Development - General Concepts
by karl＠lil-voodoo.co.uk 27 Nov '08

27 Nov '08

Hi, I've got a couple of audio/midi devices knocking around that I'd quite like to add ALSA support for (for use in Linux sequencers/DAWs) so I've been reading up on Linux device drivers and Alsa driver development. I do have a programming background but unfortunately, I'm a little confused on a couple of points and I was hoping someone wouldn't mind helping me out. I'm kind of basing my thoughts on the idea that I have a USB device which is not recognised by the kernel and does not expose a known midi interface (so requires a completely new Alsa driver?). The goal would be for this device to be usable in Linux midi sequencers. - How does the Alsa driver communicate with the hardware? Would I need to write a Kernel driver (e.g. a character device) for the Alsa driver to talk to? - Would my Alsa driver basically create a card instance and then a RawMidi component? I'm assuming the use of RawMidi would then allow applications to recognise the Alsa driver as a seemingly ordinary midi port??? Then implement _input_trigger() and _output_trigger() to exchange data with the application, whilst passing data to/from the kernel driver to talk to the hardware? Sorry if I'm way off base. I'm trying to get in on this thing to help spread some extra Linux love in music world. Many thanks.

4 3

[alsa-devel] [PATCH] cleanup controllers in snd-usb-caiaq
by Daniel Mack 27 Nov '08

27 Nov '08

Hi, this patch does some code cleanup in snd-usb-caiaq. No functional change whatsoever. Version number bumped to 1.3.9. Best regards, Daniel

2 5

[alsa-devel] Alsa driver won't compile on Ubuntu kernel 2.6.24-16-generic
by Klaus Schulz 27 Nov '08

27 Nov '08

Hi there. I issued this TT some time ago. Could anybody have a look into it - please! There a quite some people running Ubuntu and still 2.6.24 kernels, who'd love to get an ALSA upgrade in place THX Klaus

2 2

[alsa-devel] [PATCH] Allow more routing features for tlv320aic3x
by Daniel Mack 26 Nov '08

26 Nov '08

Hi, this patch adds more routing possibilities to the tlv320aic3x code driver. Stereo mixers are, as dicussed earlier, not appropriate due to the versatile channel functions of this rather complex chip. Best regards, Daniel

2 6