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

[alsa-devel] [PATCH] ASoC: samsung: Enable COMPILE_TEST builds
by Mark Brown 22 Jul '13

22 Jul '13

From: Mark Brown <broonie(a)linaro.org> Platform using OF and some others don't have any dependencies on arch/arm so can be built on any platform. Enable that for better compile coverage when COMPILE_TEST is enabled. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/samsung/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 9855dfc..df28dc8 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -1,6 +1,6 @@ config SND_SOC_SAMSUNG tristate "ASoC support for Samsung" - depends on PLAT_SAMSUNG + depends on PLAT_SAMSUNG || COMPILE_TEST select S3C64XX_DMA if ARCH_S3C64XX select S3C2410_DMA if ARCH_S3C24XX help @@ -150,7 +150,7 @@ config SND_SOC_SMARTQ config SND_SOC_GONI_AQUILA_WM8994 tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" - depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) + depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA || COMPILE_TEST) depends on I2C=y && GENERIC_HARDIRQS select SND_SAMSUNG_I2S select MFD_WM8994 @@ -186,7 +186,7 @@ config SND_SOC_SMDK_WM8994_PCM config SND_SOC_SPEYSIDE tristate "Audio support for Wolfson Speyside" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && (MACH_WLF_CRAGG_6410 || COMPILE_TEST) select SND_SAMSUNG_I2S select SND_SOC_WM8996 select SND_SOC_WM9081 @@ -195,13 +195,13 @@ config SND_SOC_SPEYSIDE config SND_SOC_TOBERMORY tristate "Audio support for Wolfson Tobermory" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && (MACH_WLF_CRAGG_6410 || COMPILE_TEST) select SND_SAMSUNG_I2S select SND_SOC_WM8962 config SND_SOC_BELLS tristate "Audio support for Wolfson Bells" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && (MACH_WLF_CRAGG_6410 || COMPILE_TEST) select SND_SAMSUNG_I2S select SND_SOC_WM5102 select SND_SOC_WM5110 @@ -211,14 +211,14 @@ config SND_SOC_BELLS config SND_SOC_LOWLAND tristate "Audio support for Wolfson Lowland" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && (MACH_WLF_CRAGG_6410 || COMPILE_TEST) select SND_SAMSUNG_I2S select SND_SOC_WM5100 select SND_SOC_WM9081 config SND_SOC_LITTLEMILL tristate "Audio support for Wolfson Littlemill" - depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 + depends on SND_SOC_SAMSUNG && (MACH_WLF_CRAGG_6410 || COMPILE_TEST) select SND_SAMSUNG_I2S select MFD_WM8994 select SND_SOC_WM8994 -- 1.8.3.2

2 1

[alsa-devel] [PATCH] ASoC: mxs: Depends on COMMON_CLK
by Mark Brown 22 Jul '13

22 Jul '13

From: Mark Brown <broonie(a)linaro.org> The SAIF driver is a clock provider so specifically needs the common clock implementedation. Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/mxs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig index 7daf860..219235c 100644 --- a/sound/soc/mxs/Kconfig +++ b/sound/soc/mxs/Kconfig @@ -1,6 +1,7 @@ menuconfig SND_MXS_SOC tristate "SoC Audio for Freescale MXS CPUs" depends on ARCH_MXS || COMPILE_TEST + depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to -- 1.8.3.2

2 1

Re: [alsa-devel] Samsung S5PV210 I2S DMA
by Mike Dyer 22 Jul '13

22 Jul '13

On Sat, 2013-07-06 at 16:22 +0600, Alexey Galakhov wrote: > Hi, > > > The DMA engine emits a lot of messages complaining of (I think) a read > > fault: > > > dma-pl330 dma-pl330.0: Reset Channel-0 CS-20000f FTC-40000 > > dma-pl330 dma-pl330.0: Reset Channel-0 CS-20000f FTC-40000 > > I'm debugging the same error right now. FTC-40000 means "Read error", > i.e. invalid address of the DMA source block. > > Regards, > Alex In my case it turned out the TZPC hadn't been configured properly by the bootloader. I had to modify to the bootloader to make sure the I2S was non secured (it's secure by default). Hope this helps, Mike

2 1

[alsa-devel] [patch] ASoC: core: double free in snd_soc_add_platform()
by Dan Carpenter 22 Jul '13

22 Jul '13

There are three callers for this function, and none of them want it to free platform for them. It leads to a double free. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0ec070c..d82ee38 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3908,10 +3908,8 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, { /* create platform component name */ platform->name = fmt_single_name(dev, &platform->id); - if (platform->name == NULL) { - kfree(platform); + if (platform->name == NULL) return -ENOMEM; - } platform->dev = dev; platform->driver = platform_drv;

2 1

[alsa-devel] [PATCH] ASoC: mxs: Remove unneeded mach-types.h inclusions
by Mark Brown 22 Jul '13

22 Jul '13

From: Mark Brown <broonie(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/mxs/mxs-saif.c | 1 - sound/soc/mxs/mxs-sgtl5000.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 54511c5..b56b8a0 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -31,7 +31,6 @@ #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> -#include <asm/mach-types.h> #include "mxs-saif.h" diff --git a/sound/soc/mxs/mxs-sgtl5000.c b/sound/soc/mxs/mxs-sgtl5000.c index 1b134d7..b2e372d 100644 --- a/sound/soc/mxs/mxs-sgtl5000.c +++ b/sound/soc/mxs/mxs-sgtl5000.c @@ -25,7 +25,6 @@ #include <sound/soc.h> #include <sound/jack.h> #include <sound/soc-dapm.h> -#include <asm/mach-types.h> #include "../codecs/sgtl5000.h" #include "mxs-saif.h" -- 1.8.3.2

2 1

Re: [alsa-devel] [PATCH] ASoC: generic: add simple card with devicetree support
by Daniel Mack 22 Jul '13

22 Jul '13

Hi, On 20.07.2013 19:25, Jean-Francois Moine wrote: > This generic simple card driver uses DT values to instanciate an audio > system in which the real work is done by the subdrivers (audio > controller, audio codec and pcm/dma controller). > > Signed-off-by: Jean-Francois Moine <moinejf(a)free.fr> > --- > diff --git a/sound/soc/generic/simple-dt-card.c b/sound/soc/generic/simple-dt-card.c > new file mode 100644 There is a simple-card driver in the tree already, and there were several attempts to add DT bindings for it in the past - have you seen that? Search for "ASoC: add simple-card DT support" in the archives ... Daniel

3 3

[alsa-devel] [PATCH] ASoC: fsl: imx-audmux: Check the return value from clk_prepare_enable()
by Fabio Estevam 22 Jul '13

22 Jul '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> clk_prepare_enable() may fail, so let's check its return value and propagate it in the case of error. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/fsl/imx-audmux.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index e260f1f..1a5da1e 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -73,8 +73,11 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf, if (!buf) return -ENOMEM; - if (audmux_clk) - clk_prepare_enable(audmux_clk); + if (audmux_clk) { + ret = clk_prepare_enable(audmux_clk); + if (ret) + return ret; + } ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port)); pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port)); @@ -224,14 +227,19 @@ EXPORT_SYMBOL_GPL(imx_audmux_v1_configure_port); int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, unsigned int pdcr) { + int ret; + if (audmux_type != IMX31_AUDMUX) return -EINVAL; if (!audmux_base) return -ENOSYS; - if (audmux_clk) - clk_prepare_enable(audmux_clk); + if (audmux_clk) { + ret = clk_prepare_enable(audmux_clk); + if (ret) + return ret; + } writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port)); writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port)); -- 1.8.1.2

2 1

[alsa-devel] [PATCH] ASoC: omap-mcbsp: Support SND_SOC_DAIFMT_CBM_CFS for omap3/4
by Michael Trimarchi 22 Jul '13

22 Jul '13

Add SND_SOC_DAIFMT_CBM_CFS support for omap3/omap4. The patch was tested on a pandaboard-es board connected to the pcm1792a codec. mcbspx_fsx must configured as output and mcbspx_clkx must be configured as input. Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- sound/soc/omap/omap-mcbsp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 7483efb..6c19bba 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -433,6 +433,11 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai, /* Sample rate generator drives the FS */ regs->srgr2 |= FSGM; break; + case SND_SOC_DAIFMT_CBM_CFS: + /* McBSP slave. FS clock as output */ + regs->srgr2 |= FSGM; + regs->pcr0 |= FSXM; + break; case SND_SOC_DAIFMT_CBM_CFM: /* McBSP slave */ break; -- 1.7.9.5

3 2

Re: [alsa-devel] [PATCH] ASoC: tegra: correct playback_dma_data setup
by Mark Brown 22 Jul '13

22 Jul '13

On Sun, Jul 21, 2013 at 10:34:09AM +0800, Richard Zhao wrote: > The errors were caused by copy/paste mistake in below commit > since v3.10: > 3489d50 ASoC: tegra: Use common DAI DMA data struct Applied, thanks.

1 0

[alsa-devel] [PATCH 1/3] ASoC: fsl: fsl_ssi: Add MODULE_ALIAS
by Fabio Estevam 22 Jul '13

22 Jul '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> Add MODULE_ALIAS, so that auto module loading can work. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- 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 c9974a4..429fbfd 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -900,6 +900,7 @@ static struct platform_driver fsl_ssi_driver = { module_platform_driver(fsl_ssi_driver); +MODULE_ALIAS("platform:fsl-ssi-dai"); MODULE_AUTHOR("Timur Tabi <timur(a)freescale.com>"); MODULE_DESCRIPTION("Freescale Synchronous Serial Interface (SSI) ASoC Driver"); MODULE_LICENSE("GPL v2"); -- 1.8.1.2

3 6