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

[alsa-devel] [PATCH 1/2] ARM: S5PV210: Add audio support to Aquila
by Chanwoo Choi 30 Sep '10

30 Sep '10

This patch the I2C board information for the WM8994 used in the Aquila as audio codec and adds the I2C/I2S platform drivers. Additionlly, to control power consumption have registerd the voltage consumer of WM8994 to the regulator framework. I initialize gpio settting relevant to operation of audio codec. I explain following comment concering gpio setting: - CODEC_XTAL_EN : This gpio enables that the main clock is provided to operate audio codec. - MICBIAS_EN : This gpio enable the microphone to input analog - ADC_EN : This gpio enable the ADC device which is used to detect the kind of jack. (SND_JACK_HEADPHONE/HEADSET/MECHANICAL/AVOUT) According to the kind of jack, an electric current is changed. Signed-off-by : Chanwoo Choi <cw00.choi(a)samsung.com> Signed-off-by : Joonyoung Shim <jy0922.shim(a)samsung.com> Signed-off-by : Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/mach-s5pv210/mach-aquila.c | 177 +++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index f0f960f..d027f9d 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c @@ -17,9 +17,11 @@ #include <linux/i2c-gpio.h> #include <linux/i2c/mcs.h> #include <linux/mfd/max8998.h> +#include <linux/mfd/wm8994/pdata.h> #include <linux/gpio_keys.h> #include <linux/input.h> #include <linux/gpio.h> +#include <linux/regulator/fixed.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> @@ -397,6 +399,120 @@ static struct max8998_platform_data aquila_max8998_pdata = { }; #endif +static struct regulator_consumer_supply wm8994_fixed_voltage0_supplies[] = { + { + .dev_name = "5-001a", + .supply = "DBVDD", + }, { + .dev_name = "5-001a", + .supply = "AVDD2", + }, { + .dev_name = "5-001a", + .supply = "CPVDD", + }, + +}; + +static struct regulator_consumer_supply wm8994_fixed_voltage1_supplies[] = { + { + .dev_name = "5-001a", + .supply = "SPKVDD1", + }, { + .dev_name = "5-001a", + .supply = "SPKVDD2", + }, +}; + +static struct regulator_init_data wm8994_fixed_voltage0_init_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(wm8994_fixed_voltage0_supplies), + .consumer_supplies = wm8994_fixed_voltage0_supplies, +}; + +static struct regulator_init_data wm8994_fixed_voltage1_init_data = { + .constraints = { + .always_on = 1, + }, + .num_consumer_supplies = ARRAY_SIZE(wm8994_fixed_voltage1_supplies), + .consumer_supplies = wm8994_fixed_voltage1_supplies, +}; + +static struct fixed_voltage_config wm8994_fixed_voltage0_config = { + .supply_name = "VCC_1.8V_PDA", + .microvolts = 1800000, + .gpio = -EINVAL, + .init_data = &wm8994_fixed_voltage0_init_data, +}; + +static struct fixed_voltage_config wm8994_fixed_voltage1_config = { + .supply_name = "V_BAT", + .microvolts = 3700000, + .gpio = -EINVAL, + .init_data = &wm8994_fixed_voltage1_init_data, +}; + +static struct platform_device wm8994_fixed_voltage0 = { + .name = "reg-fixed-voltage", + .id = 0, + .dev = { + .platform_data = &wm8994_fixed_voltage0_config, + }, +}; + +static struct platform_device wm8994_fixed_voltage1 = { + .name = "reg-fixed-voltage", + .id = 1, + .dev = { + .platform_data = &wm8994_fixed_voltage1_config, + }, +}; + +static struct regulator_consumer_supply wm8994_avdd1_supply = { + .dev_name = "5-001a", + .supply = "AVDD1", +}; + +static struct regulator_consumer_supply wm8994_dcvdd_supply = { + .dev_name = "5-001a", + .supply = "DCVDD", +}; + +static struct regulator_init_data wm8994_ldo1_data = { + .constraints = { + .name = "AVDD1_3.0V", + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + }, + .num_consumer_supplies = 1, + .consumer_supplies = &wm8994_avdd1_supply, +}; + +static struct regulator_init_data wm8994_ldo2_data = { + .constraints = { + .name = "DCVDD_1.0V", + }, + .num_consumer_supplies = 1, + .consumer_supplies = &wm8994_dcvdd_supply, +}; + +static struct wm8994_pdata wm8994_platform_data = { + /* configure gpio1 function: 0x0001(Logic level input/output) */ + .gpio_defaults[0] = 0x0001, + /* configure gpio3/4/5/7 function for AIF2 voice */ + .gpio_defaults[2] = 0x8100, + .gpio_defaults[3] = 0x8100, + .gpio_defaults[4] = 0x8100, + .gpio_defaults[6] = 0x0100, + /* configure gpio8/9/10/11 function for AIF3 BT */ + .gpio_defaults[7] = 0x8100, + .gpio_defaults[8] = 0x0100, + .gpio_defaults[9] = 0x0100, + .gpio_defaults[10] = 0x0100, + .ldo[0] = { S5PV210_MP03(6), NULL, &wm8994_ldo1_data }, /* XM0FRNB_2 */ + .ldo[1] = { 0, NULL, &wm8994_ldo2_data }, +}; + /* GPIO I2C PMIC */ #define AP_I2C_GPIO_PMIC_BUS_4 4 static struct i2c_gpio_platform_data aquila_i2c_gpio_pmic_data = { @@ -422,6 +538,58 @@ static struct i2c_board_info i2c_gpio_pmic_devs[] __initdata = { #endif }; +/* GPIO I2C AP 1.8V */ +#define AP_I2C_GPIO_BUS_5 5 +static struct i2c_gpio_platform_data i2c_gpio5_data = { + .sda_pin = S5PV210_MP05(3), /* XM0ADDR_11 */ + .scl_pin = S5PV210_MP05(2), /* XM0ADDR_10 */ +}; + +static struct platform_device i2c_gpio5 = { + .name = "i2c-gpio", + .id = AP_I2C_GPIO_BUS_5, + .dev = { + .platform_data = &i2c_gpio5_data, + }, +}; + +static struct i2c_board_info i2c_gpio5_devs[] __initdata = { + { + /* CS/ADDR = low 0x34 (FYI: high = 0x36) */ + I2C_BOARD_INFO("wm8994", 0x34 >> 1), + .platform_data = &wm8994_platform_data, + }, +}; + +static void __init aquila_sound_init(void) +{ + unsigned int gpio; + + /* CODEC_XTAL_EN */ + gpio = S5PV210_GPH3(2); /* XEINT_26 */ + gpio_request(gpio, "CODEC_XTAL_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + gpio_direction_output(gpio, 1); + + /* CLKOUT[9:8] set to 0x3(XUSBXTI) of 0xE010E000(OTHERS) + * for 24MHZ + */ + writel(readl(S5P_OTHERS) | (0x3 << 8), S5P_OTHERS); + + /* MICBIAS_EN */ + gpio = S5PV210_GPJ4(2); /* XMSMRN */ + gpio_request(gpio, "MICBIAS_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + gpio_direction_output(gpio, 1); + + /* ADC_EN */ + gpio = S5PV210_GPJ3(2); + gpio_request(gpio, "ADC_EN"); + s3c_gpio_cfgpin(gpio, S3C_GPIO_OUTPUT); + gpio_direction_output(gpio, 1); +} + /* PMIC Power button */ static struct gpio_keys_button aquila_gpio_keys_table[] = { { @@ -523,6 +691,10 @@ static struct platform_device *aquila_devices[] __initdata = { &s5pc110_device_onenand, &samsung_device_keypad, &i2c_gpio10, + &wm8994_fixed_voltage0, + &wm8994_fixed_voltage1, + &s5pv210_device_iis0, + &i2c_gpio5, }; static void __init aquila_map_io(void) @@ -539,6 +711,11 @@ static void __init aquila_machine_init(void) i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs, ARRAY_SIZE(i2c_gpio_pmic_devs)); + /* SOUND */ + i2c_register_board_info(AP_I2C_GPIO_BUS_5, i2c_gpio5_devs, + ARRAY_SIZE(i2c_gpio5_devs)); + aquila_sound_init(); + /* FB */ s3c_fb_set_platdata(&aquila_lcd_pdata); -- 1.6.3.3

5 10

[alsa-devel] [ANNOUNCE] Git User's Survey 2010 is now up!
by Jakub Narebski 30 Sep '10

30 Sep '10

Hello all, This announcement is sent to this mailing list because yout project uses Git as a version control system. We would like to ask you a few questions about your use of the Git version control system. This survey is mainly to understand who is using Git, how and why. The results will be published to the Git wiki on the GitSurvey2010 page (https://git.wiki.kernel.org/index.php/GitSurvey2010) and discussed on the git mailing list (git(a)vger.kernel.org). The survey would be open from 1 September till 15 October 2010. Please devote a few minutes of your time to fill this simple questionnaire, it will help a lot the git community to understand your needs, what you like of Git, and of course what you don't like of it. The survey can be found here: http://tinyurl.com/GitSurvey2010 https://www.survs.com/survey/MUPYR8UJ4B Git User's Survey 2010 was originally announced on git mailing list in the following mail: http://article.gmane.org/gmane.comp.version-control.git/154986 -- Jakub Narebski on behalf of Git Development Community http://git-scm.com

1 0

[alsa-devel] list-admin: Mails cut off in archive?
by Colin Guthrie 29 Sep '10

29 Sep '10

Hi, I recently sent a message to this list. It was sent via gmane and I can see and read the contents fine via NNTP with gmane. The gmane archive is fine: http://permalink.gmane.org/gmane.linux.alsa.devel/77313 However the official Mailman archive cuts the message off: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-September/032025.… Did people directly subscribed to the list get my mail OK or was it cut off there too? Is there a bug in the archive. Col PS Is it OK to remove geocrawler links on http://mailman.alsa-project.org/main/index.php/Mailing-lists ? They are all broken. Also the mail-archive link for this list isn't updated past 2004... (seems to be based on the sourceforge list). It's probably worth marking as "old" and/or reconfiguring it to point at the new list. -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/]

3 2

[alsa-devel] Alsamixertest
by David Henningsson 29 Sep '10

29 Sep '10

Here's the tool "one of the Mandriva guys" ;-) was talking about the other day. I should probably have announced it on both lists simultaneously. Anyway, over the previous weeks I've been working on a small script which tests whether the ALSA mixer lives up to PA's expectations. If you are familiar with dbmeasure or dbverify by Lennart Poettering, this application's purpose is very similar, but this one is hopefully easier to set up, more user friendly, and also tests that the names of the volume controls are correct. My hope is that this will aid as a debugging tool for all these "everything below 20% of my speaker is muted, and then 21% blows my speakers" bugs. To use the tool, you'll need some kind of loopback. You can e g use a loopback cable and connect that between line in and line out, or test your laptop's internal speakers with your laptop's internal mic (just stop humming when you do so :-) ). Just set up the recording levels appropriately. Alsamixertest is available for Ubuntu Lucid and Ubuntu Maverick from these PPAs: Lucid: https://launchpad.net/~diwic/+archive/ppa Maverick: https://launchpad.net/~diwic/+archive/maverick For other distributions, download the tarball: https://launchpad.net/~diwic/+archive/ppa/+files/alsamixertest_47.14.tar.gz Unpack and read the readme file for compilation and install instructions. When it is installed, run "alsamixertest -r" for a small tutorial and "alsamixertest -h" for command line options help. Looking forward to your comments about this new little tool! I think it should be considered "beta" quality at this point. -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 2

[alsa-devel] TASCAM US-144mkII Driver
by Michael Niemeck 29 Sep '10

29 Sep '10

Common consensus in the forums seems to be that the mkII versions of the TASCAM 122 and 144 have different hard- and/or software than their respective predecessors, and won't work with the current ALSA drivers. At least the latter I can confirm for my US-144mkII. Lacking the resources to modify the existing driver to work with the above interface, let alone write a new one, I wanted to ask if anyone of the active ALSA developers would be willing to (or is even already in the process of) write or modify a driver for the new TASCAMs. I would be more than willing to contribute to a bounty, if such a thing is common or at least accepted in the ALSA community, and according to this post (http://article.gmane.org/gmane.linux.alsa.user/34586) TASCAM is ready to support such a project with demo units. I would also be willing to function as a tester, of course. Still hoping, Mike ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

1 0

[alsa-devel] [PATCH] ASoC: Lowercase WM8962 CODEC name
by Mark Brown 29 Sep '10

29 Sep '10

For consistency. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8962.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 009321b..4fa5de8 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1879,7 +1879,7 @@ MODULE_DEVICE_TABLE(i2c, wm8962_i2c_id); static struct i2c_driver wm8962_i2c_driver = { .driver = { - .name = "WM8962", + .name = "wm8962", .owner = THIS_MODULE, }, .probe = wm8962_i2c_probe, -- 1.7.1

2 1

[alsa-devel] [PATCH] ASoC: Initial WM8962 IRQ support
by Mark Brown 29 Sep '10

29 Sep '10

Provide an initial hookup for interrupts on the WM8962. Currently we simply report error status via log messages if an IRQ is provided for the device. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/wm8962.h | 2 + sound/soc/codecs/wm8962.c | 60 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/include/sound/wm8962.h b/include/sound/wm8962.h index f70258e..cc32aff 100644 --- a/include/sound/wm8962.h +++ b/include/sound/wm8962.h @@ -17,6 +17,8 @@ struct wm8962_pdata { u32 gpio_init[WM8962_MAX_GPIO]; + bool irq_active_low; + bool spk_mono; /* Speaker outputs tied together as mono */ }; diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 12286d6..009321b 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -1461,6 +1461,29 @@ static struct snd_soc_dai_driver wm8962_dai = { .symmetric_rates = 1, }; +static irqreturn_t wm8962_irq(int irq, void *data) +{ + struct snd_soc_codec *codec = data; + int mask; + int active; + + mask = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); + + active = snd_soc_read(codec, WM8962_INTERRUPT_STATUS_2); + active &= ~mask; + + if (active & WM8962_FIFOS_ERR_EINT) + dev_err(codec->dev, "FIFO error\n"); + + if (active & WM8962_TEMP_SHUT_EINT) + dev_crit(codec->dev, "Thermal shutdown\n"); + + /* Acknowledge the interrupts */ + snd_soc_write(codec, WM8962_INTERRUPT_STATUS_2, active); + + return IRQ_HANDLED; +} + #ifdef CONFIG_PM static int wm8962_resume(struct snd_soc_codec *codec) { @@ -1632,7 +1655,9 @@ static int wm8962_probe(struct snd_soc_codec *codec) int ret; struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); struct wm8962_pdata *pdata = dev_get_platdata(codec->dev); - int i; + struct i2c_client *i2c = container_of(codec->dev, struct i2c_client, + dev); + int i, trigger, irq_pol; wm8962->codec = codec; @@ -1748,6 +1773,34 @@ static int wm8962_probe(struct snd_soc_codec *codec) wm8962_init_beep(codec); + if (i2c->irq) { + if (pdata && pdata->irq_active_low) { + trigger = IRQF_TRIGGER_LOW; + irq_pol = WM8962_IRQ_POL; + } else { + trigger = IRQF_TRIGGER_HIGH; + irq_pol = 0; + } + + snd_soc_update_bits(codec, WM8962_INTERRUPT_CONTROL, + WM8962_IRQ_POL, irq_pol); + + ret = request_threaded_irq(i2c->irq, NULL, wm8962_irq, + trigger | IRQF_ONESHOT, + "wm8962", codec); + if (ret != 0) { + dev_err(codec->dev, "Failed to request IRQ %d: %d\n", + i2c->irq, ret); + /* Non-fatal */ + } else { + /* Enable error reporting IRQs by default */ + snd_soc_update_bits(codec, + WM8962_INTERRUPT_STATUS_2_MASK, + WM8962_TEMP_SHUT_EINT | + WM8962_FIFOS_ERR_EINT, 0); + } + } + return 0; err_enable: @@ -1762,8 +1815,13 @@ err: static int wm8962_remove(struct snd_soc_codec *codec) { struct wm8962_priv *wm8962 = snd_soc_codec_get_drvdata(codec); + struct i2c_client *i2c = container_of(codec->dev, struct i2c_client, + dev); int i; + if (i2c->irq) + free_irq(i2c->irq, codec); + wm8962_free_beep(codec); for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) regulator_unregister_notifier(wm8962->supplies[i].consumer, -- 1.7.1

2 1

[alsa-devel] Band-aid solution for Dell Latitude E6410/E6510 microphone
by Diego Elio Pettenò 29 Sep '10

29 Sep '10

Hi all, I'm sending out a patch that I didn't write (and thus most likely require David's Signed-Off), but which I think might be a good idea to at least have accessible to search. As David already pointed out to me, the proper fix for the issue is Takashi's commit 75e0eb24ee3ec3549c2e53707dcc87e5f7a2c791, but that hasn't made it into .36 RCs and thus seem unlikely to come to users anytime soon. David's patch is a "band aid" solution; it solves most of the problem by adding one more special case to the sigmatel patches; on the other hand it makes the internal microphone to work fine on my laptop, which is a good thing, right? Anyway, if this can be considered for .36 or for some stable branch (*looks toward Greg hoping for pity*), it would probably make me (and other owners of such laptops) probably very happy. Especially given that we have enough trouble with a non-working SDHCI and a not-yet-supported Alps touchpad/trackpoint combination. Thanks in advance, whatever the outcome, -- Diego Elio Pettenò

2 2

[alsa-devel] [PATCH] ASoC: WM8985: Use the correct macro for the kcontrol defined
by Dimitris Papastamos 28 Sep '10

28 Sep '10

Since we are using custom get/put handlers use SOC_ENUM_SINGLE_EXT_DECL instead of the original SOC_ENUM_SINGLE_DECL macro. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8985.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index b94af96..09660b3 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -185,8 +185,8 @@ static const SOC_ENUM_SINGLE_DECL(filter_mode, WM8985_ADC_CONTROL, 7, static const char *eq_bw_text[] = { "Narrow", "Wide" }; static const char *eqmode_text[] = { "Capture", "Playback" }; -static const SOC_ENUM_SINGLE_DECL(eqmode, WM8985_EQ1_LOW_SHELF, 8, - eqmode_text); +static const SOC_ENUM_SINGLE_EXT_DECL(eqmode, eqmode_text); + static const char *eq1_cutoff_text[] = { "80Hz", "105Hz", "135Hz", "175Hz" }; -- 1.7.3

2 1

[alsa-devel] [PATCH 1/2] omap: zoom2: Fix ASoC multi-component build breakage by removing dead code
by Jarkko Nikula 28 Sep '10

28 Sep '10

ASoC Multi-Component Support patch removes #if 0 in board-zoom2.c that was used to protect some uncompiling dead code. Remove that code as it seems to be here quite some time since commit 479f12c. Signed-off-by: Jarkko Nikula <jhnikula(a)gmail.com> Cc: Vikram Pandita <vikram.pandita(a)ti.com> Cc: Tony Lindgren <tony(a)atomide.com> --- Sorry for not noticing this before. Somehow my own test config didn't include zoom2 like omap3_defconfig does. --- arch/arm/mach-omap2/board-zoom2.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index efbcd8f..86d4515 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -41,10 +41,6 @@ void zoom2_set_hs_extmute(int mute) gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute); } -static struct twl4030_madc_platform_data zoom2_madc_data = { - .irq_line = 1, -}; - static struct twl4030_codec_audio_data zoom2_audio_data = { .audio_mclk = 26000000, .ramp_delay_value = 3, /* 161 ms */ @@ -62,15 +58,7 @@ static struct twl4030_platform_data zoom2_twldata = { .irq_end = TWL4030_IRQ_END, /* platform_data for children goes here */ - .bci = &zoom2_bci_data, - .madc = &zoom2_madc_data, - .usb = &zoom2_usb_data, - .gpio = &zoom2_gpio_data, - .keypad = &zoom2_kp_twl4030_data, .codec = &zoom2_codec_data, - .vmmc1 = &zoom2_vmmc1, - .vmmc2 = &zoom2_vmmc2, - .vsim = &zoom2_vsim, }; static struct i2c_board_info __initdata zoom2_i2c_boardinfo[] = { -- 1.7.1

3 4