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

[alsa-devel] [PATCH] ASoC: Samsung: Update Kconfig for Exynos5250 and Exynos4412
by Padmavathi Venna 01 Aug '12

01 Aug '12

Update Kconfig file to support the Exynos5250 and Exynos4412 Signed-off-by: Sangsu Park <sangsu4u.park(a)samsung.com> Signed-off-by: Sangbeom Kim <sbkim73(a)samsung.com> Signed-off-by: Padmavathi Venna <padma.v(a)samsung.com> --- sound/soc/samsung/Kconfig | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index fe3995c..d54e400 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 ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4 + depends on PLAT_SAMSUNG select S3C64XX_DMA if ARCH_S3C64XX select S3C2410_DMA if ARCH_S3C24XX help @@ -63,7 +63,7 @@ config SND_SOC_SAMSUNG_SMDK_WM8580 config SND_SOC_SAMSUNG_SMDK_WM8994 tristate "SoC I2S Audio support for WM8994 on SMDK" - depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212) + depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212 || MACH_SMDK4412 || SOC_EXYNOS5250) depends on I2C=y && GENERIC_HARDIRQS select MFD_WM8994 select SND_SOC_WM8994 @@ -162,7 +162,7 @@ config SND_SOC_GONI_AQUILA_WM8994 config SND_SOC_SAMSUNG_SMDK_SPDIF tristate "SoC S/PDIF Audio support for SMDK" - depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210 || MACH_SMDKV310 || MACH_SMDK4212) + depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210 || MACH_SMDKV310 || MACH_SMDK4212 || MACH_SMDK4412 || SOC_EXYNOS5250) select SND_SAMSUNG_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK. @@ -177,7 +177,7 @@ config SND_SOC_SMDK_WM8580_PCM config SND_SOC_SMDK_WM8994_PCM tristate "SoC PCM Audio support for WM8994 on SMDK" - depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212) + depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212 || MACH_SMDK4412 || SOC_EXYNOS5250) depends on I2C=y && GENERIC_HARDIRQS select MFD_WM8994 select SND_SOC_WM8994 -- 1.7.4.4

3 2

[alsa-devel] [PATCH 0/2] ASOC: SAMSUNG: Add dt support for i2s
by Padmavathi Venna 01 Aug '12

01 Aug '12

This patch series adds device tree based discovery support for Samsung's i2s controller. This is tested on Exynos5250 with 8994 codec for playback and capturing modes on 3.5.0-rc7 Padmavathi Venna (2): ASOC: SAMSUNG: Add DT support for i2s ASOC: SAMSUNG: Add dma_prop variable in s3c_dma_params .../devicetree/bindings/sound/samsung-i2s.txt | 62 ++++++ sound/soc/samsung/dma.c | 1 + sound/soc/samsung/dma.h | 1 + sound/soc/samsung/i2s.c | 228 +++++++++++++++----- 4 files changed, 243 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt -- 1.7.4.4

3 4

[alsa-devel] [PATCH 1/1] ASoC: sgtl5000: enable VAG_POWER for LINE_IN
by Dong Aisheng 01 Aug '12

01 Aug '12

From: Dong Aisheng <dong.aisheng(a)linaro.org> LINE_IN also needs VAG_POWER on or we may hear noise when directly route LINE_IN to Headphone Mux. Tested on imx28evk. Signed-off-by: Dong Aisheng <dong.aisheng(a)linaro.org> --- sound/soc/codecs/sgtl5000.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 5c54b6f..df2f99d 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -239,6 +239,7 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = { {"Headphone Mux", "DAC", "DAC"}, /* dac --> hp_mux */ {"LO", NULL, "DAC"}, /* dac --> line_out */ + {"LINE_IN", NULL, "VAG_POWER"}, {"Headphone Mux", "LINE_IN", "LINE_IN"},/* line_in --> hp_mux */ {"HP", NULL, "Headphone Mux"}, /* hp_mux --> hp */ -- 1.7.0.4

3 4

[alsa-devel] [PATCH] ASoC: imx-ssi: Say if we fail to register a second AC'97 bus
by Mark Brown 31 Jul '12

31 Jul '12

Saves anyone wondering what happened if they run into this error. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/fsl/imx-ssi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 28dd76c..6e8a8eb 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -566,6 +566,7 @@ static int imx_ssi_probe(struct platform_device *pdev) if (ssi->flags & IMX_SSI_USE_AC97) { if (ac97_ssi) { + dev_err(&pdev->dev, "AC'97 SSI already registered\n"); ret = -EBUSY; goto failed_ac97; } -- 1.7.9.1

1 0

Re: [alsa-devel] [PATCH] ASoC: imx-ssi: Use devm functions
by Mark Brown 31 Jul '12

31 Jul '12

On Fri, Jul 27, 2012 at 02:32:10PM -0300, Fabio Estevam wrote: > Using devm_ functions can make the code simpler and smaller. Applied, thanks.

1 0

[alsa-devel] [PATCH v3 1/2] ALSA: ASoC: add DT bindings for cs4270
by Daniel Mack 31 Jul '12

31 Jul '12

Signed-off-by: Daniel Mack <zonque(a)gmail.com> Cc: Timur Tabi <timur(a)freescale.com> --- Documentation/devicetree/bindings/sound/cs4270.txt | 16 ++++++++++++++++ sound/soc/codecs/cs4270.c | 11 +++++++++++ 2 files changed, 27 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt diff --git a/Documentation/devicetree/bindings/sound/cs4270.txt b/Documentation/devicetree/bindings/sound/cs4270.txt new file mode 100644 index 0000000..7f0bfd8 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/cs4270.txt @@ -0,0 +1,16 @@ +CS4270 audio CODEC + +The driver for this device currently only supports I2C. + +Required properties: + + - compatible : "cirrus,cs4270" + + - reg : the I2C address of the device for I2C + +Example: + +codec: cs4270@48 { + compatible = "cirrus,cs4270"; + reg = <0x48>; +}; diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 047917f..4b71b01 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -29,6 +29,7 @@ #include <linux/i2c.h> #include <linux/delay.h> #include <linux/regulator/consumer.h> +#include <linux/of_device.h> /* * The codec isn't really big-endian or little-endian, since the I2S @@ -639,6 +640,15 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = { .reg_cache_default = cs4270_default_reg_cache, }; +/* + * cs4270_of_match - the device tree bindings + */ +static const struct of_device_id cs4270_of_match[] = { + { .compatible = "cirrus,cs4270", }, + { } +}; +MODULE_DEVICE_TABLE(of, cs4270_of_match); + /** * cs4270_i2c_probe - initialize the I2C interface of the CS4270 * @i2c_client: the I2C client object @@ -718,6 +728,7 @@ static struct i2c_driver cs4270_i2c_driver = { .driver = { .name = "cs4270", .owner = THIS_MODULE, + .of_match_table = cs4270_of_match, }, .id_table = cs4270_id, .probe = cs4270_i2c_probe, -- 1.7.10.4

4 12

[alsa-devel] [PATCH] ASoC: AC97 doesn't use regmap by default
by Manuel Lauss 31 Jul '12

31 Jul '12

From: Manuel Lauss <manuel.lauss(a)googlemail.com> Since commit 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9 ("ASoC: core: Try to use regmap if the driver doesn't set up any I/O") any ASoC codec which doesn't set codec::control_data is assumed to use regmap. That doesn't work with AC97 so this workaround sets the codec::control_data member to a random value to restore proper behaviour. Tested with WM9712. Signed-off-by: Manuel Lauss <manuel.lauss(a)googlemail.com> --- sound/soc/codecs/ad1980.c | 1 + sound/soc/codecs/stac9766.c | 1 + sound/soc/codecs/wm9712.c | 1 + sound/soc/codecs/wm9713.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/ad1980.c b/sound/soc/codecs/ad1980.c index 8c39ddd..11b1b71 100644 --- a/sound/soc/codecs/ad1980.c +++ b/sound/soc/codecs/ad1980.c @@ -186,6 +186,7 @@ static int ad1980_soc_probe(struct snd_soc_codec *codec) printk(KERN_INFO "AD1980 SoC Audio Codec\n"); + codec->control_data = codec; /* we don't use regmap! */ ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "ad1980: failed to register AC97 codec\n"); diff --git a/sound/soc/codecs/stac9766.c b/sound/soc/codecs/stac9766.c index 982e437..33c0f3d 100644 --- a/sound/soc/codecs/stac9766.c +++ b/sound/soc/codecs/stac9766.c @@ -340,6 +340,7 @@ static int stac9766_codec_probe(struct snd_soc_codec *codec) printk(KERN_INFO "STAC9766 SoC Audio Codec %s\n", STAC9766_VERSION); + codec->control_data = codec; /* we don't use regmap! */ ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) goto codec_err; diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index 099e6ec..f16fb36 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -619,6 +619,7 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec) { int ret = 0; + codec->control_data = codec; /* we don't use regmap! */ ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) { printk(KERN_ERR "wm9712: failed to register AC97 codec\n"); diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 3eb19fb..d0b8a32 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1196,6 +1196,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) if (wm9713 == NULL) return -ENOMEM; snd_soc_codec_set_drvdata(codec, wm9713); + codec->control_data = wm9713; /* we don't use regmap! */ ret = snd_soc_new_ac97_codec(codec, &soc_ac97_ops, 0); if (ret < 0) -- 1.7.8.6

2 1

[alsa-devel] [PATCH 0/6] Bugfixes and clean-ups bound for the v3.6 RCs
by Lee Jones 31 Jul '12

31 Jul '12

This patch-set includes some important changes which should make their way to the Mainline Release Candidates for the v3.6 release. Without them Audio doesn't even probe (at all) when booting with Device Tree selected. The kernel can't compile with ux500 audio enabled. Even if we can get that far SoC Core will assume we're using regmaps and attempt to use them; however, none exist for this driver, so the kernel will oops. arch/arm/mach-ux500/board-mop500-msp.c | 2 +- arch/arm/mach-ux500/board-mop500.c | 9 ++++----- sound/soc/codecs/ab8500-codec.c | 4 ++++ sound/soc/soc-dapm.c | 2 -- 4 files changed, 9 insertions(+), 8 deletions(-)

2 9

[alsa-devel] [PATCH] ASoC: wm8994: enable mic and short detect debounce.
by Mark Brown 31 Jul '12

31 Jul '12

From: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> Signed-off-by: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 5fc3179..02080da 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3262,6 +3262,12 @@ int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, snd_soc_update_bits(codec, WM8994_MICBIAS, WM8994_MICD_ENA, reg); + /* enable MICDET and MICSHRT deboune */ + snd_soc_update_bits(codec, WM8994_IRQ_DEBOUNCE, + WM8994_MIC1_DET_DB_MASK | WM8994_MIC1_SHRT_DB_MASK | + WM8994_MIC2_DET_DB_MASK | WM8994_MIC2_SHRT_DB_MASK, + WM8994_MIC1_DET_DB | WM8994_MIC1_SHRT_DB); + snd_soc_dapm_sync(&codec->dapm); return 0; -- 1.7.10.4

1 0

[alsa-devel] ASoC: wm9712 / AC97 probe causes regmap oops
by Manuel Lauss 31 Jul '12

31 Jul '12

Commit 38cbf9598feba97de9f9b43efa9153fd7c1a2ec9 ("ASoC: core: Try to use regmap if the driver doesn't set up any I/O") causes an oops on boot when the wm9712 AC97 codec is probed. Reverting it (or alternatively setting wm9712's codec::control_data to a random pointer) fixes it. Thanks, Manuel Lauss DSPS A reading from reg 128 of wm9712-codec.1 CPU 0 Unable to handle kernel paging request at virtual address 00000064, epc == 804d7190, ra == 805edabc Oops[#1]: Cpu 0 $ 0 : 00000000 10003c00 00000000 809c208c $ 4 : 00000000 00000080 8fc2bbb8 00000002 $ 8 : 00000000 10003c00 00000010 000000a2 $12 : 38323120 ffffffe0 00000000 20666f20 $16 : 8fdc77e0 00000080 00000001 00000000 $20 : 00000005 00000080 808aa9b8 809932b8 $24 : 00000010 805eda20 $28 : 8fc2a000 8fc2bb88 00000000 805edabc Hi : 00000000 Lo : 0000014a epc : 804d7190 regmap_read+0xc/0x6c Not tainted ra : 805edabc hw_read+0x9c/0xac Status: 10003c03 KERNEL EXL IE Cause : 00808008 BadVA : 00000064 PrId : 800c8000 (Au1300) Process swapper (pid: 1, threadinfo=8fc2a000, task=8fc29a48, tls=00000000) Stack : 00000001 00000000 00000005 00000080 809918ec 8fc2bbb4 8fdc77e0 805edabc 8fe178a0 805df5f4 80958039 00000080 8fe0d320 00000002 8fc2bbd4 8fe0a720 8fe15b40 805e4abc 2063694d 8fe0a720 808ab1bc 00000000 00000000 8fe15b40 8fe0a720 8fe166e0 809932d0 8fdc7878 80993158 805e5170 00000001 805e03fc 805e04d0 805e0604 8fe1d960 8fe0f400 00000000 00000035 8fe0f400 00000000 ... Call Trace: [<804d7190>] regmap_read+0xc/0x6c [<805edabc>] hw_read+0x9c/0xac [<805e4abc>] dapm_set_path_status+0x114/0x3c8 [<805e5170>] snd_soc_dapm_add_route+0x400/0x64c [<805e6de8>] snd_soc_dapm_add_routes+0x68/0xcc [<805dfe94>] soc_probe_codec+0x150/0x214 [<805e2138>] snd_soc_register_card+0xcb8/0x1614 [<804c916c>] driver_probe_device+0x8c/0x248 [<804c93e4>] __driver_attach+0xbc/0xc4 [<804c734c>] bus_for_each_dev+0x54/0xa0 [<804c7de8>] bus_add_driver+0x1ac/0x2a4 [<804c9b60>] driver_register+0x90/0x1d0 [<809f6a2c>] do_one_initcall+0xf8/0x1d0 [<809f6c4c>] kernel_init+0x148/0x1e4 [<80106f88>] kernel_thread_helper+0x10/0x18 -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 1