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

[alsa-devel] [PATCH] ALSA: usb-audio - Add quirk for BOSS Micro BR-80
by Kazutomo Yoshii 10 Aug '11

10 Aug '11

Signed-off-by: Kazutomo Yoshii <kazutomo.yoshii(a)gmail.com> --- sound/usb/quirks-table.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 4d4f865..a42e3ef 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1707,6 +1707,40 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + USB_DEVICE(0x0582, 0x0130), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "BOSS", */ + /* .product_name = "MICRO BR-80", */ + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 3, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, /* Guillemot devices */ { -- 1.7.6

2 1

[alsa-devel] [PATCH] ASoC: Fix typo in wm8750 spi_ids
by Mark Brown 10 Aug '11

10 Aug '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- I've already applied this. sound/soc/codecs/wm8750.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index f0ccbef..0fa742f 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -790,7 +790,7 @@ static const struct spi_device_id wm8750_spi_ids[] = { { "wm8750", 0 }, { "wm8987", 0 }, }; -MODULE_DEVICE_TABLE(spi, wm8750_spi_id); +MODULE_DEVICE_TABLE(spi, wm8750_spi_ids); static struct spi_driver wm8750_spi_driver = { .driver = { -- 1.7.5.4

1 0

[alsa-devel] asoc: where to store board specific info?
by Scott Jiang 09 Aug '11

09 Aug '11

Hi Mark, I wonder where to store board specific info? For example, some customer boards have a reset pin to control codec. If I store it in machine driver, I must modify it according to the boards. I can store it in arch/board file and pass it to codec driver, but how about the external system clock? Regards, Scott

2 1

Re: [alsa-devel] [PATCH] ASoc: new rt5631 driver from Realtek
by Mark Brown 09 Aug '11

09 Aug '11

On Tue, Aug 09, 2011 at 06:10:16PM +0800, johnnyhsu wrote: > We have prepared our driver and attach them in the mail. > The driver is made according to alsa architecture and patches by diff. Please follow the standard driver submission process documented in Documentation/SubmittingPatches. At the very least you need to submit patches in the format documented there, not attachments and not just directly attached source files as you have done. There are many examples of the appropriate mail format on the Linux mailing lists. git format-patch and git send-email will generally do the right thing, they're often the easiest way to get things right. > The driver is approved and worked on alsa 1.0.24 As also covered in SubmittingPatches you need to submit against the current development version of the standard Linux kernel. For ASoC this is: git://git.kernel.org/pub/scm/linux/kernel/broonie/sound-2.6.git for-next Looking briefly at the code I also see: > static struct snd_soc_codec *rt5631_codec; This is not suitable for mainline, please register your device using the standard kernel mechanisms. > module_param(timesofbclk, int, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); > MODULE_PARM_DESC(timeofbclk, "relationship between bclk and fs"); This looks like something that should be configured using the machine driver. > static inline int rt5631_write(struct snd_soc_codec *codec, > unsigned int reg, unsigned int val) > { > return snd_soc_write(codec, reg, val); > } > static inline unsigned int rt5631_read(struct snd_soc_codec *codec, > unsigned int reg) > { > return snd_soc_read(codec, reg); > } Just use the relevant functions directly. > > static int rt5631_write_mask(struct snd_soc_codec *codec, > unsigned int reg, unsigned int value, unsigned int mask) This is snd_soc_update_bits(). > /* > * speaker channel volume select SPKMIXER, 0DB by default > * Headphone channel volume select OUTMIXER,0DB by default > * AXO1/AXO2 channel volume select OUTMIXER,0DB by default > * Record Mixer source from Mic1/Mic2 by default > * Mic1/Mic2 boost 40dB by default > * DAC_L-->OutMixer_L by default > * DAC_R-->OutMixer_R by default > * DAC-->SpeakerMixer > * Speaker volume-->SPOMixer(L-->L,R-->R) > * Speaker AMP ratio gain is 1.44X > * HP from OutMixer,speaker out from SpeakerOut Mixer > * enable HP zero cross > * change Mic1 & mic2 to differential mode > */ This sort of stuff is not suitable for mainline either, the driver should just use chip defaults for audio paths and leave the use case up to the application layer. Please compare your driver with the other CODEC drivers and make sure it is following a simmilar style to them.

1 0

[alsa-devel] TWL4030 Line In/Out Loopback issue
by Almohanad Fayez 09 Aug '11

09 Aug '11

I'verealized that there is a loopback dependency between the audioinput/output dependency with the 2.6.38 kernel running on a gumstix overo and also using the 2.6.35 kernel running on the Beaglenboard. You can replicate this issue by plugging some music into the Line injack and then fire up alsamixer. Then you would need to modify theDAC2 Dig level, the one on the right no the left. As you lower thevolume you'll hear your music input decreasing and as you increase itthe music level would increase. If you lower it enough you can captureaudio from the input jack without hearing it out of your speaker butthe bad thing is that also controls your speaker output so if you tryto play some sound out of gumstix/beagleboard you won't be able to do because youneed to increase your DAC2 Dig level in alsamixer ... it's a catch22!! I couldn't find any solutions readily. I am running a console-only Angstrom image on both boards. I've used the Beagleboard's line in/out capabilities with no issues using the 2.6.29 kernel in the past so is there an update in the TWL4030 ALSA driver that I should take into account? thanks al fayez

2 4

[alsa-devel] [PATCH] ASoC: Fix SPI driver binding for WM8987
by Mark Brown 09 Aug '11

09 Aug '11

As we had no id_table only the driver name would be matched against meaning that WM8987 devices wouldn't be bound. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8750.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 6cbf51b..2bb7bea 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -779,11 +779,18 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) return 0; } +static const struct spi_device_id wm8750_spi_ids[] = { + { "wm8750", 0 }, + { "wm8987", 0 }, +}; +MODULE_DEVICE_TABLE(spi, wm8750_spi_id); + static struct spi_driver wm8750_spi_driver = { .driver = { - .name = "wm8750-codec", + .name = "wm8750", .owner = THIS_MODULE, }, + .id_table = wm8750_spi_ids, .probe = wm8750_spi_probe, .remove = __devexit_p(wm8750_spi_remove), }; -- 1.7.5.4

2 6

[alsa-devel] [PATCH 1/3] ASoC: Tegra: tegra_pcm_deallocate_dma_buffer: Don't OOPS
by Stephen Warren 09 Aug '11

09 Aug '11

Not all PCM devices have all sub-streams. Specifically, the SPDIF driver only supports playback and hence has no capture substream. Check whether a substream exists before dereferencing it, when de-allocating DMA buffers in tegra_pcm_deallocate_dma_buffer. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/tegra_pcm.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index ff86e5e..c7cfd96 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c @@ -309,9 +309,14 @@ static int tegra_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) static void tegra_pcm_deallocate_dma_buffer(struct snd_pcm *pcm, int stream) { - struct snd_pcm_substream *substream = pcm->streams[stream].substream; - struct snd_dma_buffer *buf = &substream->dma_buffer; + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + + substream = pcm->streams[stream].substream; + if (!substream) + return; + buf = &substream->dma_buffer; if (!buf->area) return; -- 1.7.0.4

3 6

[alsa-devel] [PATCH] ASoC: Fix warning in WM1250-EV1 driver
by Mark Brown 09 Aug '11

09 Aug '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm1250-ev1.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm1250-ev1.c b/sound/soc/codecs/wm1250-ev1.c index bbcf9ec..a98a3ff1 100644 --- a/sound/soc/codecs/wm1250-ev1.c +++ b/sound/soc/codecs/wm1250-ev1.c @@ -58,12 +58,12 @@ static struct snd_soc_codec_driver soc_codec_dev_wm1250_ev1 = { static int __devinit wm1250_ev1_probe(struct i2c_client *i2c, const struct i2c_device_id *i2c_id) { - int ret, id, board, rev; + int id, board, rev; board = i2c_smbus_read_byte_data(i2c, 0); if (board < 0) { - dev_err(&i2c->dev, "Failed to read ID: %d\n", ret); - return ret; + dev_err(&i2c->dev, "Failed to read ID: %d\n", board); + return board; } id = (board & 0xfe) >> 2; -- 1.7.5.4

2 1

[alsa-devel] [PATCH 1/2] ASoC: Refactor WM8741 regulator handling into CODEC generic code
by Mark Brown 09 Aug '11

09 Aug '11

No meaningful runtime impact but is more in line with other CODECs and will support further work. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8741.c | 74 ++++++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 30 deletions(-) diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 3def27c..d4bfffd 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -422,17 +422,35 @@ static int wm8741_probe(struct snd_soc_codec *codec) { struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); int ret = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(wm8741->supplies); i++) + wm8741->supplies[i].supply = wm8741_supply_names[i]; + + ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8741->supplies), + wm8741->supplies); + if (ret != 0) { + dev_err(codec->dev, "Failed to request supplies: %d\n", ret); + goto err; + } + + ret = regulator_bulk_enable(ARRAY_SIZE(wm8741->supplies), + wm8741->supplies); + if (ret != 0) { + dev_err(codec->dev, "Failed to enable supplies: %d\n", ret); + goto err_get; + } ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type); if (ret != 0) { dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); - return ret; + goto err_enable; } ret = wm8741_reset(codec); if (ret < 0) { dev_err(codec->dev, "Failed to issue reset\n"); - return ret; + goto err_enable; } /* Change some default settings - latch VU */ @@ -451,10 +469,28 @@ static int wm8741_probe(struct snd_soc_codec *codec) dev_dbg(codec->dev, "Successful registration\n"); return ret; + +err_enable: + regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); +err_get: + regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); +err: + return ret; +} + +static int wm8741_remove(struct snd_soc_codec *codec) +{ + struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); + + regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); + regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); + + return 0; } static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { .probe = wm8741_probe, + .remove = wm8741_remove, .resume = wm8741_resume, .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults), .reg_word_size = sizeof(u16), @@ -466,43 +502,22 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct wm8741_priv *wm8741; - int ret, i; + int ret; wm8741 = kzalloc(sizeof(struct wm8741_priv), GFP_KERNEL); if (wm8741 == NULL) return -ENOMEM; - for (i = 0; i < ARRAY_SIZE(wm8741->supplies); i++) - wm8741->supplies[i].supply = wm8741_supply_names[i]; - - ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8741->supplies), - wm8741->supplies); - if (ret != 0) { - dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret); - goto err; - } - - ret = regulator_bulk_enable(ARRAY_SIZE(wm8741->supplies), - wm8741->supplies); - if (ret != 0) { - dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret); - goto err_get; - } - i2c_set_clientdata(i2c, wm8741); wm8741->control_type = SND_SOC_I2C; - ret = snd_soc_register_codec(&i2c->dev, - &soc_codec_dev_wm8741, &wm8741_dai, 1); - if (ret < 0) - goto err_enable; - return ret; + ret = snd_soc_register_codec(&i2c->dev, + &soc_codec_dev_wm8741, &wm8741_dai, 1); + if (ret != 0) + goto err; -err_enable: - regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); + return ret; -err_get: - regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); err: kfree(wm8741); return ret; @@ -513,7 +528,6 @@ static int wm8741_i2c_remove(struct i2c_client *client) struct wm8741_priv *wm8741 = i2c_get_clientdata(client); snd_soc_unregister_codec(&client->dev); - regulator_bulk_free(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); kfree(i2c_get_clientdata(client)); return 0; } -- 1.7.5.4

2 4

[alsa-devel] [PATCH] Support for BOSS Micro BR-80
by Kazutomo Yoshii 09 Aug '11

09 Aug '11

Hi, [ I forget to add Signed-off-by. Sorry about re-posting ] This patch adds support for BOSS Micro BR-80, which allows us to use BR-80 as a USB Audio interface (both playback and capture) and external MIDI drum sound module(CH10). Thanks, Kaz Signed-off-by: Kazutomo Yoshii <kazutomo.yoshii(a)gmail.com> --- sound/usb/quirks-table.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 4d4f865..a42e3ef 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -1707,6 +1707,40 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + USB_DEVICE(0x0582, 0x0130), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "BOSS", */ + /* .product_name = "MICRO BR-80", */ + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_IGNORE_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 3, + .type = QUIRK_MIDI_FIXED_ENDPOINT, + .data = & (const struct snd_usb_midi_endpoint_info) { + .out_cables = 0x0001, + .in_cables = 0x0001 + } + }, + { + .ifnum = -1 + } + } + } +}, /* Guillemot devices */ { -- 1.7.6

1 0