April 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: rt5640: Add minimal support for RT5642
by Jarkko Nikula 17 Apr '14

17 Apr '14

We have been using rt5640.c codec driver with RT5642 codec chip before commit 022d21f004c1 ("ASoC: rt5640: add rt5639 support"). That commits starts using device ID reading in reset register for adding device specific controls and routes runtime. Now since device ID appears to be different between RT5640 and RT5642 the driver doesn't add those controls and routes that are valid also on RT5642. Fix this by adding a device ID found by debugging and minimal code for supporting RT5642. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> --- sound/soc/codecs/rt5640.c | 2 ++ sound/soc/codecs/rt5640.h | 1 + 2 files changed, 3 insertions(+) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index b947c820697d..ffde5bf11789 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2000,6 +2000,7 @@ static int rt5640_probe(struct snd_soc_codec *codec) switch (snd_soc_read(codec, RT5640_RESET)) { case RT5640_RESET_ID: + case RT5642_RESET_ID: snd_soc_add_codec_controls(codec, rt5640_specific_snd_controls, ARRAY_SIZE(rt5640_specific_snd_controls)); @@ -2150,6 +2151,7 @@ static const struct regmap_config rt5640_regmap = { static const struct i2c_device_id rt5640_i2c_id[] = { { "rt5640", 0 }, { "rt5639", 0 }, + { "rt5642", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id); diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index 3b50459a83b4..d31faeaa637e 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -16,6 +16,7 @@ #define RT5639_RESET_ID 0x0008 #define RT5640_RESET_ID 0x000c +#define RT5642_RESET_ID 0x0006 /* Info */ #define RT5640_RESET 0x00 -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: fsl: Add explicit include of of.h
by Mark Brown 16 Apr '14

16 Apr '14

From: Mark Brown <broonie(a)linaro.org> Hopefully fixing a build failure reported by Stephen Rothwell - though quite why the other OF headers don't include this as well I'm not sure. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/fsl/fsl_ssi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 5428a1fda260..2fbbd8416c00 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -40,6 +40,7 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/spinlock.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -- 1.9.1

2 2

[alsa-devel] [PATCH] of: add empty of_find_node_by_path() for !OF
by Alexander Shiyan 16 Apr '14

16 Apr '14

Add an empty version of of_find_node_by_path(). This fixes following build error for asoc tree: sound/soc/fsl/fsl_ssi.c: In function 'fsl_ssi_probe': sound/soc/fsl/fsl_ssi.c:1471:2: error: implicit declaration of function 'of_find_node_by_path' [-Werror=implicit-function-declaration] sprop = of_get_property(of_find_node_by_path("/"), "compatible", NULL); Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- include/linux/of.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/of.h b/include/linux/of.h index 919bf21..3bad8d1 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -374,6 +374,11 @@ static inline struct device_node *of_find_matching_node_and_match( return NULL; } +static inline struct device_node *of_find_node_by_path(const char *path) +{ + return NULL; +} + static inline struct device_node *of_get_parent(const struct device_node *node) { return NULL; -- 1.8.3.2

3 7

[alsa-devel] [PATCH v2 linux-next] ALSA: pcm: 'BUG:' message unnecessarily triggers kerneloops
by Tim Gardner 16 Apr '14

16 Apr '14

BugLink: http://bugs.launchpad.net/bugs/1305480 The kerneloops-daemon scans dmesg for common crash signatures, among which is 'BUG:'. The message emitted by the PCM library is really a warning, so the most expedient thing to do seems to be to change the string. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Mark Brown <broonie(a)linaro.org> Cc: Lars-Peter Clausen <lars(a)metafoo.de> Cc: JongHo Kim <furmuwon(a)gmail.com> Signed-off-by: Tim Gardner <tim.gardner(a)canonical.com> --- v2: Changed string preface from "OVER RUN" to "XRUN". As Takashi pointed out, 'Use a term "XRUN", as it's not always an overrun.' sound/core/pcm_lib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index ce83def..9acc77e 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -345,7 +345,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, snd_pcm_debug_name(substream, name, sizeof(name)); xrun_log_show(substream); pcm_err(substream->pcm, - "BUG: %s, pos = %ld, buffer size = %ld, period size = %ld\n", + "XRUN: %s, pos = %ld, buffer size = %ld, period size = %ld\n", name, pos, runtime->buffer_size, runtime->period_size); } -- 1.9.1

2 1

[alsa-devel] Behringer Uphoria UMC204 usb audio capture only pops and clicks
by Andrew Reyes 16 Apr '14

16 Apr '14

>Could you send the output of 'lsusb -v', please? Here is a pastebin link to the output: -http://pastebin.com/nRULYjZh

1 0

[alsa-devel] [PATCH 00/18] ASoC: omap: Bind the omap-pcm platform driver to dai device
by Peter Ujfalusi 16 Apr '14

16 Apr '14

Hi, This should have been done a long time ago... Add support for binding the omap-pcm platform to a dai device. IN this way we can remove the 'omap-pcm-audio' platform device/driver need. The change will also going to simplify cases when we boot with DT and we can use the same node for cpu_dai and platform. Regards, Peter --- Peter Ujfalusi (18): ASoC: omap-pcm: Support for binding the platform driver to dai devices ASoC: omap-mcpdm: Assign the dai DMA data at earlier time ASoC: omap-mcpdm: Bind the platform driver to the dai driver when loading ASoC: omap-mcbsp: Assign the dai DMA data at earlier time ASoC: omap-mcbsp: Bind the platform driver to the dai driver when loading ASoC: omap-dmic: Assign the dai DMA data at earlier time ASoC: omap-dmic: Bind the platform driver to the dai driver when loading ASoC: omap-hdmi: Bind the platform driver to the dai driver when loading ASoC: omap-abe-twl6040: Use the cpu_dai node to specify the platform driver ASoC: omap-twl4030: Use the same name/node for platform as the cpu_dai ASoC: am3517evm: Use the same name for platform as the cpu_dai ASoC: ams-delta: Use the same name for platform as the cpu_dai ASoC: n810: Use the same name for platform as the cpu_dai ASoC: omap3pandora: Use the same name for platform as the cpu_dai ASoC: osk5912: Use the same name for platform as the cpu_dai ASoC: rx51: Use the same name for platform as the cpu_dai ASoC: omap-hdmi-card: Use the same name for platform as the cpu_dai ASoC: omap-pcm: Drop the platform driver init code sound/soc/omap/am3517evm.c | 2 +- sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/n810.c | 2 +- sound/soc/omap/omap-abe-twl6040.c | 8 ++------ sound/soc/omap/omap-dmic.c | 10 +++++++++- sound/soc/omap/omap-hdmi-card.c | 2 +- sound/soc/omap/omap-hdmi.c | 7 ++++++- sound/soc/omap/omap-mcbsp.c | 19 ++++++++++++------- sound/soc/omap/omap-mcpdm.c | 15 +++++++++++---- sound/soc/omap/omap-pcm.c | 25 ++++++------------------- sound/soc/omap/omap-pcm.h | 35 +++++++++++++++++++++++++++++++++++ sound/soc/omap/omap-twl4030.c | 10 ++++++++-- sound/soc/omap/omap3pandora.c | 4 ++-- sound/soc/omap/osk5912.c | 2 +- sound/soc/omap/rx51.c | 2 +- 15 files changed, 97 insertions(+), 48 deletions(-) create mode 100644 sound/soc/omap/omap-pcm.h -- 1.9.2

3 23

[alsa-devel] Using simple-card to replace kirkwood-t5325.c
by Andrew Lunn 16 Apr '14

16 Apr '14

Hi Folks I'm an ALSA newbie, so if i say anything stupid, please let me know. I'm trying to replace sound/soc/kirkwood/kirkwood-t5325.c with DT, using simple-card. I can get near, but i'm missing two things: There does not appear to be a way to represent this in DT: static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; snd_soc_dapm_enable_pin(dapm, "Mic Jack"); snd_soc_dapm_enable_pin(dapm, "Headphone Jack"); snd_soc_dapm_enable_pin(dapm, "Speaker"); return 0; } It appears that quite a few drivers need to enable pins. It also seems common to disable pins and to set them to NC. Is this a generic enough feature it could be added to the DT binding? The second thing i need is: static int t5325_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->codec_dai; unsigned int freq; freq = params_rate(params) * 256; return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN); } static struct snd_soc_ops t5325_ops = { .hw_params = t5325_hw_params, }; This seems a lot less common requirements. All the Marvell SoCs need it, but not many others. So i don't think it makes sense to add it directly to simple-card, otherwise simple-card quickly becomes complex-card as everybody else wants there quirks adding. Has there been any thoughts about turning simple-card.c into a library, or adding hooks so that a driver can modify the created dai_link structures to add in ops like this? Thanks Andrew

3 4

[alsa-devel] Behringer Uphoria UMC204 usb audio capture only pops and clicks
by Andrew Reyes 16 Apr '14

16 Apr '14

I have a usb Behringer Uphoria UMC204 and it seems to work fine at 44.1khz full duplex but anything higher than that I get consistent pops and clicks. I notice it's on the capure side of things as when I have it in playback only it's quiet. I have to say I'm testing this using JACK so this is how I noticed it on the capture only side of things. I'm not sure exactly whats needed to debug this issue. Any help would be appreciated. Thanks in advance.

2 1

[alsa-devel] Add support for headset Mic of Dell
by Kailang 16 Apr '14

16 Apr '14

Hi Takashi, Add support for Dell machine for Headset Mic support. SSID: 0x0696 and 0x0698 Thanks. BR, Kailang

2 1

[alsa-devel] [PATCH v2 1/2] ALSA: sound/atmel/ac97c.c: Convert to module_platform_driver
by Alexander Stein 16 Apr '14

16 Apr '14

This reduces some boilerplate code. Signed-off-by: Alexander Stein <alexanders83(a)web.de> Acked-by: Alexandre Belloni <alexandre.belloni(a)free-electrons.com> --- sound/atmel/ac97c.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 05ec049..a04d2317 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -1198,6 +1198,7 @@ static int atmel_ac97c_remove(struct platform_device *pdev) } static struct platform_driver atmel_ac97c_driver = { + .probe = atmel_ac97c_probe, .remove = atmel_ac97c_remove, .driver = { .name = "atmel_ac97c", @@ -1205,19 +1206,7 @@ static struct platform_driver atmel_ac97c_driver = { .pm = ATMEL_AC97C_PM_OPS, }, }; - -static int __init atmel_ac97c_init(void) -{ - return platform_driver_probe(&atmel_ac97c_driver, - atmel_ac97c_probe); -} -module_init(atmel_ac97c_init); - -static void __exit atmel_ac97c_exit(void) -{ - platform_driver_unregister(&atmel_ac97c_driver); -} -module_exit(atmel_ac97c_exit); +module_platform_driver(atmel_ac97c_driver); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Driver for Atmel AC97 controller"); -- 1.9.2

3 4