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

[alsa-devel] [PATCH] ASoC: Include linux/io.h for jz4740 codec
by Axel Lin 06 Dec '11

06 Dec '11

Include linux/io.h to fix below build errors: CC sound/soc/codecs/jz4740.o sound/soc/codecs/jz4740.c: In function 'jz4740_codec_read': sound/soc/codecs/jz4740.c:82: error: implicit declaration of function 'readl' sound/soc/codecs/jz4740.c: In function 'jz4740_codec_write': sound/soc/codecs/jz4740.c:92: error: implicit declaration of function 'writel' sound/soc/codecs/jz4740.c: In function 'jz4740_codec_probe': sound/soc/codecs/jz4740.c:373: error: implicit declaration of function 'ioremap' sound/soc/codecs/jz4740.c:373: warning: assignment makes pointer from integer without a cast sound/soc/codecs/jz4740.c:393: error: implicit declaration of function 'iounmap' make[3]: *** [sound/soc/codecs/jz4740.o] Error 1 make[2]: *** [sound/soc/codecs] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/jz4740.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 517e2a5..d73d283 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -15,6 +15,7 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/io.h> #include <linux/delay.h> -- 1.7.5.4

3 2

[alsa-devel] [RFC][PATCH] ASoC: Fix build dependency for SND_SOC_JZ4740_CODEC
by Axel Lin 06 Dec '11

06 Dec '11

Currently SND_SOC_JZ4740_CODEC depends on SOC_JZ4740 but SOC_JZ4740 is not defined in any Kconfig. Thus the codec driver will not be built when select "Build all ASoC CODEC drivers". (Unless it is selected by SND_JZ4740_SOC_QI_LB60). Remove the dependency with SOC_JZ4740, then this code driver can be built when select "Build all ASoC CODEC drivers". Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- I'm a little bit doubt if I should just remove the dependency as this patch does. Or alternatively make it depends on MACH_JZ4740. Comments? Axel sound/soc/codecs/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index bc2364ac..7c205e7 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -35,7 +35,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CX20442 select SND_SOC_DA7210 if I2C select SND_SOC_DFBMCS320 - select SND_SOC_JZ4740_CODEC if SOC_JZ4740 + select SND_SOC_JZ4740_CODEC select SND_SOC_LM4857 if I2C select SND_SOC_MAX98088 if I2C select SND_SOC_MAX98095 if I2C -- 1.7.5.4

3 2

[alsa-devel] ASoC updates for 3.3
by Mark Brown 06 Dec '11

06 Dec '11

The following changes since commit fd8f2e496f38264a64c0cc7948217659019a9e8a: Merge branch 'for-3.2' into for-3.3 (2011-11-28 23:18:39 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.3 Lots of mechanical updates here so a large diffstat. Axel Lin (10): ASoC: Convert smdk_wm8994pcm to use module_platform_driver() ASoC: cs42l73: Fix clear wrong bits in cs42l73_set_dai_fmt ASoC: kirkwood: Make SND_KIRKWOOD_SOC_OPENRD and SND_KIRKWOOD_SOC_T5325 depend on I2C ASoC: Make SND_SOC_LITTLEMILL select MFD_WM8994 ASoC: uda1380: Return proper error in uda1380_modinit failure path ASoC: Fix dependency for SND_SOC_RAUMFELD and SND_PXA2XX_SOC_HX4700 ASoC: Make SND_SOC_MX27VIS_AIC32X4 depend on I2C ASoC: Convert e740_wm9705 to use gpio_request_one() ASoC: uda1380: Convert to gpio_request_one() ASoC: Fix reg_cache_size for stac9766 Lars-Peter Clausen (8): firmware: Sigma: Prevent out of bounds memory access firmware: Sigma: Skip header during CRC generation firmware: Sigma: Fix endianess issues ASoC: Move SigmaDSP firmware loader to ASoC ASoC: SigmaDSP: Provide diagnostic error messages ASoC: SigmaDSP: Move private structs and functions to C file ASoC: SigmaDSP: Add regmap support ASoC: Drop unused state parameter from CODEC suspend callback Mark Brown (58): Merge branch 'for-3.2' into for-3.3 ASoC: Ensure SYSCLK is enabled for WM8958 accessory detection ASoC: Fix __iomem annotation for IDMA registers ASoC: Put WM8958 and WM1811 MICBIAS into bypass mode when no audio ASoC: Enhance default WM8958 microphone detection ASoC: Rename Speyside WM8962 to Tobermory ASoC: Provide debug log of accessory status on WM8958 ASoC: Don't use control_data to get struct wm8994 ASoC: Tune down active mode detection rate for WM8958 mic detection ASoC: Allow more WM8958/WM1811 button levels with default handler ASoC: Rename WM8994 detecting flag to mic_detecting ASoC: Implement support for WM1811A jack detection ASoC: Ensure we reconfigure WM8958 microphone detection on rate changes ASoC: Add platform data for WM8958/WM1811 microphone detection rates ASoC: Convert WM8994 to devm_kzalloc() ASoC: Add signal generator widget type ASoC: Make WM5100 tone generator widgets signal generators ASoC: Make WM8962 beep a signal generator ASoC: Add missing err label ASoC: Add WM8958 based headset detection on Littlemill ASoC: Convert WM8994 MICBIASes to supply widgets ASoC: Map microphones on Littlemill ASoC: Mark WM8994 ADC muxes as virtual Merge branch 'for-3.2' into for-3.3 ASoC: Convert WM8903 to devm_kzalloc() ASoC: Use table based control init for WM8903 ASoC: WM8903 only supports I2C so don't ifdef it ASoC: Use a normal cache sync for WM8903 ASoC: Don't resync WM8903 register cache on reset ASoC: Convert WM8903 to direct regmap API usage ASoC: Move initial WM8903 identification and reset to I2C probe Merge branch 'for-3.2' into for-3.3 ASoC: Remove unused -codec from Wolfson device driver names ASoC: Remove I2C ifdefs from WM8960 ASoC: Remove unused AUDIO_NAME define from WM8960 ASoC: Convert WM2000 to devm_kzalloc() ASoC: Convert WM8350 to devm_kzalloc() ASoC: Convert WM8400 to devm_kzalloc() ASoC: Convert WM8741 to devm_kzalloc() ASoC: Convert WM8750 to devm_kzalloc() ASoC: Convert WM9090 to devm_kzalloc() ASoC: Convert WM8350 to table based DAPM and control init ASoC: Convert WM8400 to table based DAPM and control init ASoC: Convert WM8510 to table based DAPM and control init ASoC: Convert WM8580 to table based DAPM and control init ASoC: Convert WM8741 to table based DAPM and control init ASoC: Convert WM8750 to table based DAPM and control init ASoC: Convert WM8711 to table based control init ASoC: Convert WM8728 to table based control init ASoC: Remove unused struct wm2000_setup_data ASoC: Convert wm2000 to use regmap API ASoC: Convert WM2000 into a standard CODEC driver ASoC: Sort WM9090 in with the CODEC drivers Merge branch 'for-3.2' into for-3.3 ASoC: Remove references to corgi and spitz from machine driver document Merge branch 'for-3.2' into for-3.3 ASoC: Provide a more complete DMA driver stub Merge branch 'for-3.2' into for-3.3 Stephen Warren (3): ASoC: Tegra I2S: Add device tree binding ASoC: WM8903: Disallow all invalid gpio_cfg pdata values ASoC: WM8903: Create default platform data structure Timur Tabi (2): ASoC: p1022ds: add support for fsl,P1022 and fsl,P1022DS model names ASoC: fsl/powerpc: don't rely on the cell-index property Vinod Koul (1): ASoC: sst_platform: fix the dsp driver interface .../devicetree/bindings/sound/tegra20-i2s.txt | 17 + Documentation/sound/alsa/soc/machine.txt | 6 +- MAINTAINERS | 1 + arch/arm/mach-s3c64xx/mach-crag6410.c | 6 +- drivers/firmware/Kconfig | 12 - drivers/firmware/Makefile | 1 - drivers/firmware/sigma.c | 118 ----- include/linux/mfd/wm8994/pdata.h | 23 + include/linux/mfd/wm8994/registers.h | 16 + include/linux/sigma.h | 60 --- include/sound/soc-dapm.h | 4 + include/sound/soc.h | 3 +- sound/soc/codecs/Kconfig | 18 +- sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/ac97.c | 2 +- sound/soc/codecs/ad1836.c | 2 +- sound/soc/codecs/adau1373.c | 2 +- sound/soc/codecs/adau1701.c | 2 +- sound/soc/codecs/adav80x.c | 2 +- sound/soc/codecs/ak4535.c | 2 +- sound/soc/codecs/ak4641.c | 2 +- sound/soc/codecs/alc5623.c | 2 +- sound/soc/codecs/alc5632.c | 2 +- sound/soc/codecs/cs4270.c | 2 +- sound/soc/codecs/cs4271.c | 2 +- sound/soc/codecs/cs42l73.c | 5 +- sound/soc/codecs/jz4740.c | 2 +- sound/soc/codecs/max98088.c | 2 +- sound/soc/codecs/max98095.c | 2 +- sound/soc/codecs/max9850.c | 2 +- sound/soc/codecs/pcm3008.c | 2 +- sound/soc/codecs/rt5631.c | 2 +- sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sigmadsp.c | 246 ++++++++++ sound/soc/codecs/sigmadsp.h | 21 + sound/soc/codecs/ssm2602.c | 2 +- sound/soc/codecs/sta32x.c | 2 +- sound/soc/codecs/stac9766.c | 5 +- sound/soc/codecs/tlv320aic23.c | 3 +- sound/soc/codecs/tlv320aic32x4.c | 2 +- sound/soc/codecs/tlv320aic3x.c | 2 +- sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/twl4030.c | 2 +- sound/soc/codecs/twl6040.c | 2 +- sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 34 +- sound/soc/codecs/wm2000.c | 226 ++++----- sound/soc/codecs/wm2000.h | 7 - sound/soc/codecs/wm5100.c | 2 +- sound/soc/codecs/wm8350.c | 49 +-- sound/soc/codecs/wm8400.c | 40 +- sound/soc/codecs/wm8510.c | 27 +- sound/soc/codecs/wm8523.c | 2 +- sound/soc/codecs/wm8580.c | 24 +- sound/soc/codecs/wm8711.c | 7 +- sound/soc/codecs/wm8727.c | 2 +- sound/soc/codecs/wm8728.c | 7 +- sound/soc/codecs/wm8731.c | 2 +- sound/soc/codecs/wm8737.c | 2 +- sound/soc/codecs/wm8741.c | 40 +- sound/soc/codecs/wm8750.c | 37 +- sound/soc/codecs/wm8753.c | 2 +- sound/soc/codecs/wm8770.c | 2 +- sound/soc/codecs/wm8776.c | 2 +- sound/soc/codecs/wm8804.c | 2 +- sound/soc/codecs/wm8900.c | 6 +- sound/soc/codecs/wm8903.c | 478 +++++++++--------- sound/soc/codecs/wm8904.c | 4 +- sound/soc/codecs/wm8940.c | 4 +- sound/soc/codecs/wm8955.c | 4 +- sound/soc/codecs/wm8960.c | 12 +- sound/soc/codecs/wm8961.c | 4 +- sound/soc/codecs/wm8962.c | 2 +- sound/soc/codecs/wm8971.c | 4 +- sound/soc/codecs/wm8974.c | 4 +- sound/soc/codecs/wm8978.c | 2 +- sound/soc/codecs/wm8983.c | 2 +- sound/soc/codecs/wm8985.c | 2 +- sound/soc/codecs/wm8988.c | 4 +- sound/soc/codecs/wm8990.c | 4 +- sound/soc/codecs/wm8991.c | 2 +- sound/soc/codecs/wm8993.c | 4 +- sound/soc/codecs/wm8994.c | 517 +++++++++++++++++--- sound/soc/codecs/wm8994.h | 11 +- sound/soc/codecs/wm8995.c | 2 +- sound/soc/codecs/wm9081.c | 2 +- sound/soc/codecs/wm9090.c | 9 +- sound/soc/codecs/wm9705.c | 2 +- sound/soc/codecs/wm9712.c | 3 +- sound/soc/codecs/wm9713.c | 3 +- sound/soc/codecs/wm_hubs.c | 4 +- sound/soc/fsl/mpc8610_hpcd.c | 13 +- sound/soc/fsl/p1022_ds.c | 49 ++- sound/soc/imx/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 3 +- sound/soc/mid-x86/Kconfig | 1 - sound/soc/mid-x86/sst_platform.c | 130 ++++-- sound/soc/mid-x86/sst_platform.h | 82 +++- sound/soc/pxa/Kconfig | 3 +- sound/soc/pxa/e740_wm9705.c | 20 +- sound/soc/samsung/Kconfig | 5 +- sound/soc/samsung/Makefile | 4 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/idma.c | 2 +- sound/soc/samsung/idma.h | 2 +- sound/soc/samsung/littlemill.c | 25 + sound/soc/samsung/smdk_wm8994pcm.c | 14 +- .../soc/samsung/{speyside_wm8962.c => tobermory.c} | 66 ++-- sound/soc/soc-core.c | 2 +- sound/soc/soc-dapm.c | 7 + sound/soc/soc-utils.c | 31 ++- sound/soc/tegra/tegra_i2s.c | 27 +- 112 files changed, 1664 insertions(+), 1065 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tegra20-i2s.txt delete mode 100644 drivers/firmware/sigma.c delete mode 100644 include/linux/sigma.h create mode 100644 sound/soc/codecs/sigmadsp.c create mode 100644 sound/soc/codecs/sigmadsp.h rename sound/soc/samsung/{speyside_wm8962.c => tobermory.c} (72%)

1 0

[alsa-devel] [PATCH] sound: soc: samsung: neo1973_wm8753: remove references to machine_is_neo1973_gta01
by Denis 'GNUtoo' Carikli 06 Dec '11

06 Dec '11

The Openmoko GTA01 machine has been removed from the machine ID database, so we need to remove references to it as well. Without that fix we have: sound/soc/samsung/neo1973_wm8753.c: In function ‘neo1973_wm8753_init’: sound/soc/samsung/neo1973_wm8753.c:325:2: error: implicit declaration of function ‘machine_is_neo1973_gta01’ Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- sound/soc/samsung/neo1973_wm8753.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index 7207189..4d35297 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c @@ -322,10 +322,6 @@ static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd) int ret; /* set up NC codec pins */ - if (machine_is_neo1973_gta01()) { - snd_soc_dapm_nc_pin(dapm, "LOUT2"); - snd_soc_dapm_nc_pin(dapm, "ROUT2"); - } snd_soc_dapm_nc_pin(dapm, "OUT3"); snd_soc_dapm_nc_pin(dapm, "OUT4"); snd_soc_dapm_nc_pin(dapm, "LINE1"); @@ -479,7 +475,7 @@ static int __init neo1973_init(void) { int ret; - if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02()) + if (!machine_is_neo1973_gta02()) return -ENODEV; if (machine_is_neo1973_gta02()) { -- 1.7.4.1

3 2

[alsa-devel] Mp3 files by ALSA
by `/ET!-!iS!-! 06 Dec '11

06 Dec '11

Hi I want to know how mp3 files are handled by ALSA . how audio data is handled for 4.1 channel and 5.1 channel . Regards yethish

1 0

Re: [alsa-devel] [PATCH 4/6] compress: add API header and driver header files
by Mark Brown 06 Dec '11

06 Dec '11

On Mon, Dec 05, 2011 at 08:14:13AM -0600, Pierre-Louis Bossart wrote: > The answer has already been provided. I agree with Mark there's no reason > why this API would need to provide resource management capabilities, it'd > need to be handled with a separate interface addressing PCM and effects as > well. In the mean time user-space can put product-specific restrictions on > concurrent decoding. Or implement graceful fallback to the CPU if it can't set up an offloaded stream.

2 1

[alsa-devel] [PATCH] plug: Move fast_ops copy after slave configuration.
by Reilly Grant 06 Dec '11

06 Dec '11

The plug plugin copies the fast_ops structure and fast_op_arg from its slave PCM on initialization and after inserting a new plugin. This works unless the slave PCM is also an instance of the plug plugin because plug can change its fast_ops structure during _snd_pcm_hw_params. Instead of copying fast_ops in snd_pcm_plug_insert_plugins wait until the end of snd_pcm_plug_hw_params when the slave has been fully initialized. This fixes a crash when two instances of plug are instantiated back to back and the format conversion plugin inserted by the second is skipped by the first because the fast_ops pointer is not properly updated. --- src/pcm/pcm_plug.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index e9d2923..72456d5 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -659,8 +659,6 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm, } if (err) { plug->gen.slave = new; - pcm->fast_ops = new->fast_ops; - pcm->fast_op_arg = new->fast_op_arg; } k++; } @@ -1049,6 +1047,9 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) } snd_pcm_unlink_hw_ptr(pcm, plug->req_slave); snd_pcm_unlink_appl_ptr(pcm, plug->req_slave); + + pcm->fast_ops = slave->fast_ops; + pcm->fast_op_arg = slave->fast_op_arg; snd_pcm_link_hw_ptr(pcm, slave); snd_pcm_link_appl_ptr(pcm, slave); return 0; -- 1.7.3.4

1 0

[alsa-devel] [PATCH] ASoC: Remove references to corgi and spitz from machine driver document
by Mark Brown 05 Dec '11

05 Dec '11

They're not currently actively worked on, the hardware being rather obsolete by now. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Documentation/sound/alsa/soc/machine.txt | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt index 3e2ec9c..d50c14d 100644 --- a/Documentation/sound/alsa/soc/machine.txt +++ b/Documentation/sound/alsa/soc/machine.txt @@ -50,8 +50,7 @@ Machine DAI Configuration The machine DAI configuration glues all the codec and CPU DAIs together. It can also be used to set up the DAI system clock and for any machine related DAI initialisation e.g. the machine audio map can be connected to the codec audio -map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c -for examples. +map, unconnected codec pins can be set as such. struct snd_soc_dai_link is used to set up each DAI in your machine. e.g. @@ -83,8 +82,7 @@ Machine Power Map The machine driver can optionally extend the codec power map and to become an audio power map of the audio subsystem. This allows for automatic power up/down of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack -sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for -details. +sockets in the machine init function. Machine Controls -- 1.7.7.3

1 0

[alsa-devel] [PATCH 1/2] ASoC: Take a pm_runtime reference on DAPM devices that are enabled
by Mark Brown 05 Dec '11

05 Dec '11

As for PCMs take a runtime power management reference to devices that are in a non-off bias, avoiding the need to do this in individual drivers. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index f47e869..1a9fa47 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -39,6 +39,7 @@ #include <linux/platform_device.h> #include <linux/jiffies.h> #include <linux/debugfs.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> @@ -1213,6 +1214,9 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie) /* If we're off and we're not supposed to be go into STANDBY */ if (d->bias_level == SND_SOC_BIAS_OFF && d->target_bias_level != SND_SOC_BIAS_OFF) { + if (d->dev) + pm_runtime_get_sync(d->dev); + ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_STANDBY); if (ret != 0) dev_err(d->dev, @@ -1252,6 +1256,9 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie) ret = snd_soc_dapm_set_bias_level(d, SND_SOC_BIAS_OFF); if (ret != 0) dev_err(d->dev, "Failed to turn off bias: %d\n", ret); + + if (d->dev) + pm_runtime_put_sync(d->dev); } /* If we just powered up then move to active bias */ -- 1.7.7.3

1 1

[alsa-devel] [PATCH] ASoC: Fix reg_cache_size for stac9766
by Axel Lin 05 Dec '11

05 Dec '11

reg_cache_size is supposed to be the number of elements in the register cache, not the size in bytes. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/stac9766.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 5581953..da71615 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -380,7 +380,7 @@ static struct snd_soc_codec_driver soc_codec_dev_stac9766 = { .remove = stac9766_codec_remove, .suspend = stac9766_codec_suspend, .resume = stac9766_codec_resume, - .reg_cache_size = sizeof(stac9766_reg), + .reg_cache_size = ARRAY_SIZE(stac9766_reg), .reg_word_size = sizeof(u16), .reg_cache_step = 2, .reg_cache_default = stac9766_reg, -- 1.7.5.4

2 3