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

[alsa-devel] [PATCH v4 1/1] ASoc: kirkwood: add DT support to the mvebu audio subsystem
by Jean-Francois Moine 10 Aug '13

10 Aug '13

This patch adds DT support to the audio subsystem of the mvebu family (Kirkwood, Dove, Armada 370). Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> --- .../devicetree/bindings/sound/mvebu-audio.txt | 29 ++++++++++++++++++++++ sound/soc/kirkwood/kirkwood-i2s.c | 26 +++++++++++++++++----- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mvebu-audio.txt b/Documentation/devicetree/bindings/sound/mvebu-audio.txt new file mode 100644 index 0000000..7e5fd37 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/mvebu-audio.txt @@ -0,0 +1,29 @@ +* mvebu (Kirkwood, Dove, Armada 370) audio controller + +Required properties: + +- compatible: "mrvl,mvebu-audio" + +- reg: physical base address of the controller and length of memory mapped + region. + +- interrupts: list of two irq numbers. + The first irq is used for data flow and the second one is used for errors. + +- clocks: one or two phandles. + The first one is mandatory and defines the internal clock. + The second one is optional and defines an external clock. + +- clock-names: names associated to the clocks: + "internal" for the internal clock + "extclk" for the external clock + +Example: + +i2s1: audio-controller@b4000 { + compatible = "mrvl,mvebu-audio"; + reg = <0xb4000 0x2210>; + interrupts = <21>, <22>; + clocks = <&gate_clk 13>; + clock-names = "internal"; +}; diff --git a/sound/soc/kirkwood/kirkwood-i2s.c.next b/sound/soc/kirkwood/kirkwood-i2s.c index e5f3f7a..a4170b4 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c.next +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -22,6 +22,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <linux/platform_data/asoc-kirkwood.h> +#include <linux/of.h> + #include "kirkwood.h" #define DRV_NAME "mvebu-audio" @@ -453,6 +455,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) struct snd_soc_dai_driver *soc_dai = &kirkwood_i2s_dai; struct kirkwood_dma_data *priv; struct resource *mem; + struct device_node *np = pdev->dev.of_node; int err; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); @@ -473,14 +476,16 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) return -ENXIO; } - if (!data) { - dev_err(&pdev->dev, "no platform data ?!\n"); + if (np) { + priv->burst = 128; /* might be 32 or 128 */ + } else if (data) { + priv->burst = data->burst; + } else { + dev_err(&pdev->dev, "no DT nor platform data ?!\n"); return -EINVAL; } - priv->burst = data->burst; - - priv->clk = devm_clk_get(&pdev->dev, NULL); + priv->clk = devm_clk_get(&pdev->dev, np ? "internal" : NULL); if (IS_ERR(priv->clk)) { dev_err(&pdev->dev, "no clock\n"); return PTR_ERR(priv->clk); @@ -507,7 +512,7 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev) priv->ctl_rec = KIRKWOOD_RECCTL_SIZE_24; /* Select the burst size */ - if (data->burst == 32) { + if (priv->burst == 32) { priv->ctl_play |= KIRKWOOD_PLAYCTL_BURST_32; priv->ctl_rec |= KIRKWOOD_RECCTL_BURST_32; } else { @@ -552,12 +557,21 @@ static int kirkwood_i2s_dev_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_OF +static struct of_device_id kirkwood_i2s_of_match[] = { + { .compatible = "mrvl,mvebu-audio" }, + { } +}; +MODULE_DEVICE_TABLE(of, kirkwood_i2s_of_match); +#endif + static struct platform_driver kirkwood_i2s_driver = { .probe = kirkwood_i2s_dev_probe, .remove = kirkwood_i2s_dev_remove, .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(kirkwood_i2s_of_match), }, }; -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

6 20

[alsa-devel] [patch] sound: oss/dmabuf: remove an unneeded temporary variable
by Dan Carpenter 09 Aug '13

09 Aug '13

We don't actually use the "go" variable so it can be removed. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index a59c888..461d94c 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c @@ -557,7 +557,6 @@ int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) unsigned long flags; int err = 0, n = 0; struct dma_buffparms *dmap = adev->dmap_in; - int go; if (!(adev->open_mode & OPEN_READ)) return -EIO; @@ -584,7 +583,7 @@ int DMAbuf_getrdbuffer(int dev, char **buf, int *len, int dontblock) spin_unlock_irqrestore(&dmap->lock,flags); return -EAGAIN; } - if ((go = adev->go)) + if (adev->go) timeout = dmabuf_timeout(dmap); spin_unlock_irqrestore(&dmap->lock,flags);

2 2

[alsa-devel] [PATCH V3 0/3] Add audio support on smdk5420
by Padmavathi Venna 09 Aug '13

09 Aug '13

Samsung has different versions of I2S introduced in different platforms. Each version has some new support added for multichannel, secondary fifo, s/w reset control, internal mux for rclk src clk and tdm support. Each newly added change has a quirk. So this patch adds all the required quirks as driver data and based on compatible string from dtsi fetches the quirks. This also adds i2s support on exynos5420. Changes since V2: - Seperated out driver side changes and dts changes in two patch sets. - Replaced samsung,s3c6410-i2s-v4 with samsung,s3c6410-i2s-multi for more clarity as suggested by Tomasz Figa. Changes since V1: - Pass quirks as driver data and fetch the quirks based on compatible string from dtsi file as suggested by Tomasz Figa and Mark Brown - Make the I2S driver more flexible with respect to register access as suggested by Tomasz Figa and Mark Brown - Add 5420 support in the driver. - Modify the dtsi files with the corresponding compatible strings and removed the i2s quirks from 5250 dtsi file. - Updated the i2s Documentation with relevent changes and i2s versioning info. - Add i2s nodes on exynos5420.dtsi - Enable sound support on smdk5420 This patch set is made based on Mark Brown for-next branch on sound.git. Padmavathi Venna (3): platform: Increase platform name size ASoC: Samsung: I2S: Add quirks as driver data in I2S ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420 .../devicetree/bindings/sound/samsung-i2s.txt | 25 ++-- include/linux/mod_devicetable.h | 2 +- include/linux/platform_data/asoc-s3c.h | 1 + sound/soc/samsung/i2s-regs.h | 15 ++ sound/soc/samsung/i2s.c | 163 +++++++++++++++----- 5 files changed, 158 insertions(+), 48 deletions(-) -- 1.7.4.4

3 5

[alsa-devel] Found a typo
by Torino 09 Aug '13

09 Aug '13

Dear Alsa developers, within Saucy (13.10), "alsa-utils", string nr. 124 it says "Channel %d doesn't match with hw_parmas" whereas in other strings like nr. 84 or 126 it says "hw_params". I hope it was correct informing you via this mailing list. Best Regads, Torino (from the German Übersetzer-Team)

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: do not trust too-big wMaxPacketSize values
by Clemens Ladisch 08 Aug '13

08 Aug '13

The driver used to assume that the streaming endpoint's wMaxPacketSize value would be an indication of how much data the endpoint expects or sends, and compute the number of packets per URB using this value. However, the Focusrite Scarlett 2i4 declares a value of 1024 bytes, while only about 88 or 44 bytes are be actually used. This discrepancy would result in URBs with far too few packets, which would not work correctly on the EHCI driver. To get correct URBs, use wMaxPacketSize only as an upper limit on the packet size. Reported-by: James Stone <jamesmstone(a)gmail.com> Tested-by: James Stone <jamesmstone(a)gmail.com> Cc: <stable(a)vger.kernel.org> # 2.6.35+ Signed-off-by: Clemens Ladisch <clemens(a)ladisch.de> --- sound/usb/endpoint.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -591,17 +591,16 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep, ep->stride = frame_bits >> 3; ep->silence_value = pcm_format == SNDRV_PCM_FORMAT_U8 ? 0x80 : 0; - /* calculate max. frequency */ - if (ep->maxpacksize) { + /* assume max. frequency is 25% higher than nominal */ + ep->freqmax = ep->freqn + (ep->freqn >> 2); + maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) + >> (16 - ep->datainterval); + /* but wMaxPacketSize might reduce this */ + if (ep->maxpacksize && ep->maxpacksize < maxsize) { /* whatever fits into a max. size packet */ maxsize = ep->maxpacksize; ep->freqmax = (maxsize / (frame_bits >> 3)) << (16 - ep->datainterval); - } else { - /* no max. packet size: just take 25% higher than nominal */ - ep->freqmax = ep->freqn + (ep->freqn >> 2); - maxsize = ((ep->freqmax + 0xffff) * (frame_bits >> 3)) - >> (16 - ep->datainterval); } if (ep->fill_max)

3 2

[alsa-devel] [PATCH 1/1] ASoC: s6105-ipcam: Fix incorrect placement of __initdata
by Sachin Kamat 08 Aug '13

08 Aug '13

__initdata should be placed between the variable name and equal sign for the variable to be placed in the intended section. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> Cc: Daniel Gloeckner <dg(a)emlix.com> --- sound/soc/s6000/s6105-ipcam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c index 58cfb1e..945e8ab 100644 --- a/sound/soc/s6000/s6105-ipcam.c +++ b/sound/soc/s6000/s6105-ipcam.c @@ -192,7 +192,7 @@ static struct snd_soc_card snd_soc_card_s6105 = { .num_links = 1, }; -static struct s6000_snd_platform_data __initdata s6105_snd_data = { +static struct s6000_snd_platform_data s6105_snd_data __initdata = { .wide = 0, .channel_in = 0, .channel_out = 1, -- 1.7.9.5

2 1

[alsa-devel] [PATCH 1/2] ASoC: ad73311: Add DAPM support
by Mark Brown 08 Aug '13

08 Aug '13

From: Mark Brown <broonie(a)linaro.org> This makes it possible to hook up other devices in boards and is required by removal of support for non-DAPM CODECs in the core. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/ad73311.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/ad73311.c b/sound/soc/codecs/ad73311.c index b1f2baf..5fac8ad 100644 --- a/sound/soc/codecs/ad73311.c +++ b/sound/soc/codecs/ad73311.c @@ -23,6 +23,21 @@ #include "ad73311.h" +static const struct snd_soc_dapm_widget ad73311_dapm_widgets[] = { +SND_SOC_DAPM_INPUT("VINP"), +SND_SOC_DAPM_INPUT("VINN"), +SND_SOC_DAPM_OUTPUT("VOUTN"), +SND_SOC_DAPM_OUTPUT("VOUTP"), +}; + +static const struct snd_soc_dapm_route ad73311_dapm_routes[] = { + { "Capture", NULL, "VINP" }, + { "Capture", NULL, "VINN" }, + + { "VOUTN", NULL, "Playback" }, + { "VOUTP", NULL, "Playback" }, +}; + static struct snd_soc_dai_driver ad73311_dai = { .name = "ad73311-hifi", .playback = { @@ -39,7 +54,12 @@ static struct snd_soc_dai_driver ad73311_dai = { .formats = SNDRV_PCM_FMTBIT_S16_LE, }, }; -static struct snd_soc_codec_driver soc_codec_dev_ad73311; +static struct snd_soc_codec_driver soc_codec_dev_ad73311 = { + .dapm_widgets = ad73311_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ad73311_dapm_widgets), + .dapm_routes = ad73311_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ad73311_dapm_routes), +}; static int ad73311_probe(struct platform_device *pdev) { -- 1.8.4.rc1

2 3

[alsa-devel] [PATCH] ASoC: pcm1681: Staticise DAI driver
by Mark Brown 08 Aug '13

08 Aug '13

From: Mark Brown <broonie(a)linaro.org> It is not exported so doesn't need to be in the global namespace and sparse warns on this. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/pcm1681.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 27da41b..51b1866 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -225,7 +225,7 @@ static const struct snd_kcontrol_new pcm1681_controls[] = { pcm1681_get_deemph, pcm1681_put_deemph), }; -struct snd_soc_dai_driver pcm1681_dai = { +static struct snd_soc_dai_driver pcm1681_dai = { .name = "pcm1681-hifi", .playback = { .stream_name = "Playback", -- 1.8.4.rc1

1 0

[alsa-devel] [PATCH v4 0/1] ASoc: kirkwood: extend the kirkwood audio subsystem for DT usage
by Jean-Francois Moine 08 Aug '13

08 Aug '13

This patch series adds DT support to the kirkwood/mvebu audio subsystem. History v4 - change the DT name to "mrvl,mvebu-audio" - remove previous patches 1..3 which have been applied by Russell King v3 - change the DT name from "kirkwood-i2s" to "mvebu-pcm-audio" - apply to linux-next - let NULL as the internal i2s clock for compatibility - change i2s external clock name to "extclk" instead of "external" - cancel previous patch 1/4. Russell's patch should be applied instead. v2 - fix compilation errors -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

1 0

[alsa-devel] bug
by Mattia Bertoni 08 Aug '13

08 Aug '13

finally I can report a bug which I encountered some time ago; I send you the important part of the entire log, which is to much big to be posted: Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 420736 bytes (2191 ms). Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_intel8x0'. Please report this issue to the ALSA developers. Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: snd_pcm_dump(): Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Hardware PCM card 0 'NVidia CK804' device 0 subdevice 0 Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Its setup is: Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: stream : PLAYBACK Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: access : MMAP_INTERLEAVED Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: format : S16_LE Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: subformat : STD Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: channels : 2 Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: rate : 48000 Jun 15 18:18:00 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: exact rate : 48000 (48000/1) Jun 15 18:18:03 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: msbits : 16 Jun 15 18:18:03 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: buffer_size : 16384 Jun 15 18:18:03 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_size : 16384 Jun 15 18:18:03 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_time : 341333 Jun 15 18:18:03 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: tstamp_mode : ENABLE Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_step : 1 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: avail_min : 16384 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_event : 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: start_threshold : -1 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: stop_threshold : 4611686018427387904 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: silence_threshold: 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: silence_size : 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: boundary : 4611686018427387904 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: appl_ptr : 26406104 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: hw_ptr : 26494904 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: snd_pcm_delay() returned a value that is exceptionally large: -465056 bytes (-2422 ms). Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_intel8x0'. Please report this issue to the ALSA developers. Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: snd_pcm_dump(): Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Hardware PCM card 0 'NVidia CK804' device 0 subdevice 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: Its setup is: Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: stream : PLAYBACK Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: access : MMAP_INTERLEAVED Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: format : S16_LE Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: subformat : STD Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: channels : 2 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: rate : 48000 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: exact rate : 48000 (48000/1) Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: msbits : 16 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: buffer_size : 16384 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_size : 16384 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_time : 341333 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: tstamp_mode : ENABLE Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_step : 1 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: avail_min : 16384 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: period_event : 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: start_threshold : -1 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: stop_threshold : 4611686018427387904 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: silence_threshold: 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: silence_size : 0 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: boundary : 4611686018427387904 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: appl_ptr : 26569944 Jun 15 18:18:04 arch-dekstop pulseaudio[776]: [alsa-sink-Intel ICH] alsa-util.c: hw_ptr : 26686208

2 6