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

[alsa-devel] [PATCH 0/5] Remove ASoC-level I/O functions from cq93vc
by Mark Brown 02 Sep '13

02 Sep '13

This patch series removes the use of the ASoC-level read and write functions from the cq93vc driver as part of a wider push to remove them completely and just use regmap for all register I/O. Since the driver is essentially doing what regmap-mmio is doing this is done by adding a MMIO regmap to the core device and using that. This is compile tested only, I don't have any hardware to run on. Since I anticipate doing more cleanups over the CODEC drivers during the next release cycle it'd be good to merge via ASoC, though there shouldn't be any overlap with the first patch. Mark Brown (5): mfd: davinci_voicecodec: Remove unused read and write functions mfd: davinci_voicecodec: Provide a regmap for register I/O ASoC: cq93vc: Use core I/O functions ASoC: cq93vc: Don't use control data for core driver data ASoC: cq93vc: Use regmap for I/O drivers/mfd/davinci_voicecodec.c | 23 +++++++++++-------- include/linux/mfd/davinci_voicecodec.h | 3 +++ sound/soc/codecs/cq93vc.c | 42 +++++++++++----------------------- 3 files changed, 29 insertions(+), 39 deletions(-)

2 9

[alsa-devel] [PATCH 00/18] ARM: s3c64xx: Let amba-pl08x driver handle DMA
by Tomasz Figa 02 Sep '13

02 Sep '13

This is first non-RFC version of my patches extending support of amba-pl08x DMA engine driver to PL080S DMA engine (PL080 modified by Samsung) found in Samsung S3C64xx SoCs. Due to changes scattered across different areas of kernel, patches are based on merged 3 branches: - for-next of Kgene's Samsung tree, - clk-next of Mike's clock tree, - next of Vinod's slave DMA tree. To ease testing I have prepared a branch in my private tree for anyone willing to check the patches out: git://github.com/tom3q/linux.git v3.12-pl080 Dependencies (already applied in my branch): - for patches 14 and 16 - CCF-based clock driver for s3c64xx. Some of the patches not related to the amba-pl08x driver itself can be likely applied into appropriate trees separately, namely: - 09/18 - ASoC: Samsung: Do not queue cyclic buffers multiple times, - 14/18 - clk: samsung: s3c64xx: Add aliases for DMA clocks. After patch 14/18, both old and new DMA drivers can be supported on S3C64xx, depending on Kconfig options. Patches 15-18 remove the old driver leaving support only for the generic pl08x driver. Feel free to drop those patches for now if we want more testing, but I don't suspect any problems. On S3C64xx-based Mini6410 and SMDK6410 boards, with I2S audio playback and capture (including full duplex operation) and also SPI using spidev: Tested-by: Tomasz Figa <tomasz.figa(a)gmail.com> Changes since RFC v2: - Added clkdev lookups to old clock driver. - Added patches removing the old DMA driver and any remaining code needed by it. - Fixed DMA support for SPI. - Added a word about PL080S to amba-pl08x.c file header. - Changed definition of LLI words from enums to macros. - Extended debugging messages to handle PL080S variant as well. - Little cleanup of LLI dumping code. - Added check for peripheral flow control, which is unsupported by PL080S to dma_set_runtime_config. - Corrected transfer size mask of PL080S. Changes since RFC v1: - Returned to original way of storing quirks as booleans, as suggested by Russell, Linus and Arnd. - Added reg_config field to pl08x_phy_chan struct, which stores variant-specific address of channel config register, as suggested by Russell. - Simplified handling of extended maximum transfer size of PL080S (no more conditional passing of 0 as length to pl08x_cctl_bits()). - Reworked LLI handling in the driver to stop casting arbitrary memory to a struct and allow different word count of LLI entry, as suggested by Linus. - Removed AMBA ID override from S3C64xx PL080 initialization code. - Fixed brokenness of Samsung DMA wrapper API, which caused cyclic buffers to be queued multiple times when DMA engine is used. - Included patch adding clock aliases for DMA engines (depends on Common Clock Framework driver for S3C64xx). - Fixed several minor stylistic issues. For reference, here is the original description of the series: One of the biggest roadblocks on the way of S3C64xx to DeviceTree support is its DMA driver, which is completely platform-specific and provides private API (s3c-dma), not even saying that its design is completely against multiplatform-awareness. The DMA controller present on this SoC series is a custom variant of ARM PrimeCell PL080 modified by Samsung to add some extra features. It is mostly compatible with original PL080, except: - CH_CONTROL2 register is added between CH_CONTROL and CH_CONFIG, - offset of CH_CONFIG register is different, - transfer size field is moved from CH_CONTROL to CH_CONTROL2, - transfer size field is extended to 24 bits, allowing much bigger single transfer, - LLI consists of one more word, to account for CH_CONTROL2 register. Since all the rest is fully compatible with standard PL080 there is no point in having separate driver just for this single variant, so I decided to look into adding support for it to the amba-pl08x driver. There was already some attempt to achieve this before, but this was before Russel's big rework of the driver to use virtual channels, making the old patches being not much of use. This RFC series is a proof of concept that I managed to make during last days of hacking. Except one patch adding clkdev lookup to clock driver (which is being replaced with a CCF-compliant driver ATM), this is enough to get memcpy and slave transfers to work on S3C64xx. I have tested this on Mini6410 and SMDK6410 boards using dmatest for memcpy and Samsung I2S with madplay/aplay for slave transfers. Unfortunately I do not have access to other platforms with PL08x so I could not test for any regressions introduced on them. Credits for two patches go to Alban Bedel, who made a series fixing this driver to make it usable with audio drivers. I rebased his patches on top of mine and corrected coding style a bit. OK, that's all. Any comments are welcome. Feel free to start throwing eggs and tomatoes if you find this awful, but I won't be upset if I get some Tested-by or Acked-by as well. ;) Alban Bedel (2): dmaengine: PL08x: Fix reading the byte count in cctl dmaengine: PL08x: Add cyclic transfer support Tomasz Figa (16): dmaengine: PL08x: Refactor pl08x_getbytes_chan() to lower indentation dmaengine: PL08x: Add support for different offset of CONFIG register dmaengine: PL08x: Rework LLI handling to be less fragile dmaengine: PL08x: Move LLI dumping code into separate function dmaengine: PL08x: Add support for PL080S variant dmaengine: PL08x: Add support for different maximum transfer size ASoC: Samsung: Do not queue cyclic buffers multiple times spi: s3c64xx: Do not require legacy DMA API in case of S3C64XX ASoC: Samsung: Do not require legacy DMA API in case of S3C64XX ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver ARM: s3c64xx: clock: Add clkdev lookup for DMA clocks clk: samsung: s3c64xx: Add aliases for DMA clocks ARM: s3c64xx: Remove legacy DMA driver clk: samsung: s3c64xx: Remove clock aliases of old DMA driver spi: s3c64xx: Always select S3C64XX_PL080 when ARCH_S3C64XX is enabled ASoC: Samsung: Always select S3C64XX_PL080 when ARCH_S3C64XX is enabled arch/arm/Kconfig | 1 + arch/arm/mach-s3c64xx/Kconfig | 7 +- arch/arm/mach-s3c64xx/Makefile | 2 +- arch/arm/mach-s3c64xx/clock.c | 28 +- arch/arm/mach-s3c64xx/common.h | 5 + arch/arm/mach-s3c64xx/dma.c | 753 ------------------------------- arch/arm/mach-s3c64xx/include/mach/dma.h | 144 ++---- arch/arm/mach-s3c64xx/pl080.c | 244 ++++++++++ arch/arm/plat-samsung/devs.c | 6 +- arch/arm/plat-samsung/s3c-dma-ops.c | 13 +- drivers/clk/samsung/clk-s3c64xx.c | 4 +- drivers/dma/amba-pl08x.c | 501 ++++++++++++++------ drivers/spi/Kconfig | 2 +- include/linux/amba/pl080.h | 1 + sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/dma.c | 7 + 16 files changed, 705 insertions(+), 1015 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/dma.c create mode 100644 arch/arm/mach-s3c64xx/pl080.c -- 1.8.3.2

5 44

[alsa-devel] [PATCH 1/2] ASoC: soc-pcm: Allow to specify unidirectional dai_link
by Fabio Estevam 01 Sep '13

01 Sep '13

Add 'playback_only' and 'capture_only' fields that can be used for specifying that a dai_link has a unidirectional capability. The motivation for this is for the cases of systems, such as Freescale MX28, that has two unidirectional DAIs. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/sound/soc.h | 4 ++++ sound/soc/soc-pcm.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/include/sound/soc.h b/include/sound/soc.h index 8e2ad52..774d3be 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -934,6 +934,10 @@ struct snd_soc_dai_link { /* machine stream operations */ const struct snd_soc_ops *ops; const struct snd_soc_compr_ops *compr_ops; + + /* For unidirectional dai links */ + bool playback_only; + bool capture_only; }; struct snd_soc_codec_conf { diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index fb70fbe..5e44863 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2020,6 +2020,16 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num) capture = 1; } + if (rtd->dai_link->playback_only) { + playback = 1; + capture = 0; + } + + if (rtd->dai_link->capture_only) { + playback = 0; + capture = 1; + } + /* create the PCM */ if (rtd->dai_link->no_pcm) { snprintf(new_name, sizeof(new_name), "(%s)", -- 1.8.1.2

2 2

[alsa-devel] [PATCH v3 00/11] ALSA: usb-audio: fix playback/capture concurrent usage
by Eldad Zack 01 Sep '13

01 Sep '13

Hi, This patch series attempts to fix a long standing problem with the concurrent usage of playback and capture on implicit feedback devices. Applies against current for-next (HEAD 68538bf2bce557c3b5fe8c59b034d45352500db1 ). v2: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-August/065649.html v1: http://mailman.alsa-project.org/pipermail/alsa-devel/2013-August/065517.html * Changed "altset_idx" to "altsetting" thanks to Clemens' clarification. #3: Thanks to Daniel's test, fixed a NULL dereference caused by userspace calling snd_pcm_open() and then snd_pcm_close() immediately. #8: subs->altset_idx was left intact, since it corresponds to the array index. #10: this patch now removed subs->altset_idx, but also changes the check to be performed against fmt->altsetting. #11: New. This changes the name of snd_usb_endpoint member alt_idx to altsetting for the same reason Clemens described. Clemens and Daniel - thank you very much for your help! Cheers, Eldad Eldad Zack (11): ALSA: usb-audio: remove unused parameter from sync_ep_set_params ALSA: usb-audio: remove deactivate_endpoints() ALSA: usb-audio: prevent NULL dereference on stop trigger ALSA: usb-audio: don't deactivate URBs on in-use EP ALSA: usb-audio: void return type of snd_usb_endpoint_deactivate() ALSA: usb-audio: clear SUBSTREAM_FLAG_SYNC_EP_STARTED on error ALSA: usb-audio: correct ep use_count semantics (add set_param flag) ALSA: usb-audio: conditional interface altsetting ALSA: usb-audio: conditional concurrent usage of endpoint ALSA: usb-audio: remove altset_idx from snd_usb_substream ALSA: usb-audio: rename alt_idx to altsetting sound/usb/card.h | 4 +- sound/usb/endpoint.c | 82 ++++++++++++++++++------- sound/usb/endpoint.h | 11 +++- sound/usb/pcm.c | 168 ++++++++++++++++++++++++++++++++++++++------------- sound/usb/pcm.h | 2 + sound/usb/proc.c | 4 +- 6 files changed, 201 insertions(+), 70 deletions(-) -- 1.8.1.5

2 14

Re: [alsa-devel] [PATCH 2/2] ARM: Dove: Add the audio device to the Cubox DT
by Jean-Francois Moine 01 Sep '13

01 Sep '13

On Sat, 31 Aug 2013 12:24:31 +0100 Russell King - ARM Linux <linux(a)arm.linux.org.uk> wrote: > > According to the Dove specification, the audio controller works with > > the samples rates 44.1, 48 and 96 kHz, so, I don't see the usage of the > > external clock, except when using the two audio controllers with > > different sample rates. > > I don't see what the Dove specification has to do with that statement: > what the Dove spec says is that if you use just the internal DCO, then > only 44.1kHz, 48kHz and 96kHz are supported (with some trimming of that.) > However, the use of an external clock allows further rates to be supported. > If you have an external clock, there is no requirement to use the DCO for > those sample rates - you can if you wish, or you can use the external clock. > > The mainline driver implements the use of the DCO for the standard 44.1, > 48 and 96kHz rates, otherwise it uses the external clock if present. This > is entirely conformant with the Dove spec. Russell, I looked again at the Armada-510-Functional-Spec, and I found: - section 12.1 ... I2S Supported Features An audio sample rate (Fs) of 44.1/48/96 kHz. ... S/PDIF Supported Features The IEC60958-1, IEC60958-3, and IEC61937 specifications. An audio sample rate (Fs) of 44.1/48/96 kHz. ... - Table 436: Clocks Control Register Offset: Unit0: 0x000B1230, Unit1: 0x000B5230 ... 1:0 MCLK source RW MCLK = 256 Fs, where Fs = 44.1 kHz, 48 kHz, 96 kHz. 0x0 Playback should not be active when selecting an external MCLK, or moving from one external MCLK to another MCLK source. 0 = DCO: MCLK is from DCO. 1 = Reserved 2 = Reserved 3 = External: MCLK is from an external source. As they don't work with my TV set, may you confirm that these webradios http://kerne.online.stalig.net/live-ori.ogg http://www.tv-radio.com/station/france_bleu_breiz_izel_mp3/france_bleu_brei… http://plumfm.online.stalig.net/live-ori.ogg work for you with the external clock? (sample rates resp. 33.075, 24 and 22.05 kHz) -- Ken ar c'hentañ | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/

1 0

[alsa-devel] [PATCH] ASoC: fsl_spdif: Staticse non-exported symbols
by Mark Brown 01 Sep '13

01 Sep '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/fsl/fsl_spdif.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index e93dc0d..c5c228a 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -411,8 +411,8 @@ static int spdif_set_sample_rate(struct snd_pcm_substream *substream, return 0; } -int fsl_spdif_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *cpu_dai) +static int fsl_spdif_startup(struct snd_pcm_substream *substream, + struct snd_soc_dai *cpu_dai) { struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_spdif_priv *spdif_priv = snd_soc_dai_get_drvdata(rtd->cpu_dai); @@ -546,7 +546,7 @@ static int fsl_spdif_trigger(struct snd_pcm_substream *substream, return 0; } -struct snd_soc_dai_ops fsl_spdif_dai_ops = { +static struct snd_soc_dai_ops fsl_spdif_dai_ops = { .startup = fsl_spdif_startup, .hw_params = fsl_spdif_hw_params, .trigger = fsl_spdif_trigger, @@ -919,7 +919,7 @@ static int fsl_spdif_dai_probe(struct snd_soc_dai *dai) return 0; } -struct snd_soc_dai_driver fsl_spdif_dai = { +static struct snd_soc_dai_driver fsl_spdif_dai = { .probe = &fsl_spdif_dai_probe, .playback = { .channels_min = 2, -- 1.8.4.rc3

2 1