March 2010 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] ASoC updates for 2.6.34
by Mark Brown 30 Mar '10

30 Mar '10

The following changes since commit 3cc4e53f86dab635166929bfa47cc68d59b28c26: Mark Brown (1): ASoC: Remove BROKEN from i.MX audio after dependencies merged are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.34 A couple of fairly straightforward bug fixes. The ac97 patch is mildly invasive but it tested OK for me (and should be very obvious if it fails). Dan Carpenter (1): ASoC: wm8994: playback => capture Graham Gower (1): ASoC: Fix passing platform_data to ac97 bus users and fix a leak sound/soc/codecs/ac97.c | 15 +++++++++------ sound/soc/codecs/wm8994.c | 2 +- sound/soc/soc-core.c | 3 ++- 3 files changed, 12 insertions(+), 8 deletions(-)

2 1

[alsa-devel] digiface vs. multiface vs. jack vs. other cards
by Fernando Lopez-Lezcano 30 Mar '10

30 Mar '10

At CCRMA we have several studios with linux computers in them (in addition to computers sprinkled throughout the building). Some of the studios have digiface interfaces, some multiface. All of them are connected to the sound system or mixer digitally through adat lightpipes. Workstations have Delta 66 or Gina3G soundcards. It would be nice for a user to be able to play, say, a stereo Ardour session in any of them without any changes to the session or routing. The digifaces send channels 1-24 out the adat ports. The multifaces on the other hand send 9-16 on the adat port. Deltas and Ginas send out stuff on channels 1-4 or 1-6. You can see the multiface interfaces are a problem. To get sound out of them you have to send on channels 9-16 which is different from _all_ others! I tried several workarounds without much success: a) fix this at the alsa level. Should be the way to go, right? Create an /etc/asound.conf that uses ttable to translate channels for the multifaces so that the digital out is actually sent through channels 1-8 (and create the same name plug interface in all other computers that does nothing so that the user can set that name as the default in qjackctl and will get the same behavior in all computers). Works, but not quite. When I try to use that "fake" plug interface with jack2 I get a warning that I'm using a plug interface (sort of fair) and jack only opens it with _2_ i/o channels (even though the ttable is 18 channels wide!). If I _force_ input and output channels in jack to 18 it does work fine. But now it will _not_ work on other computers that have less (or more) than 18 channels. Argh. b) fix it in hdspmixer. Well, it turns out that hdspmixer does not read the default matrix gains from a file so I can't really override the default. AFAICT the gains are calculated algorithmically in the code and there is no command line option to load presets from a file. Or I could write a small script that will set the right gains for 1-8 to go out through 9-16 but if a user starts hdspmixer that gets undone with no warning. And, of course: c) give up and connect an 8 channel analog snake to the analog outputs of the multifaces and do away with a digital connection to the mixer... Anyone has any other suggestions?? This should be easy to fix, right? :-) -- Fernando

2 1

[alsa-devel] [PATCH] ad193x: move codec register/unregister to bus probe/remove
by Barry Song 29 Mar '10

29 Mar '10

The way i've factored out the bus probe and removal functions so that there's no code in the individual I2C and SPI functions means that the register() and unregister() functions could just be squashed into the bus_probe() and bus_remove() functions. Signed-off-by: Barry Song <21cnbao(a)gmail.com> --- sound/soc/codecs/ad193x.c | 102 +++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 58 deletions(-) diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index d034464..e6fe8ac 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -34,8 +34,6 @@ static const u8 ad193x_reg[AD193X_NUM_REGS] = { static struct snd_soc_codec *ad193x_codec; struct snd_soc_codec_device soc_codec_dev_ad193x; -static int ad193x_register(struct ad193x_priv *ad193x, int bus_type); -static void ad193x_unregister(struct ad193x_priv *ad193x); /* * AD193X volume/mute/de-emphasis etc. controls @@ -289,69 +287,23 @@ static int ad193x_bus_probe(struct device *dev, void *ctrl_data, int bus_type) { struct snd_soc_codec *codec; struct ad193x_priv *ad193x; + int ret; + + if (ad193x_codec) { + dev_err(dev, "Another ad193x is registered\n"); + return -EINVAL; + } ad193x = kzalloc(sizeof(struct ad193x_priv), GFP_KERNEL); if (ad193x == NULL) return -ENOMEM; - codec = &ad193x->codec; - codec->control_data = ctrl_data; - codec->dev = dev; - dev_set_drvdata(dev, ad193x); - return ad193x_register(ad193x, bus_type); -} - -static int ad193x_bus_remove(struct device *dev) -{ - struct ad193x_priv *ad193x = dev_get_drvdata(dev); - - ad193x_unregister(ad193x); - return 0; -} - -static struct snd_soc_dai_ops ad193x_dai_ops = { - .hw_params = ad193x_hw_params, - .digital_mute = ad193x_mute, - .set_tdm_slot = ad193x_set_tdm_slot, - .set_fmt = ad193x_set_dai_fmt, -}; - -/* codec DAI instance */ -struct snd_soc_dai ad193x_dai = { - .name = "AD193X", - .playback = { - .stream_name = "Playback", - .channels_min = 2, - .channels_max = 8, - .rates = SNDRV_PCM_RATE_48000, - .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE, - }, - .capture = { - .stream_name = "Capture", - .channels_min = 2, - .channels_max = 4, - .rates = SNDRV_PCM_RATE_48000, - .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE | - SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE, - }, - .ops = &ad193x_dai_ops, -}; -EXPORT_SYMBOL_GPL(ad193x_dai); - -static int ad193x_register(struct ad193x_priv *ad193x, int bus_type) -{ - int ret; - struct snd_soc_codec *codec = &ad193x->codec; - - if (ad193x_codec) { - dev_err(codec->dev, "Another ad193x is registered\n"); - return -EINVAL; - } - + codec = &ad193x->codec; mutex_init(&codec->mutex); + codec->control_data = ctrl_data; + codec->dev = dev; codec->private_data = ad193x; codec->reg_cache = ad193x->reg_cache; codec->reg_cache_size = AD193X_NUM_REGS; @@ -412,14 +364,48 @@ static int ad193x_register(struct ad193x_priv *ad193x, int bus_type) return 0; } -static void ad193x_unregister(struct ad193x_priv *ad193x) +static int ad193x_bus_remove(struct device *dev) { + struct ad193x_priv *ad193x = dev_get_drvdata(dev); + snd_soc_unregister_dai(&ad193x_dai); snd_soc_unregister_codec(&ad193x->codec); kfree(ad193x); ad193x_codec = NULL; + + return 0; } +static struct snd_soc_dai_ops ad193x_dai_ops = { + .hw_params = ad193x_hw_params, + .digital_mute = ad193x_mute, + .set_tdm_slot = ad193x_set_tdm_slot, + .set_fmt = ad193x_set_dai_fmt, +}; + +/* codec DAI instance */ +struct snd_soc_dai ad193x_dai = { + .name = "AD193X", + .playback = { + .stream_name = "Playback", + .channels_min = 2, + .channels_max = 8, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 2, + .channels_max = 4, + .rates = SNDRV_PCM_RATE_48000, + .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE, + }, + .ops = &ad193x_dai_ops, +}; +EXPORT_SYMBOL_GPL(ad193x_dai); + static int ad193x_probe(struct platform_device *pdev) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); -- 1.5.6.3

3 2

[alsa-devel] Volume levels with Geode LX/CS5536
by Valentin 29 Mar '10

29 Mar '10

Hi, the maximum volume level (100%) on my soundcard for the PCM mixer is 12.0dB instead of 0.0dB. Is there a way for me to fix this, or help fixing it? crimsun on freenode/#alsa told me to ask you guys :) My alsa-info.sh output is at http://0au.de/~apo/p/ai.txt Cheers, Valentin

2 1

[alsa-devel] bug in spi and i2c dual buses codecs
by Barry Song 29 Mar '10

29 Mar '10

Hi Mark/Liam, I think there is really a bug in spi and i2c dual buses codecs drivers, for example, for any codec with two buses, if you config kernel like this: SPI MASTER built-in I2C module Codec built-in You will get a link error like this: sound/built-in.o: In function `i2c_add_driver': include/linux/i2c.h:423: undefined reference to `i2c_register_driver' sound/built-in.o: In function `ad193x_modexit': sound/soc/codecs/ad193x.c:537: undefined reference to `i2c_del_driver' make: *** [.tmp_vmlinux1] Error 1 I remember that is also one reason why we have splitted this kind of driver into three parts(codec core, i2c bus, spi bus). In fact, if any bus is compiled as module and code is built-in, link error will be reported. Thanks Barry

3 4

[alsa-devel] Soundcard Detection problem (ALSA regression)
by Gregory T Flynn 29 Mar '10

29 Mar '10

So far I have tested the current stable drive and now the current snapshot, both to no avail. The last ALSA driver version that worked on this sound card was 1.0.18. General Info from the 1.0.18 driver: !!PCI Soundcards installed in the system !!-------------------------------------- 00:10.1 Audio device: nVidia Corporation MCP51 High Definition Audio (rev a2) !!Advanced information - PCI Vendor/Device/Susbsystem ID's !!-------------------------------------------------------- 00:10.1 0403: 10de:026c (rev a2) Subsystem: 1462:373d Currently I'm running Ubuntu 10.04 beta1 and this sounds regression (which was also in 9.10) is my only problem with the new system. So it would be awesome to get solved and packed into the beta before release. more details in bug report: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4967 -- - Greg Flynn

1 0

[alsa-devel] sound: patch_realtek: truncating bits
by Dan Carpenter 29 Mar '10

29 Mar '10

Smatch complains that we are truncating bits here: sound/pci/hda/patch_realtek.c +12459 alc268_aspire_one_speaker_automute(6) warn: value 28800 can't fit into 255 'bits' sound/pci/hda/patch_realtek.c +13482 alc269_quanta_fl1_speaker_automute(6) warn: value 28800 can't fit into 255 'bits' sound/pci/hda/patch_realtek.c +13511 alc269_lifebook_speaker_automute(11) warn: value 28800 can't fit into 255 'bits' sound/pci/hda/patch_realtek.c +13646 alc269_speaker_automute(8) warn: value 28800 can't fit into 255 'bits' The code looks like this: 13643 unsigned char bits; 13644 13645 present = snd_hda_jack_detect(codec, nid); 13646 bits = present ? AMP_IN_MUTE(0) : 0; "bits" is declared as an unsigned char but AMP_IN_MUTE(0) is 0x7080 so we are only using the last 0x80. I couldn't figure out if it was intended. This was first introduced by this commit which change "bits" from unsigned int to unsigned char. commit 60db6b53fb43421beb2ff3fe3e63412bf81620aa Author: Kailang Yang <kailang(a)realtek.com> Date: Tue Aug 26 13:13:00 2008 +0200 ALSA: hda - Add support of Quanta FL1 Added the support of Quanta FL1 with ALC269 code chip. Also a bit space clean-ups. If this is intentional, it would be cleaner to explicitly cast or mask away the bits we don't care about. regards, dan carpenter

2 1

[alsa-devel] [PATCH] ALSA: hda: Use LPIB for ga-ma770-ud3 board
by Daniel Chen 29 Mar '10

29 Mar '10

Hi, Attached is a patch against current sound-2.6 master HEAD (also applicable to 2.6.32.y and 2.6.33.y) that makes the OR's audio more tolerable with PulseAudio. Best, -Dan

2 1

[alsa-devel] [PATCH] ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
by Daniel Chen 29 Mar '10

29 Mar '10

Hi, Attached is a patch against sound-2.6 (also applicable to 2.6.32.y and 2.6.33.y) adding the OR's SSID to ad1981_jacks_blacklist for audible audio by default. Best, -Dan

2 1

[alsa-devel] [PATCH 2/4 v2] ASoC: fsi: Add FIFO size calculate
by Kuninori Morimoto 29 Mar '10

29 Mar '10

Signed-off-by: Kuninori Morimoto <morimoto.kuninori(a)renesas.com> --- v1 -> v2 o move calculate area to fsi_fifo_init o modify fifo calculation way o Add tiny document for fifo calculation sound/soc/sh/fsi.c | 70 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 43 insertions(+), 27 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 7c295df..ae88865 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -46,8 +46,9 @@ #define MUTE 0x020C #define CLK_RST 0x0210 #define SOFT_RST 0x0214 +#define FIFO_SZ 0x0218 #define MREG_START INT_ST -#define MREG_END SOFT_RST +#define MREG_END FIFO_SZ /* DO_FMT */ /* DI_FMT */ @@ -85,6 +86,11 @@ #define IR (1 << 4) /* Interrupt Reset */ #define FSISR (1 << 0) /* Software Reset */ +/* FIFO_SZ */ +#define OUT_SZ_MASK 0x7 +#define BO_SZ_SHIFT 8 +#define AO_SZ_SHIFT 0 + #define FSI_RATES SNDRV_PCM_RATE_8000_96000 #define FSI_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE) @@ -384,9 +390,42 @@ static void fsi_clk_ctrl(struct fsi_priv *fsi, int enable) fsi_master_mask_set(master, CLK_RST, val, 0); } -static void fsi_fifo_init(struct fsi_priv *fsi, int is_play) +static void fsi_fifo_init(struct fsi_priv *fsi, + int is_play, + struct snd_soc_dai *dai) { - u32 ctrl; + struct fsi_master *master = fsi_get_master(fsi); + u32 ctrl, shift, i; + + /* get on-chip RAM capacity */ + shift = fsi_master_read(master, FIFO_SZ); + shift >>= fsi_is_port_a(fsi) ? AO_SZ_SHIFT : BO_SZ_SHIFT; + shift &= OUT_SZ_MASK; + fsi->fifo_max = 256 << shift; + dev_dbg(dai->dev, "fifo = %d words\n", fsi->fifo_max); + + /* + * The maximum number of sample data varies depending + * on the number of channels selected for the format. + * + * FIFOs are used in 4-channel units in 3-channel mode + * and in 8-channel units in 5- to 7-channel mode + * meaning that more FIFOs than the required size of DPRAM + * are used. + * + * ex) if 256 words of DP-RAM is connected + * 1 channel: 256 (256 x 1 = 256) + * 2 channels: 128 (128 x 2 = 256) + * 3 channels: 64 ( 64 x 3 = 192) + * 4 channels: 64 ( 64 x 4 = 256) + * 5 channels: 32 ( 32 x 5 = 160) + * 6 channels: 32 ( 32 x 6 = 192) + * 7 channels: 32 ( 32 x 7 = 224) + * 8 channels: 32 ( 32 x 8 = 256) + */ + for (i = 1; i < fsi->chan; i <<= 1) + fsi->fifo_max >>= 1; + dev_dbg(dai->dev, "%d channel %d store\n", fsi->chan, fsi->fifo_max); ctrl = is_play ? DOFF_CTL : DIFF_CTL; @@ -689,29 +728,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, dev_err(dai->dev, "unknown format.\n"); return -EINVAL; } - - switch (fsi->chan) { - case 1: - fsi->fifo_max = 256; - break; - case 2: - fsi->fifo_max = 128; - break; - case 3: - case 4: - fsi->fifo_max = 64; - break; - case 5: - case 6: - case 7: - case 8: - fsi->fifo_max = 32; - break; - default: - dev_err(dai->dev, "channel size error.\n"); - return -EINVAL; - } - fsi_reg_write(fsi, reg, data); /* @@ -725,7 +741,7 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream, fsi_irq_clear_status(fsi); /* fifo init */ - fsi_fifo_init(fsi, is_play); + fsi_fifo_init(fsi, is_play, dai); return ret; } -- 1.6.3.3

3 5