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

[alsa-devel] [PATCH] ASoC: Fix build dependency for SND_AT91_SOC_AFEB9260
by Axel Lin 10 Jan '12

10 Jan '12

Make SND_AT91_SOC_AFEB9260 depend on ATMEL_SSC to fix below build errors: LD .tmp_vmlinux1 sound/built-in.o: In function `atmel_ssc_remove': sound/soc/atmel/atmel_ssc_dai.c:713: undefined reference to `ssc_free' sound/built-in.o: In function `atmel_ssc_probe': sound/soc/atmel/atmel_ssc_dai.c:700: undefined reference to `ssc_request' sound/built-in.o: In function `atmel_ssc_set_audio': sound/soc/atmel/atmel_ssc_dai.c:845: undefined reference to `ssc_request' sound/soc/atmel/atmel_ssc_dai.c:851: undefined reference to `ssc_free' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- This patch replaces "[PATCH] ASoC: Fix build dependency for SND_ATMEL_SOC_SSC". sound/soc/atmel/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index d1fcc81..72b09cf 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -26,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 config SND_AT91_SOC_AFEB9260 tristate "SoC Audio support for AFEB9260 board" - depends on ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC + depends on ATMEL_SSC && ARCH_AT91 && MACH_AFEB9260 && SND_ATMEL_SOC select SND_ATMEL_SOC_SSC select SND_SOC_TLV320AIC23 help -- 1.7.5.4

2 1

[alsa-devel] [PATCH] ASoC: Fix recursive dependency for SND_ATMEL_SOC_SSC
by Fabio Estevam 10 Jan '12

10 Jan '12

commit 739be96 (ASoC: Fix build dependency for SND_ATMEL_SOC_SSC) introduced the following recursive dependency: drivers/misc/Kconfig:212:error: recursive dependency detected! drivers/misc/Kconfig:212: symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC sound/soc/atmel/Kconfig:9: symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731 sound/soc/atmel/Kconfig:18: symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC Fix it by moving ATMEL_SSC to the 'depends' line. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- This applies against linux-next and doing a 'make randconfig' triggers the error. sound/soc/atmel/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index a4d6742..509b152 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -8,8 +8,7 @@ config SND_ATMEL_SOC config SND_ATMEL_SOC_SSC tristate - depends on SND_ATMEL_SOC - select ATMEL_SSC + depends on SND_ATMEL_SOC && ATMEL_SSC help Say Y or M if you want to add support for codecs the ATMEL SSC interface. You will also needs to select the individual -- 1.7.1

2 1

[alsa-devel] [PATCH v2] ASoC: Fix recursive dependency for SND_AT91_SOC_SAM9G20_WM8731
by Fabio Estevam 10 Jan '12

10 Jan '12

commit 739be96 (ASoC: Fix build dependency for SND_ATMEL_SOC_SSC) introduced the following recursive dependency: drivers/misc/Kconfig:212:error: recursive dependency detected! drivers/misc/Kconfig:212: symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC sound/soc/atmel/Kconfig:9: symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731 sound/soc/atmel/Kconfig:18: symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC Fix it by moving ATMEL_SSC to the 'depends' line. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- This applies against linux-next and doing a 'make randconfig' triggers the error. Change since v1: - Get rid of the recursive errors by fixing SND_AT91_SOC_SAM9G20_WM8731 sound/soc/atmel/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index a4d6742..bb49b7d 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -17,8 +17,7 @@ config SND_ATMEL_SOC_SSC config SND_AT91_SOC_SAM9G20_WM8731 tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" - depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \ - AT91_PROGRAMMABLE_CLOCKS + depends on ARCH_AT91SAM9G20 && AT91_PROGRAMMABLE_CLOCKS select SND_ATMEL_SOC_SSC select SND_SOC_WM8731 help -- 1.7.1

2 1

[alsa-devel] Public ridicule due to sound/soc/soc-core.c abuse of the driver model
by Greg KH 10 Jan '12

10 Jan '12

Hi Frank, Liam, and sound maintainers. It was recently pointed out to me that the sound/soc/soc-core.c is flagrantly abusing the driver model by providing "empty" release functions, just to keep the kernel from complaining: /* stop no dev release warning */ static void soc_ac97_device_release(struct device *dev){} .... static void rtd_release(struct device *dev) {} As per the documentation in the kernel tree[1], I now get to publicly mock you for thinking you know better than the driver model. Come on people, do you think that I wrote the code in the kernel that produces those errors just for fun? It was telling you to fix your code by providing a function to free the structure that is being released, not to try to trick the kernel because you think you know better. The kernel was trying to help you out here, to get the programming model correct, in a place that was commonly misunderstood. But, by you trying to be "smart", you just proved that your code was incorrect and buggy. Please fix this for the 3.3 kernel release. Yes, I know it's been there for a number of years, but that still doesn't make it correct. Especially as stuff like this tends to get cut-and-pasted over time. thanks, greg k-h [1] Documentation/kobject.txt

3 14

[alsa-devel] [PATCH] ASoC: core - Improve card registration error messaging for large DAI links.
by Liam Girdwood 09 Jan '12

09 Jan '12

Print out the offending DAI link entry when a naming error occurs. Makes thing easier to debug for machines with a large number of DAI links. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-core.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index acbb960..e1d8433 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2854,7 +2854,8 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (!!link->codec_name == !!link->codec_of_node) { dev_err(card->dev, - "Neither/both codec name/of_node are set\n"); + "Neither/both codec name/of_node are set for %s\n", + link->name); return -EINVAL; } @@ -2864,7 +2865,7 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (link->platform_name && link->platform_of_node) { dev_err(card->dev, - "Both platform name/of_node are set\n"); + "Both platform name/of_node are set for %s\n", link->name); return -EINVAL; } @@ -2874,7 +2875,8 @@ int snd_soc_register_card(struct snd_soc_card *card) */ if (!!link->cpu_dai_name == !!link->cpu_dai_of_node) { dev_err(card->dev, - "Neither/both cpu_dai name/of_node are set\n"); + "Neither/both cpu_dai name/of_node are set for %s\n", + link->name); return -EINVAL; } } -- 1.7.5.4

2 1

[alsa-devel] [PATCH] ASoC: Dynamically allocate the rtd device for a non-empty release
by Mark Brown 09 Jan '12

09 Jan '12

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Greg, you asked for this to be included in 3.3 but I really don't see any reason for doing so - this isn't exactly new code and there aren't any practical issues being reported. Is there any actual rush? include/sound/soc.h | 6 +++--- sound/soc/soc-core.c | 34 +++++++++++++++++++++------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index a7425e9..0a56767 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -862,7 +862,7 @@ struct snd_soc_card { /* SoC machine DAI configuration, glues a codec and cpu DAI together */ struct snd_soc_pcm_runtime { - struct device dev; + struct device *dev; struct snd_soc_card *card; struct snd_soc_dai_link *dai_link; struct mutex pcm_mutex; @@ -954,12 +954,12 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd, void *data) { - dev_set_drvdata(&rtd->dev, data); + dev_set_drvdata(rtd->dev, data); } static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd) { - return dev_get_drvdata(&rtd->dev); + return dev_get_drvdata(rtd->dev); } static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index dcc4b62..9d8a631 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -884,9 +884,9 @@ static void soc_remove_dai_link(struct snd_soc_card *card, int num, int order) /* unregister the rtd device */ if (rtd->dev_registered) { - device_remove_file(&rtd->dev, &dev_attr_pmdown_time); - device_remove_file(&rtd->dev, &dev_attr_codec_reg); - device_unregister(&rtd->dev); + device_remove_file(rtd->dev, &dev_attr_pmdown_time); + device_remove_file(rtd->dev, &dev_attr_codec_reg); + device_unregister(rtd->dev); rtd->dev_registered = 0; } @@ -1061,7 +1061,10 @@ err_probe: return ret; } -static void rtd_release(struct device *dev) {} +static void rtd_release(struct device *dev) +{ + kfree(dev); +} static int soc_post_component_init(struct snd_soc_card *card, struct snd_soc_codec *codec, @@ -1104,11 +1107,16 @@ static int soc_post_component_init(struct snd_soc_card *card, /* register the rtd device */ rtd->codec = codec; - rtd->dev.parent = card->dev; - rtd->dev.release = rtd_release; - rtd->dev.init_name = name; + + rtd->dev = kzalloc(sizeof(struct device), GFP_KERNEL); + if (!rtd->dev) + return -ENOMEM; + device_initialize(rtd->dev); + rtd->dev->parent = card->dev; + rtd->dev->release = rtd_release; + rtd->dev->init_name = name; mutex_init(&rtd->pcm_mutex); - ret = device_register(&rtd->dev); + ret = device_add(rtd->dev); if (ret < 0) { dev_err(card->dev, "asoc: failed to register runtime device: %d\n", ret); @@ -1117,14 +1125,14 @@ static int soc_post_component_init(struct snd_soc_card *card, rtd->dev_registered = 1; /* add DAPM sysfs entries for this codec */ - ret = snd_soc_dapm_sys_add(&rtd->dev); + ret = snd_soc_dapm_sys_add(rtd->dev); if (ret < 0) dev_err(codec->dev, "asoc: failed to add codec dapm sysfs entries: %d\n", ret); /* add codec sysfs entries */ - ret = device_create_file(&rtd->dev, &dev_attr_codec_reg); + ret = device_create_file(rtd->dev, &dev_attr_codec_reg); if (ret < 0) dev_err(codec->dev, "asoc: failed to add codec sysfs files: %d\n", ret); @@ -1213,7 +1221,7 @@ static int soc_probe_dai_link(struct snd_soc_card *card, int num, int order) if (ret) return ret; - ret = device_create_file(&rtd->dev, &dev_attr_pmdown_time); + ret = device_create_file(rtd->dev, &dev_attr_pmdown_time); if (ret < 0) printk(KERN_WARNING "asoc: failed to add pmdown_time sysfs\n"); @@ -1311,8 +1319,8 @@ static void soc_remove_aux_dev(struct snd_soc_card *card, int num) /* unregister the rtd device */ if (rtd->dev_registered) { - device_remove_file(&rtd->dev, &dev_attr_codec_reg); - device_unregister(&rtd->dev); + device_remove_file(rtd->dev, &dev_attr_codec_reg); + device_del(rtd->dev); rtd->dev_registered = 0; } -- 1.7.7.3

2 2

Re: [alsa-devel] linux-next: Tree for Jan 9 (sound/soc vs. drivers/misc)
by Randy Dunlap 09 Jan '12

09 Jan '12

On 01/08/2012 10:04 PM, Stephen Rothwell wrote: > Hi all, > > Changes since 20120106: > > This tree is still broken for sparc64 defconfig (at least). AFAICT, all builds (on X86_32 or X86_64) have this kconfig warning: drivers/misc/Kconfig:212:error: recursive dependency detected! drivers/misc/Kconfig:212: symbol ATMEL_SSC is selected by SND_ATMEL_SOC_SSC sound/soc/atmel/Kconfig:9: symbol SND_ATMEL_SOC_SSC is selected by SND_AT91_SOC_SAM9G20_WM8731 sound/soc/atmel/Kconfig:18: symbol SND_AT91_SOC_SAM9G20_WM8731 depends on ATMEL_SSC -- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***

1 0

[alsa-devel] [PATCH] ASoC: Route Mic Bias in Visstrim_M10 board.
by Javier Martin 09 Jan '12

09 Jan '12

Visstrim_M10 board uses an external microphone that can be enabled/disabled by the user. Signed-off-by: Javier Martin <javier.martin(a)vista-silicon.com> --- sound/soc/imx/mx27vis-aic32x4.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/sound/soc/imx/mx27vis-aic32x4.c b/sound/soc/imx/mx27vis-aic32x4.c index 054110b..7e55a99 100644 --- a/sound/soc/imx/mx27vis-aic32x4.c +++ b/sound/soc/imx/mx27vis-aic32x4.c @@ -74,6 +74,43 @@ static struct snd_soc_ops mx27vis_aic32x4_snd_ops = { .hw_params = mx27vis_aic32x4_hw_params, }; +static const struct snd_kcontrol_new mx27vis_aic32x4_controls[] = { + SOC_DAPM_PIN_SWITCH("External Mic"), +}; + +static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = { + SND_SOC_DAPM_MIC("External Mic", NULL), +}; + +static const struct snd_soc_dapm_route audio_map[] = { + {"Mic Bias", NULL, "External Mic"}, + {"IN1_R", NULL, "Mic Bias"}, + {"IN2_R", NULL, "Mic Bias"}, + {"IN3_R", NULL, "Mic Bias"}, + {"IN1_L", NULL, "Mic Bias"}, + {"IN2_L", NULL, "Mic Bias"}, + {"IN3_L", NULL, "Mic Bias"}, +}; + +static int mx27vis_aic32x4_dai_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_dapm_context *dapm = &codec->dapm; + int err = 0; + + snd_soc_dapm_new_controls(dapm, aic32x4_dapm_widgets, + ARRAY_SIZE(aic32x4_dapm_widgets)); + + err = snd_soc_add_controls(codec, mx27vis_aic32x4_controls, + ARRAY_SIZE(mx27vis_aic32x4_controls)); + if (err < 0) + return err; + + snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); + + return 0; +} + static struct snd_soc_dai_link mx27vis_aic32x4_dai = { .name = "tlv320aic32x4", .stream_name = "TLV320AIC32X4", @@ -82,6 +119,7 @@ static struct snd_soc_dai_link mx27vis_aic32x4_dai = { .codec_name = "tlv320aic32x4.0-0018", .cpu_dai_name = "imx-ssi.0", .ops = &mx27vis_aic32x4_snd_ops, + .init = mx27vis_aic32x4_dai_init, }; static struct snd_soc_card mx27vis_aic32x4 = { -- 1.7.0.4

2 1

[alsa-devel] hdsp: potential oops in snd_hdsp_info_pref_sync_ref()
by Dan Carpenter 09 Jan '12

09 Jan '12

My static check complains that there is a potential oops here but I'm not sure what the correct fix is. sound/pci/rme9652/hdsp.c 2631 switch (hdsp->io_type) { 2632 case Digiface: 2633 case H9652: 2634 uinfo->value.enumerated.items = 6; 2635 break; 2636 case Multiface: 2637 uinfo->value.enumerated.items = 4; 2638 break; 2639 case H9632: 2640 uinfo->value.enumerated.items = 3; 2641 break; 2642 default: 2643 uinfo->value.enumerated.items = 0; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ We set this to zero here. 2644 break; 2645 } 2646 2647 if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ enumerated.item is unsigned int so it's always greater or equal to zero. 2648 uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1; We set it to UINT_MAX here. 2649 strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Reading UINT_MAX beyond the end of the array here will probably oops. 2650 return 0; There is a similar issue in snd_asihpi_cmode_info(). regards, dan carpenter

2 1

[alsa-devel] patch for jack plugin
by Fons Adriaensen 09 Jan '12

09 Jan '12

The following patch will make snd_pcm_poll_descriptors_revents() return the correct value when used on a jack plugin device. The current version returns POLLIN regardless of capture or playback. --- pcm_jack_orig.c 2011-12-29 16:42:07.000000000 +0100 +++ pcm_jack.c 2011-12-29 16:51:18.000000000 +0100 @@ -77,17 +77,18 @@ return 0; } -static int snd_pcm_jack_poll_revents(snd_pcm_ioplug_t *io ATTRIBUTE_UNUSED, +static int snd_pcm_jack_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfds, unsigned int nfds, unsigned short *revents) { static char buf[1]; assert(pfds && nfds == 1 && revents); - read(pfds[0].fd, buf, 1); - - *revents = pfds[0].revents; + *revents = pfds[0].revents & ~(POLLIN | POLLOUT); + if (pfds[0].revents & POLLIN) { + *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN; + } return 0; } Ciao, -- FA Vor uns liegt ein weites Tal, die Sonne scheint - ein Glitzerstrahl.

2 1