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

[alsa-devel] [PATCH 1/5] ASoC: Get the card directly from the DAPM context
by Mark Brown 03 Mar '11

03 Mar '11

Rather than indirecting through the CODEC we can look the card up directly from the card pointer in the DAPM context. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-dapm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index b8e6ab7..8240ab8 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -368,7 +368,7 @@ static int dapm_new_mixer(struct snd_soc_dapm_context *dapm, int i, ret = 0; size_t name_len; struct snd_soc_dapm_path *path; - struct snd_card *card = dapm->codec->card->snd_card; + struct snd_card *card = dapm->card->snd_card; /* add kcontrol */ for (i = 0; i < w->num_kcontrols; i++) { @@ -430,7 +430,7 @@ static int dapm_new_mux(struct snd_soc_dapm_context *dapm, { struct snd_soc_dapm_path *path = NULL; struct snd_kcontrol *kcontrol; - struct snd_card *card = dapm->codec->card->snd_card; + struct snd_card *card = dapm->card->snd_card; int ret = 0; if (!w->num_kcontrols) { @@ -480,7 +480,7 @@ static inline void dapm_clear_walk(struct snd_soc_dapm_context *dapm) */ static int snd_soc_dapm_suspend_check(struct snd_soc_dapm_widget *widget) { - int level = snd_power_get_state(widget->dapm->codec->card->snd_card); + int level = snd_power_get_state(widget->dapm->card->snd_card); switch (level) { case SNDRV_CTL_POWER_D3hot: @@ -1083,7 +1083,7 @@ static void dapm_post_sequence_async(void *data, async_cookie_t cookie) */ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event) { - struct snd_soc_card *card = dapm->codec->card; + struct snd_soc_card *card = dapm->card; struct snd_soc_dapm_widget *w; struct snd_soc_dapm_context *d; LIST_HEAD(up_list); -- 1.7.2.3

2 5

[alsa-devel] [PATCH 1/2] ASoC: Fix broken bitfield definitions in WM8978
by Mark Brown 03 Mar '11

03 Mar '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8978.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 30fb48e..7ce4f49 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -145,18 +145,18 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = { SOC_SINGLE("DAC Playback Limiter Threshold", WM8978_DAC_LIMITER_2, 4, 7, 0), SOC_SINGLE("DAC Playback Limiter Boost", - WM8978_DAC_LIMITER_2, 0, 15, 0), + WM8978_DAC_LIMITER_2, 0, 12, 0), SOC_ENUM("ALC Enable Switch", alc1), SOC_SINGLE("ALC Capture Min Gain", WM8978_ALC_CONTROL_1, 0, 7, 0), SOC_SINGLE("ALC Capture Max Gain", WM8978_ALC_CONTROL_1, 3, 7, 0), - SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 7, 0), + SOC_SINGLE("ALC Capture Hold", WM8978_ALC_CONTROL_2, 4, 10, 0), SOC_SINGLE("ALC Capture Target", WM8978_ALC_CONTROL_2, 0, 15, 0), SOC_ENUM("ALC Capture Mode", alc3), - SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 15, 0), - SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 15, 0), + SOC_SINGLE("ALC Capture Decay", WM8978_ALC_CONTROL_3, 4, 10, 0), + SOC_SINGLE("ALC Capture Attack", WM8978_ALC_CONTROL_3, 0, 10, 0), SOC_SINGLE("ALC Capture Noise Gate Switch", WM8978_NOISE_GATE, 3, 1, 0), SOC_SINGLE("ALC Capture Noise Gate Threshold", @@ -211,8 +211,10 @@ static const struct snd_kcontrol_new wm8978_snd_controls[] = { WM8978_LOUT2_SPK_CONTROL, WM8978_ROUT2_SPK_CONTROL, 6, 1, 1), /* DAC / ADC oversampling */ - SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL, 8, 1, 0), - SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, 8, 1, 0), + SOC_SINGLE("DAC 128x Oversampling Switch", WM8978_DAC_CONTROL, + 5, 1, 0), + SOC_SINGLE("ADC 128x Oversampling Switch", WM8978_ADC_CONTROL, + 5, 1, 0), }; /* Mixer #1: Output (OUT1, OUT2) Mixer: mix AUX, Input mixer output and DAC */ -- 1.7.2.3

2 2

[alsa-devel] [FIX]: No SPDIF out from MacBookPro 6, 2, since 2.6.36
by Mohammad Bahathir Hashim 03 Mar '11

03 Mar '11

Hi, Problem : No SPDIF since 2.6.36 HW : MacBookPro 15" HiRes (mid-2010) Audio : 00:1b.0 Audio device: Intel Corporation 5 Series/3400 Series Chipset High Definition Audio (rev 06) HDA codec : Cirrus CS4206 This simple patch will bypass the errata workaround for CS4207, and I able to use the SPDIF (Toslink) out again. Suggestion : Make a conditional expression to load the errata verb/code if the driver detects CS4207. Thank you. --- orig/patch_cirrus.c 2011-03-03 11:56:31.726000009 +0800 +++ patch_cirrus.c 2011-03-03 12:05:38.556000063 +0800 @@ -1066,7 +1066,7 @@ struct cs_spec *spec = codec->spec; /* init_verb sequence for C0/C1/C2 errata*/ - snd_hda_sequence_write(codec, cs_errata_init_verbs); + /*snd_hda_sequence_write(codec, cs_errata_init_verbs);*/ snd_hda_sequence_write(codec, cs_coef_init_verbs);

1 0

[alsa-devel] [PATCH v21 0/3] ASoC/MFD/V4L2: WL1273 FM Radio Driver
by Matti J. Aaltonen 02 Mar '11

02 Mar '11

Hi. And thanks for the comment. Samuel wrote: >> Remove two unnecessary calls to i2c_set_clientdata. >Provided that you add a changelog relevant to the patch itself, and not to the >v1->v2 diff: Replaced the incremental changelog stuff with the original descriptions. >Acked-by: Samuel Ortiz <sameo(a)linux.intel.com> Cheers, Matti Matti J. Aaltonen (3): MFD: WL1273 FM Radio: MFD driver for the FM radio. V4L2: WL1273 FM Radio: TI WL1273 FM radio driver ASoC: WL1273 FM radio: Access I2C IO functions through pointers. drivers/media/radio/radio-wl1273.c | 360 +++++++++++------------------------- drivers/mfd/Kconfig | 2 +- drivers/mfd/wl1273-core.c | 149 +++++++++++++++- include/linux/mfd/wl1273-core.h | 2 + sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wl1273.c | 11 +- 6 files changed, 264 insertions(+), 262 deletions(-)

4 6

[alsa-devel] [PATCH 0/2] twl4030_codec cleanup
by Ilkka Koskinen 02 Mar '11

02 Mar '11

This series of patches removes duplicate audio_mclk fields from twl4030_codec driver. The patches have been compiled on sound-2.6/for-2.6.39 branch. I haven't tested them on any target board though. Ilkka Koskinen (2): omap: Remove unnecessary twl4030_codec_audio settings from board files mfd: twl4030_codec: Remove unused and duplicate audio_mclk fields arch/arm/mach-omap2/board-3430sdp.c | 4 +--- arch/arm/mach-omap2/board-devkit8000.c | 4 +--- arch/arm/mach-omap2/board-igep0020.c | 4 +--- arch/arm/mach-omap2/board-omap3beagle.c | 4 +--- arch/arm/mach-omap2/board-omap3evm.c | 4 +--- arch/arm/mach-omap2/board-omap3pandora.c | 4 +--- arch/arm/mach-omap2/board-omap3stalker.c | 4 +--- arch/arm/mach-omap2/board-omap3touchbook.c | 4 +--- arch/arm/mach-omap2/board-overo.c | 4 +--- arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +--- include/linux/i2c/twl.h | 2 -- 11 files changed, 10 insertions(+), 32 deletions(-)

5 7

[alsa-devel] ASoC updates for 2.6.39
by Mark Brown 02 Mar '11

02 Mar '11

The following changes since commit 61a142b7e4b5c4cce1b4ea52a829984959120089: ASoC: Staticise non-exported symbols in SGTL5000 (2011-02-28 14:33:01 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.39 Dimitris Papastamos (3): ASoC: WM8994: Don't disable the AIF[1|2]CLK_ENA unconditionaly ASoC: WM8994: Ensure late enable events are processed for the ADCs ASoC: WM8994: Ensure MICBIAS is provided with a clock Javier Martin (1): ASoC: Fix burstsize and DSP_B format problems in imx-ssi. Mark Brown (4): ASoC: Fix WM9081 platform data initialisation Merge branch 'for-2.6.38' into for-2.6.39 ASoC: Remove module probe announcements from CODEC drivers ASoC: Add platform data for WM9081 IRQ pin configuration Stephen Warren (1): ASoC: Tegra: Fix error handling in DMA channel alloc include/sound/wm9081.h | 9 ++++-- sound/soc/codecs/ak4104.c | 1 - sound/soc/codecs/cs4270.c | 2 - sound/soc/codecs/wm8994.c | 64 +++++++++++++++++++++++++++++++++++++------ sound/soc/codecs/wm9081.c | 30 +++++++++++++++----- sound/soc/imx/imx-ssi.c | 5 +++- sound/soc/tegra/tegra_pcm.c | 4 +- 7 files changed, 89 insertions(+), 26 deletions(-)

2 1

[alsa-devel] ASoC updates for 2.6.38
by Mark Brown 02 Mar '11

02 Mar '11

The following changes since commit 43c63188821dc21b2af23a40a18faea6e386e90a: eukrea-tlv320: fix platform_name (2011-02-25 12:57:49 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.38 Dimitris Papastamos (2): ASoC: WM8994: Don't disable the AIF[1|2]CLK_ENA unconditionaly ASoC: WM8994: Ensure late enable events are processed for the ADCs Mark Brown (1): ASoC: Fix WM9081 platform data initialisation sound/soc/codecs/wm8994.c | 51 +++++++++++++++++++++++++++++++++++++-------- sound/soc/codecs/wm9081.c | 5 ++++ 2 files changed, 47 insertions(+), 9 deletions(-)

2 1

Re: [alsa-devel] Realtek ALC269VB Asus 1001px intern mic ist not working
by Paul Menzel 02 Mar '11

02 Mar '11

Dear Marty, please remember to reply to the list, e. g. in Evolution the shortcut is Ctrl + l, and to send just plain text messages to lists as you did in your original post. Am Dienstag, den 01.03.2011, 22:34 +0100 schrieb Marty: > Am 28.02.2011 20:10, schrieb Paul Menzel: > > On Mo, 2011-02-28 at 18:53 +0100, Marty wrote: > > > >> Hi, hope I get some help with this problem. At the moment I work with > >> Pulse Audio but the results are very bad. > >> > > how do you get it to work using PulseAudio? I am pasting Marty’s first private answer. Am Montag, den 28.02.2011, 21:35 +0100 schrieb Marty: > Dear Paul, as first my basic os informations. > > Host/Kernel/OS "boaconstrictor" running Linux 2.6.38-5-generic i686 [ > Kanotix Hellfire 20101213-09:07 ] > CPU Info (1) Intel Atom N450 @ clocked at [ 1667.000 MHz ] > Intel Atom N450 @ clocked at [ 1000.000 MHz ] > Videocard Intel N10 Family Integrated Graphics Controller X.Org > 1.7.7 [ 1024x600 ] > Processes 128 | Uptime 17min | Memory 258.2/2002.9MB | HDD Size 250GB > (16%used) | Client Unknown Perl client | Infobash v2.67.2 > > Advanced Linux Sound Architecture Driver Version 1.0.23. > > 0 [Intel ]: HDA-Intel - HDA Intel > HDA Intel at 0xf7cf8000 ir > > 1: : sequencer > 2: [ 0- 0]: digital audio playback > 3: [ 0- 0]: digital audio capture > 4: [ 0- 0]: hardware dependent > 5: [ 0] : control > 33: : timer > > 00-00: ALC269VB Analog : ALC269VB Analog : playback 1 : capture 1 > > > I tried nearly all settings in alsamixer m and i could`nt activate the > intern mic. After installing Pulse Audio with basic settings I had > either no success. > > 1. I modify /etc/modprobe.d/alsa-base.conf options snd-hda-intel model=auto > ( i did`nt tried yet options snd-hda-intel model=fujitsu options > snd-hda-intel model=lifebook) > 2. save & reboot > 3. load driver and check settings in alsamixer m > 4. Pulse Audio settings - set all the capture devices to only the left > (or right) channel > 5. Suspend to Ram > 6. reboot > > After this I had postive results in skype. The intern mic works but the > quality is worse. I modified all prossible soundsettings for better > results - no luck. > > Best & thx > Marty > >> check: > >> http://www.alsa-project.org/db/?f=0286416d03a64a2e34a4f73831c4f0f5cba002d6 > >> > > Please always additionally paste this information into the message. > > > > […] > > > > !!Kernel Information > > !!------------------ > > > > Kernel release: 2.6.38-5-generic > > Operating System: GNU/Linux > > Architecture: i686 > > Processor: unknown > > SMP Enabled: Yes > > > > > > !!ALSA Version > > !!------------ > > > > Driver version: 1.0.23 > > Library version: 1.0.23 > > Utilities version: 1.0.23 > > > > […] > > > > Could you please try a current ALSA version, i. e. 1.0.24, (for example > > using a live image) or test if some `model` parameters, e. g. `fujitsu`, > > work [1][2][3]? > > > > Searching for »1001PX alsa« also brought up several hits. Which one did > > you try? > > > > > > Thanks, > > > > Paul > > > > > > [1] http://alsa-project.org/main/index.php/Help_To_Debug > > [2] http://alsa-project.org/main/index.php/Help_To_Debug_Intel_HDA > > [3] https://wiki.archlinux.org/index.php/Asus_Eee_PC_1001px#Sound > Hi Paul, I fixed it finaly with perfect quality. > > Alsa Driver v1.0.24 > ./configure --with-oss=no > make -j2 > make install I guess `--with-oss=no` will not make a difference. But unless somebody tried we will not know. > purge Pulse Audio > reboot > modify all settings > suspend to ram > > and after this I had clear sound ! Great to hear that. Could you please confirm that it does not work with PulseAudio installed. I would imagine that upgrading ALSA driver to 1.0.24 did the trick. Thank you very much for keeping the list/me updated with your progress and success. Paul

1 0

[alsa-devel] (no subject)
by Javier Martin 02 Mar '11

02 Mar '11

This series of patches provides support for audio in Visstrim_M10 boards. This second version has some fixes in the aic32x4 codec driver as asked by Mark Brown.

3 9

[alsa-devel] [PATCH v2 2.6.38] ASoC: WM8994: Ensure late enable events are processed for the ADCs
by Dimitris Papastamos 02 Mar '11

02 Mar '11

Ensure that the ADCs are provided with a clock as the previous patch "ASoC: WM8994: Improve playback robustness" did not handle this case properly. Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 9e91525..4afbe3b 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1096,6 +1096,13 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w, return 0; } +static int adc_mux_ev(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + late_enable_ev(w, kcontrol, event); + return 0; +} + static int dac_ev(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -1416,6 +1423,18 @@ SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0), SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0), }; +static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = { +SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux, + adc_mux_ev, SND_SOC_DAPM_PRE_PMU), +SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux, + adc_mux_ev, SND_SOC_DAPM_PRE_PMU), +}; + +static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = { +SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux), +SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux), +}; + static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = { SND_SOC_DAPM_INPUT("DMIC1DAT"), SND_SOC_DAPM_INPUT("DMIC2DAT"), @@ -1510,9 +1529,6 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0), SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0), SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0), -SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux), -SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux), - SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux), SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux), @@ -3293,11 +3309,15 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) if (wm8994->revision < 4) { snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets, ARRAY_SIZE(wm8994_lateclk_revd_widgets)); + snd_soc_dapm_new_controls(dapm, wm8994_adc_revd_widgets, + ARRAY_SIZE(wm8994_adc_revd_widgets)); snd_soc_dapm_new_controls(dapm, wm8994_dac_revd_widgets, ARRAY_SIZE(wm8994_dac_revd_widgets)); } else { snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets, ARRAY_SIZE(wm8994_lateclk_widgets)); + snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets, + ARRAY_SIZE(wm8994_adc_widgets)); snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets, ARRAY_SIZE(wm8994_dac_widgets)); } -- 1.7.4.1

3 2