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

[alsa-devel] submiting an asoc-core patch with codec updates
by Brian Austin 29 Mar '12

29 Mar '12

I would like to submit a patch that adds some new macros for TLV in ASoC. this patch requires changes in 2 codecs (CS42L51,CS42L73). Should I submit just the asoc-core patch then follow up with the codec patches or just submit as a series? Thanks, Brian

2 1

[alsa-devel] ASoC updates for 3.4
by Mark Brown 29 Mar '12

29 Mar '12

The following changes since commit 22f8d055350066b4a87de4adea8c5213cac54534: ASoC: wm8994: Provide VMID mode control and fix default sequence (2012-03-19 19:08:17 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.4 for you to fetch changes up to 41ba6b711a40b83a877ae8242a4b3e692de91f97: ASoC: dmaengine_pcm: use dmaengine cyclic wrapper (2012-03-26 18:28:11 +0100) Not sure where your current ASoC branch is - topic/asoc and fix/asoc are both behind Linus' tree (which is what this pull request was generated against). ---------------------------------------------------------------- ASoC: A few more updates for 3.4 The cleanup of the dmaengine parameter messup and a tweak to some callibration values for WM1811. ---------------------------------------------------------------- Fabio Estevam (1): ASoC: Add extra parameter to device_prep_dma_cyclic Mark Brown (1): ASoC: wm8994: Update WM8994 DCS calibration Vinod Koul (1): ASoC: dmaengine_pcm: use dmaengine cyclic wrapper sound/soc/codecs/wm8994.c | 2 +- sound/soc/soc-dmaengine-pcm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

2 2

[alsa-devel] [PATCH] sound: fix isa/opti9xx module param type
by Randy Dunlap 29 Mar '12

29 Mar '12

From: Randy Dunlap <rdunlap(a)xenotime.net> Fix module parameter data type to eliminate build warnings. sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer type sound/isa/opti9xx/opti92x-ad1848.c:87:1: warning: return from incompatible pointer type Signed-off-by: Randy Dunlap <rdunlap(a)xenotime.net> --- sound/isa/opti9xx/opti92x-ad1848.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-next-20120328.orig/sound/isa/opti9xx/opti92x-ad1848.c +++ linux-next-20120328/sound/isa/opti9xx/opti92x-ad1848.c @@ -65,7 +65,7 @@ static int index = SNDRV_DEFAULT_IDX1; / static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ //static bool enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ #ifdef CONFIG_PNP -static int isapnp = 1; /* Enable ISA PnP detection */ +static bool isapnp = true; /* Enable ISA PnP detection */ #endif static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */

2 1

[alsa-devel] [PATCH] sound: fix oss/msnd_pinnacle module param type
by Randy Dunlap 29 Mar '12

29 Mar '12

From: Randy Dunlap <rdunlap(a)xenotime.net> Fix module parameter data type to eliminate build warning. sound/oss/msnd_pinnacle.c:1727:1: warning: return from incompatible pointer type Signed-off-by: Randy Dunlap <rdunlap(a)xenotime.net> --- sound/oss/msnd_pinnacle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-next-20120328.orig/sound/oss/msnd_pinnacle.c +++ linux-next-20120328/sound/oss/msnd_pinnacle.c @@ -1631,7 +1631,7 @@ static int ide_irq __initdata = 0; static int joystick_io __initdata = 0; /* If we have the digital daugherboard... */ -static int digital __initdata = 0; +static bool digital __initdata = false; #endif static int fifosize __initdata = DEFFIFOSIZE;

2 1

[alsa-devel] [PATCH v2] ASoC: da7210: Add support for spi regmap
by Ashish Chavan 29 Mar '12

29 Mar '12

This patch adds support for spi regmap feature to existing da7210 driver. Signed-off-by: Ashish Chavan <ashish.chavan(a)kpitcummins.com> Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> --- Changes since v1: - used regmap_register_patch() to write special register sequences - used devm_kzalloc() instead of kzalloc() - used devm_regmap_init_spi() instead of regmap_init_spi() - removed "-codec" from codec name string --- sound/soc/codecs/da7210.c | 154 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 133 insertions(+), 21 deletions(-) diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index 7843711..8e45aa9 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c @@ -17,6 +17,7 @@ #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/spi/spi.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/module.h> @@ -27,6 +28,7 @@ #include <sound/tlv.h> /* DA7210 register space */ +#define DA7210_PAGE_CONTROL 0x00 #define DA7210_CONTROL 0x01 #define DA7210_STATUS 0x02 #define DA7210_STARTUP1 0x03 @@ -631,6 +633,7 @@ struct da7210_priv { }; static struct reg_default da7210_reg_defaults[] = { + { 0x00, 0x00 }, { 0x01, 0x11 }, { 0x03, 0x00 }, { 0x04, 0x00 }, @@ -928,13 +931,6 @@ static int da7210_probe(struct snd_soc_codec *codec) */ /* - * make sure that DA7210 use bypass mode before start up - */ - snd_soc_write(codec, DA7210_STARTUP1, 0); - snd_soc_write(codec, DA7210_PLL_DIV3, - DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); - - /* * ADC settings */ @@ -1025,16 +1021,6 @@ static int da7210_probe(struct snd_soc_codec *codec) DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP); snd_soc_update_bits(codec, DA7210_PLL, DA7210_PLL_EN, DA7210_PLL_EN); - /* As suggested by Dialog */ - /* unlock */ - regmap_write(da7210->regmap, DA7210_A_HID_UNLOCK, 0x8B); - regmap_write(da7210->regmap, DA7210_A_TEST_UNLOCK, 0xB4); - regmap_write(da7210->regmap, DA7210_A_PLL1, 0x01); - regmap_write(da7210->regmap, DA7210_A_CP_MODE, 0x7C); - /* re-lock */ - regmap_write(da7210->regmap, DA7210_A_HID_UNLOCK, 0x00); - regmap_write(da7210->regmap, DA7210_A_TEST_UNLOCK, 0x00); - /* Activate all enabled subsystem */ snd_soc_write(codec, DA7210_STARTUP1, DA7210_SC_MST_EN); @@ -1055,7 +1041,26 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = { .num_dapm_routes = ARRAY_SIZE(da7210_audio_map), }; -static struct regmap_config da7210_regmap = { +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + +static struct reg_default da7210_regmap_i2c_patch[] = { + + /* System controller master disable */ + { DA7210_STARTUP1, 0x00 }, + /* make sure that DA7210 use bypass mode before start up */ + { DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP }, + + /* to unlock */ + { DA7210_A_HID_UNLOCK, 0x8B}, + { DA7210_A_TEST_UNLOCK, 0xB4}, + { DA7210_A_PLL1, 0x01}, + { DA7210_A_CP_MODE, 0x7C}, + /* to re-lock */ + { DA7210_A_HID_UNLOCK, 0x00}, + { DA7210_A_TEST_UNLOCK, 0x00}, +}; + +static const struct regmap_config da7210_regmap_config_i2c = { .reg_bits = 8, .val_bits = 8, @@ -1066,7 +1071,6 @@ static struct regmap_config da7210_regmap = { .cache_type = REGCACHE_RBTREE, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) static int __devinit da7210_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1080,13 +1084,18 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, da7210); - da7210->regmap = regmap_init_i2c(i2c, &da7210_regmap); + da7210->regmap = regmap_init_i2c(i2c, &da7210_regmap_config_i2c); if (IS_ERR(da7210->regmap)) { ret = PTR_ERR(da7210->regmap); dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret); return ret; } + ret = regmap_register_patch(da7210->regmap, da7210_regmap_i2c_patch, + ARRAY_SIZE(da7210_regmap_i2c_patch)); + if (ret != 0) + dev_warn(&i2c->dev, "Failed to apply regmap patch: %d\n", ret); + ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_da7210, &da7210_dai, 1); if (ret < 0) { @@ -1119,7 +1128,7 @@ MODULE_DEVICE_TABLE(i2c, da7210_i2c_id); /* I2C codec control layer */ static struct i2c_driver da7210_i2c_driver = { .driver = { - .name = "da7210-codec", + .name = "da7210", .owner = THIS_MODULE, }, .probe = da7210_i2c_probe, @@ -1128,12 +1137,112 @@ static struct i2c_driver da7210_i2c_driver = { }; #endif +#if defined(CONFIG_SPI_MASTER) + +static struct reg_default da7210_regmap_spi_patch[] = { + /* Dummy read to give two pulses over nCS for SPI */ + { DA7210_AUX2, 0x00 }, + { DA7210_AUX2, 0x00 }, + + /* System controller master disable */ + { DA7210_STARTUP1, 0x00 }, + /* make sure that DA7210 use bypass mode before start up */ + { DA7210_PLL_DIV3, DA7210_MCLK_RANGE_10_20_MHZ | DA7210_PLL_BYP }, + + /* to set PAGE1 of SPI register space */ + { DA7210_PAGE_CONTROL, 0x80 }, + /* to unlock */ + { DA7210_A_HID_UNLOCK, 0x8B}, + { DA7210_A_TEST_UNLOCK, 0xB4}, + { DA7210_A_PLL1, 0x01}, + { DA7210_A_CP_MODE, 0x7C}, + /* to re-lock */ + { DA7210_A_HID_UNLOCK, 0x00}, + { DA7210_A_TEST_UNLOCK, 0x00}, + /* to set back PAGE0 of SPI register space */ + { DA7210_PAGE_CONTROL, 0x00 }, +}; + +static const struct regmap_config da7210_regmap_config_spi = { + .reg_bits = 8, + .val_bits = 8, + .read_flag_mask = 0x01, + .write_flag_mask = 0x00, + + .reg_defaults = da7210_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(da7210_reg_defaults), + .volatile_reg = da7210_volatile_register, + .readable_reg = da7210_readable_register, + .cache_type = REGCACHE_RBTREE, +}; + +static int __devinit da7210_spi_probe(struct spi_device *spi) +{ + struct da7210_priv *da7210; + int ret; + + da7210 = devm_kzalloc(&spi->dev, sizeof(struct da7210_priv), + GFP_KERNEL); + if (!da7210) + return -ENOMEM; + + spi_set_drvdata(spi, da7210); + da7210->regmap = devm_regmap_init_spi(spi, &da7210_regmap_config_spi); + if (IS_ERR(da7210->regmap)) { + ret = PTR_ERR(da7210->regmap); + dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); + return ret; + } + + ret = regmap_register_patch(da7210->regmap, da7210_regmap_spi_patch, + ARRAY_SIZE(da7210_regmap_spi_patch)); + if (ret != 0) + dev_warn(&spi->dev, "Failed to apply regmap patch: %d\n", ret); + + ret = snd_soc_register_codec(&spi->dev, + &soc_codec_dev_da7210, &da7210_dai, 1); + if (ret < 0) + goto err_regmap; + + return ret; + +err_regmap: + regmap_exit(da7210->regmap); + + return ret; +} + +static int __devexit da7210_spi_remove(struct spi_device *spi) +{ + struct da7210_priv *da7210 = spi_get_drvdata(spi); + snd_soc_unregister_codec(&spi->dev); + regmap_exit(da7210->regmap); + return 0; +} + +static struct spi_driver da7210_spi_driver = { + .driver = { + .name = "da7210", + .owner = THIS_MODULE, + }, + .probe = da7210_spi_probe, + .remove = __devexit_p(da7210_spi_remove) +}; +#endif + static int __init da7210_modinit(void) { int ret = 0; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&da7210_i2c_driver); #endif +#if defined(CONFIG_SPI_MASTER) + ret = spi_register_driver(&da7210_spi_driver); + if (ret) { + printk(KERN_ERR "Failed to register da7210 SPI driver: %d\n", + ret); + } +#endif return ret; } module_init(da7210_modinit); @@ -1143,6 +1252,9 @@ static void __exit da7210_exit(void) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&da7210_i2c_driver); #endif +#if defined(CONFIG_SPI_MASTER) + spi_unregister_driver(&da7210_spi_driver); +#endif } module_exit(da7210_exit); -- 1.7.1

2 1

[alsa-devel] [PATCH 1/2] ASoC: sgtl5000: Convert mic bias to a supply widget
by Mark Brown 29 Mar '12

29 Mar '12

No current users and it's the last user of MICBIAS_E(). Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/sgtl5000.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d192626..77beb6d 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -197,9 +197,9 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = { SND_SOC_DAPM_OUTPUT("HP_OUT"), SND_SOC_DAPM_OUTPUT("LINE_OUT"), - SND_SOC_DAPM_MICBIAS_E("Mic Bias", SGTL5000_CHIP_MIC_CTRL, 8, 0, - mic_bias_event, - SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_SUPPLY("Mic Bias", SGTL5000_CHIP_MIC_CTRL, 8, 0, + mic_bias_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_PGA_E("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0, small_pop_event, -- 1.7.9.1

4 7

Re: [alsa-devel] [PATCH] ASoC: sgtl5000: Enable VAG when DAC/ADC up
by Shawn Guo 29 Mar '12

29 Mar '12

Zhaoming, On Thu, Mar 29, 2012 at 08:09:33PM +0800, Zeng Zhaoming wrote: ... > This "Mic Bias" is codec internal controller, Machine code should not touch this. In the end, machine driver will have to use it to specify the map. You even said the below. and platform code + {"Mic Bias", NULL, "MIC"}, - {"MIC_IN", NULL, "MIC"}, -- Regards, Shawn

1 0

[alsa-devel] [PATCH] ASoC: wm8994: Don't allow reconfiguration of FLL when it provides SYSCLK
by Mark Brown 29 Mar '12

29 Mar '12

Rather than trying to work around machine drivers which try to reprogram the FLL while it is providing SYSCLK just return an error if they try. This will avoid audio glitches during FLL reconfiguration, or at least move the introduction of the glitches to the machine driver. Since disabling the source for an active SYSCLK is not supported in the first place systems shouldn't be doing this in the first place. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index cc6023c..f43b2ec 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1903,24 +1903,20 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, struct wm8994 *control = wm8994->wm8994; int reg_offset, ret; struct fll_div fll; - u16 reg, aif1, aif2; + u16 reg, clk1, aif_reg, aif_src; unsigned long timeout; bool was_enabled; - aif1 = snd_soc_read(codec, WM8994_AIF1_CLOCKING_1) - & WM8994_AIF1CLK_ENA; - - aif2 = snd_soc_read(codec, WM8994_AIF2_CLOCKING_1) - & WM8994_AIF2CLK_ENA; - switch (id) { case WM8994_FLL1: reg_offset = 0; id = 0; + aif_src = 0x10; break; case WM8994_FLL2: reg_offset = 0x20; id = 1; + aif_src = 0x18; break; default: return -EINVAL; @@ -1962,11 +1958,20 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, if (ret < 0) return ret; - /* Gate the AIF clocks while we reclock */ - snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1, - WM8994_AIF1CLK_ENA, 0); - snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1, - WM8994_AIF2CLK_ENA, 0); + /* Make sure that we're not providing SYSCLK right now */ + clk1 = snd_soc_read(codec, WM8994_CLOCKING_1); + if (clk1 & WM8994_SYSCLK_SRC) + aif_reg = WM8994_AIF2_CLOCKING_1; + else + aif_reg = WM8994_AIF1_CLOCKING_1; + reg = snd_soc_read(codec, aif_reg); + + if ((reg & WM8994_AIF1CLK_ENA) && + (reg & WM8994_AIF1CLK_SRC_MASK) == aif_src) { + dev_err(codec->dev, "FLL%d is currently providing SYSCLK\n", + id + 1); + return -EBUSY; + } /* We always need to disable the FLL while reconfiguring */ snd_soc_update_bits(codec, WM8994_FLL1_CONTROL_1 + reg_offset, @@ -2052,12 +2057,6 @@ static int _wm8994_set_fll(struct snd_soc_codec *codec, int id, int src, wm8994->fll[id].out = freq_out; wm8994->fll[id].src = src; - /* Enable any gated AIF clocks */ - snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1, - WM8994_AIF1CLK_ENA, aif1); - snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1, - WM8994_AIF2CLK_ENA, aif2); - configure_clock(codec); return 0; -- 1.7.9.1

1 0

[alsa-devel] Setting up the alsa configuration from scratch on imx
by madhukesh s 29 Mar '12

29 Mar '12

Hi All, I am in an unfortunate position of developing ALSA kernel modules separately(as a kernel build) and populating the necessary files to a filesystem. I am able to install all the ALSA modules on the board I am working on successfully. Can someone point me to how to start with the configuration part on the board to populate /proc and /dev entries? My config(as per the alsa diagnostic script) is: upload=true&script=true&cardinfo= !!################################ !!ALSA Information Script v 0.4.60 !!################################ !!Script ran on: Fri Mar 2 01:17:47 UTC 2012 !!Linux Distribution !!------------------ !!DMI Information !!--------------- Manufacturer: Product Name: Product Version: !!Kernel Information !!------------------ Kernel release: 2.6.38.8+ Operating System: GNU/Linux Architecture: armv7l Processor: unknown SMP Enabled: No !!ALSA Version !!------------ Driver version: 1.0.23 Library version: Utilities version: 1.0.24.2 !!Loaded ALSA modules !!------------------- !!Sound Servers on this system !!---------------------------- No sound servers found. !!Soundcards recognised by ALSA !!----------------------------- --- no soundcards --- !!PCI Soundcards installed in the system !!-------------------------------------- !!Advanced information - PCI Vendor/Device/Subsystem ID's !!-------------------------------------------------------- !!Loaded sound module options !!-------------------------- !!ALSA Device nodes !!----------------- crw-rw---- 1 root audio 116, 33 Mar 2 00:01 /dev/snd/timer !!Aplay/Arecord output !!------------ APLAY aplay: device_list:240: no soundcards found... ARECORD arecord: device_list:240: no soundcards found... !!Amixer output !!------------- !!Alsactl output !!------------- --startcollapse-- --endcollapse-- !!All Loaded Modules !!------------------ Module snd_soc_imx_sgtl5000 snd_soc_core snd_pcm snd_timer snd snd_page_alloc ac97_bus !!ALSA/HDA dmesg !!------------------ udevd (1296): /proc/1296/oom_adj is deprecated, please use /proc/1296/oom_score_adj instead. Cirrus Logic CS42888 ALSA SoC Codec Driver i2c-core: driver [cs42888] using legacy suspend method Thanks, Maas

1 0

Re: [alsa-devel] [PATCH] ASoC: sgtl5000: Enable VAG when DAC/ADC up
by Mark Brown 29 Mar '12

29 Mar '12

On Thu, Mar 29, 2012 at 08:09:33PM +0800, Zeng Zhaoming wrote: > On Thu 2012-03-29 12:16:05, Mark Brown wrote: > > > + {"Mic Bias", NULL, "MIC_IN"}, /* mic_in --> mic bias */ > > > + {"Capture Mux", "MIC_IN", "Mic Bias"}, /* mic bias --> adc_mux */ > > This should be in the machine driver. > This "Mic Bias" is codec internal controller, Machine code should not > touch this. What is it actually doing? Calling it "Mic Bias" if it's not a bias source for microphones is horribly confusing.

1 0