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

[alsa-devel] [PATCH v10 0/7] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 11 Aug '13

11 Aug '13

Hi, this series implements ac97-slave support for fsl-ssi and phycore ac97 DT support. Since v9 there were a lot of changes. I dropped the board specific ac97-link reset functions and added generic functions to soc-core. It uses devicetree parsed pinctrl and gpios. The audmux setup was removed from phycore-ac97-dt. The initial setup can now be defined in DT. Regards, Markus Markus Pargmann (7): ASoC: core: Generic ac97 link reset functions ASoC: codec: wm9712 simple DT bindings ASoC: imx-audmux: Read default configuration from devicetree ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ASoC: fsl-ssi: ac97-slave support ASoC: Add phycore-ac97-dt driver .../devicetree/bindings/sound/fsl,ssi.txt | 12 + .../devicetree/bindings/sound/imx-audmux.txt | 9 + .../bindings/sound/phytec,phycore-ac97.txt | 16 + .../devicetree/bindings/sound/soc-ac97link.txt | 28 ++ Documentation/devicetree/bindings/sound/wm9712.txt | 10 + include/sound/soc.h | 2 + sound/soc/codecs/wm9712.c | 9 + sound/soc/fsl/Kconfig | 15 +- sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_ssi.c | 431 +++++++++++++++++---- sound/soc/fsl/imx-audmux.c | 62 +++ sound/soc/fsl/phycore-ac97-dt.c | 124 ++++++ sound/soc/fsl/phycore-ac97.c | 13 +- sound/soc/soc-core.c | 153 ++++++++ 14 files changed, 789 insertions(+), 97 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt create mode 100644 Documentation/devicetree/bindings/sound/soc-ac97link.txt create mode 100644 Documentation/devicetree/bindings/sound/wm9712.txt create mode 100644 sound/soc/fsl/phycore-ac97-dt.c

2 19

[alsa-devel] Alsa bug/bugtracker
by Mattia Bertoni 08 Aug '13

08 Aug '13

hi, under Mark Brown directions I submit to you my problem: recently I've gotten a crash on my machine running Archlinux x86_64 the log suggest me to report it in the Alsa bugtracker but the link on the official project (https://bugtrack.alsa-project.org/alsa-bug/) is down.... how can I do ??? thank you

3 4

[alsa-devel] [PATCH v6 0/8] Sound support for at91sam9x5-wm8731 based boards
by Richard Genoud 07 Aug '13

07 Aug '13

Hi, This patchset add sound on the at91sam9x5ek board. It's based on Nicolas Ferre's work in the 2.6.39 atmel patch for sam9x5: https://github.com/linux4sam/linux-at91/commit/0aa157c9e71ccccf3abc30fa37eb… It needs Bo Chen's patchset on the generic dmaengine (topic/atmel branch on Mark's sound tree) and the SSC interrupts disabled (cf http://www.spinics.net/lists/arm-kernel/msg256901.html) As the at91 chips are on their way to the common clock framework, I thought it may be better to retrieve the codec MCLK via this framework. So it needs Boris Brezillon patch set "ARM: at91: move to common clk framework" I've separated this patch because I don't know what is better: * applying the patchset with a hard coded clock, and once at91 has moved to common clock framework, update the code and change the DT binding. * wait for the common clock framework. Outstanding issue: If this machine driver will support more SoCs maybe we should name it differently. Maybe atmel_wm8731.c ? Since it could be merged with sam9g20_wm8731.c when the g20 is DT only (There will be some more work though). It has been tested on at91sam9g35ek, and should work on g15, g25, x25 and x35 also. patches applies on next-20130729 + "ARM: at91: move to common clk framework" Changes from v5: * Update the wm8731 DT binding documentation with available audio endpoints. * Remove Uwe's signed-off since it seems to be "an integration signed-off" * Remove rate constrains if freq==0 in wm8731. * Allocate dynamically card, dai and private structures. * Add a separate patch to set the oscillator value via DT. NB: this last patch needs Boris Brezillon patch set "ARM: at91: move to common clk framework" Changes from v4: * Move the rates constraints into the codec * Hard code the DAI format since it cannot be changed anyway (and remove the DT bindings accordingly) * Add some consistency in the functions naming (sam9x5ek/at91sam9x5ek/sam9x5) * Retrieve the SSC id from the SSC controller phandle * Clarify the atmel-ssc.txt documentation * Develop audio-routing documentation * Tidy up the includes in the machine driver Changes from v3: * Remove the use of macros in device tree documentation. Changes from v2: * Change atmel,sam9x5-audio-wm8731 to atmel,sam9x5-wm8731-audio for consistency with sam9g20 machine driver. * Use the snd_pcm_hw_constraint() API as suggested by Mark and Lars-Peter. * Remove the unnecessary snd_soc_dapm_sync() call as Lars-Peter suggested. * Add documentation for machine driver DT binding. * Update atmel-ssc DT binding documentation. * Add GPL license instead of just the "GPL" word (hope that's ok !) Changes from v1-RFC: * drop patches on SSC since Bo Chen already did the work * reorder patches to have the machine driver first * drop code already handled by the ASoC framework * drop unneeded SND_ATMEL_SOC_PDC config selection * use static snd_soc_card and snd_soc_dai_link structures. Best regards, Richard. Nicolas Ferre (1): ASoC: atmel: machine driver for at91sam9x5-wm8731 boards Richard Genoud (7): ASoC: wm8731: add rates constraints Documentation: DT: update atmel SSC with DMA binding ARM: AT91: DTS: sam9x5: add SSC DMA parameters ARM: AT91: DTS: sam9x5ek: add WM8731 codec ARM: AT91: DTS: sam9x5ek: enable SSC ARM: AT91: DTS: sam9x5ek: add sound configuration ASoC: sam9x5: get codec MCLK via device tree .../devicetree/bindings/misc/atmel-ssc.txt | 23 ++- .../bindings/sound/atmel-sam9x5-wm8731-audio.txt | 39 ++++ Documentation/devicetree/bindings/sound/wm8731.txt | 9 + arch/arm/boot/dts/at91sam9x5.dtsi | 3 + arch/arm/boot/dts/at91sam9x5ek.dtsi | 32 +++ sound/soc/atmel/Kconfig | 10 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/sam9x5_wm8731.c | 218 ++++++++++++++++++++ sound/soc/codecs/wm8731.c | 60 +++++- 9 files changed, 392 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt create mode 100644 sound/soc/atmel/sam9x5_wm8731.c -- 1.7.10.4

3 20

[alsa-devel] [PATCH 0/5] ASoC: R-Car sound DMA transfer support
by Kuninori Morimoto 06 Aug '13

06 Aug '13

Hi Mark These are DMAEngine support patches for R-Car sound Last patch cleanups empty SCU functions. I will work for regmap support soon, but I need more time for it. This patch doesn't use soc-dmaengine-pcm.c method, becouse current R-Car chip doesn't suuport dmaengine_prep_dma_cyclic(). Of course I can re-work to use it if chip/rcar-dmaengine supports it. these are based on mark/topic/rcar branch Kuninori Morimoto (5): ASoC: rsnd: remove platform dai and add dai_id on platform setting ASoC: rsnd: add common DMAEngine method ASoC: rsnd: SSI supports DMA transfer ASoC: rsnd: SSI supports DMA transfer via BUSIF ASoC: rsnd: scu: cleanup empty functions include/sound/rcar_snd.h | 25 ++++-- sound/soc/sh/rcar/core.c | 192 +++++++++++++++++++++++++++++++++++++++++----- sound/soc/sh/rcar/gen.c | 20 +++-- sound/soc/sh/rcar/rsnd.h | 44 +++++++++++ sound/soc/sh/rcar/scu.c | 163 ++++++++++++++++++++++++++++++++------- sound/soc/sh/rcar/ssi.c | 150 ++++++++++++++++++++++++++++++++++-- 6 files changed, 529 insertions(+), 65 deletions(-) Best regards --- Kuninori Morimoto

2 6

[alsa-devel] [PATCH 1/3] ASoC: sgtl5000: prevent playback to be muted when terminating concurrent capture
by Lothar Waßmann 05 Aug '13

05 Aug '13

When a sound capture/playback is terminated while a playback/capture is running, power_vag_event() will clear SGTL5000_CHIP_ANA_POWER in the SND_SOC_DAPM_PRE_PMD event, thus muting the respective other channel. Don't clear SGTL5000_CHIP_ANA_POWER when both DAC and ADC are active to prevent this. Signed-off-by: Lothar Waßmann <LW(a)KARO-electronics.de> --- sound/soc/codecs/sgtl5000.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index c8b9090..a4b2973 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -153,6 +153,8 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w, static int power_vag_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { + const u32 mask = SGTL5000_DAC_POWERUP | SGTL5000_ADC_POWERUP; + switch (event) { case SND_SOC_DAPM_POST_PMU: snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER, @@ -160,9 +162,17 @@ static int power_vag_event(struct snd_soc_dapm_widget *w, break; case SND_SOC_DAPM_PRE_PMD: - snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER, - SGTL5000_VAG_POWERUP, 0); - msleep(400); + /* + * Don't clear VAG_POWERUP, when both DAC and ADC are + * operational to prevent inadvertently starving the + * other one of them. + */ + if ((snd_soc_read(w->codec, SGTL5000_CHIP_ANA_POWER) & + mask) != mask) { + snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER, + SGTL5000_VAG_POWERUP, 0); + msleep(400); + } break; default: break; -- 1.7.2.5

3 10

[alsa-devel] [PATCH] ASoC: core: init delayed_work for codec-codec links
by Richard Fitzgerald 05 Aug '13

05 Aug '13

If soc_probe_link_dais() finds a codec-codec link it skips creating a compress or pcm stream and links the DAIs together. But it must also init the delayed_work otherwise shutting down the DAI chain will fault when calling flush_delayed_work_sync() on the linked DAI. Pointing it to a dummy work callback is cleaner than taking special cases in the code to bypass the flush_delayed_work_sync(). Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4489c5b..bbe136c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -199,6 +199,10 @@ static ssize_t pmdown_time_set(struct device *dev, return count; } +static void dummy_delayed_work(struct work_struct *work) +{ +} + static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set); #ifdef CONFIG_DEBUG_FS @@ -1428,6 +1432,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order) return ret; } } else { + INIT_DELAYED_WORK(&rtd->delayed_work, dummy_delayed_work); + /* link the DAI widgets */ play_w = codec_dai->playback_widget; capture_w = cpu_dai->capture_widget; -- 1.7.2.5

2 11

[alsa-devel] [PATCH V2 0/8] Add audio support on smdk5420
by Padmavathi Venna 04 Aug '13

04 Aug '13

Samsung has different versions of I2S introduced in different platforms. Each version has some new support added for multichannel, secondary fifo, s/w reset control, internal mux for rclk src clk and tdm support. Each newly added change has a quirk. So this patch adds all the required quirks as driver data and based on compatible string from dtsi fetches the quirks. This also adds i2s support on exynos5420 and make relevent changes in the dtsi files. Changes since V1: - Pass quirks as driver data and fetch the quirks based on compatible string from dtsi file as suggested by Tomasz Figa and Mark Brown - Make the I2S driver more flexible with respect to register access as suggested by Tomasz Figa and Mark Brown - Add 5420 support in the driver. - Modify the dtsi files with the corresponding compatible strings and removed the i2s quirks from 5250 dtsi file. - Updated the i2s Documentation with relevent changes and i2s versioning info. - Add i2s nodes on exynos5420.dtsi - Enable sound support on smdk5420 This patch set is dependent on the following dma and audio subsystem clk controller patches. http://comments.gmane.org/gmane.linux.kernel.samsung-soc/20661 http://comments.gmane.org/gmane.linux.kernel.samsung-soc/20668 This patch set is made based on Kukjin Kim for-next branch. Andrew Bresticker (1): ARM: dts: exynos5420: add i2s controllers Padmavathi Venna (7): platform: Increase platform name size ASoC: Samsung: I2S: Add quirks as driver data in I2S ARM: dts: Change i2s compatible string on exynos5250 ASoC: Samsung: I2S: Modify driver to give more flexibility ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420 ARM: dts: wm8994: Add wm8994 support on smdk5420 ARM: dts: Enable sound support on smdk5420 .../devicetree/bindings/sound/samsung-i2s.txt | 25 ++- arch/arm/boot/dts/exynos5250.dtsi | 9 +- arch/arm/boot/dts/exynos5420-smdk5420.dts | 60 ++++++ arch/arm/boot/dts/exynos5420.dtsi | 44 +++++ include/linux/mod_devicetable.h | 2 +- include/linux/platform_data/asoc-s3c.h | 1 + sound/soc/samsung/i2s-regs.h | 51 ++++-- sound/soc/samsung/i2s.c | 205 +++++++++++++++----- 8 files changed, 312 insertions(+), 85 deletions(-) -- 1.7.4.4

7 30

[alsa-devel] end of playback ... design question
by Knut Petersen 02 Aug '13

02 Aug '13

Hi everybody! Although I looked at quite a bit of source code and documentation I have to admit that I am confused about one question: How should alsa playback be stopped in a way that _guarantees_ that no artifacts remaining in the drivers ringbuffer are played back again? Let´s assume we play stereo 16bit audio data using the rme96 driver, period size set to 0x800 frames. At the end of the penultimate frame playing will not be stopped even if there is only one frame of audio data remaining. Obviously that means 0x7ff frames of already played data is played again after that one valid frame, plus possibly a few that are played during the short time from interrupt request to the real stop of the playback hardware (about 5 frames on an old Pentium-M 1.2GHz). Now that could be fixed in different ways: A: Always ensure that there is a bit of silence (at least hardware buffer size plus a few frames) at the end of all audio data. Easy for the user , but only a workaround. B: At the rme96 driver level that condition can be detected and the relevant part of the buffer can be filled with zeros. I did that in an experimental change. It does work, but it´s definitely only a hack as it fixes the problem for only one device. C: The application playing audio data could pad all audio data to the period size with zeros. That would prevent playback of that max 0x7ff frames of garbage, but the few samples that are played during the time from interrupt request to the execution of the stop trigger do escape D: Don´t try to drain the buffer but pad with zeros and set a stop threshold. Workaround for applications should also work with older kernels. E: The alsa core could detect that condition and solve it equivalent to solution D I think that´s the proper solution. Did I miss something or do you agree? cu, Knut

3 2

[alsa-devel] [PATCH 01/10] ASoC: dapm: Move snd_soc_dapm_update from dapm context to card
by Lars-Peter Clausen 02 Aug '13

02 Aug '13

The update field of a DAPM context is only assigned while the card's dapm_mutex is locked, the field is also cleared again while the mutex is stil locked. So there will only ever be one DAPM context at a time with a non-NULL update field. So it is safe to move the update field from the DAPM context struct to the card struct. Doing so will allow further cleanups in this area. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> --- include/sound/soc-dapm.h | 2 -- include/sound/soc.h | 1 + sound/soc/soc-dapm.c | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index e77c6f5..3397292 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -575,8 +575,6 @@ struct snd_soc_dapm_context { struct delayed_work delayed_work; unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ - struct snd_soc_dapm_update *update; - void (*seq_notifier)(struct snd_soc_dapm_context *, enum snd_soc_dapm_type, int); diff --git a/include/sound/soc.h b/include/sound/soc.h index 6eabee7..b1e1f96 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1042,6 +1042,7 @@ struct snd_soc_card { /* Generic DAPM context for the card */ struct snd_soc_dapm_context dapm; struct snd_soc_dapm_stats dapm_stats; + struct snd_soc_dapm_update *update; #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_card_root; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 366daef..7449e27 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1425,7 +1425,7 @@ static void dapm_seq_run(struct snd_soc_dapm_context *dapm, static void dapm_widget_update(struct snd_soc_dapm_context *dapm) { - struct snd_soc_dapm_update *update = dapm->update; + struct snd_soc_dapm_update *update = dapm->card->update; struct snd_soc_dapm_widget_list *wlist; struct snd_soc_dapm_widget *w = NULL; unsigned int wi; @@ -1959,9 +1959,9 @@ int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm, int ret; mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); - dapm->update = update; + card->update = update; ret = soc_dapm_mux_update_power(dapm, kcontrol, mux, e); - dapm->update = NULL; + card->update = NULL; mutex_unlock(&card->dapm_mutex); if (ret > 0) soc_dpcm_runtime_update(card); @@ -2002,9 +2002,9 @@ int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm, int ret; mutex_lock_nested(&card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); - dapm->update = update; + card->update = update; ret = soc_dapm_mixer_update_power(dapm, kcontrol, connect); - dapm->update = NULL; + card->update = NULL; mutex_unlock(&card->dapm_mutex); if (ret > 0) soc_dpcm_runtime_update(card); @@ -2693,11 +2693,11 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, update.mask = mask; update.val = val; - widget->dapm->update = &update; + card->update = &update; soc_dapm_mixer_update_power(widget->dapm, kcontrol, connect); - widget->dapm->update = NULL; + card->update = NULL; } mutex_unlock(&card->dapm_mutex); @@ -2775,11 +2775,11 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, update.reg = e->reg; update.mask = mask; update.val = val; - widget->dapm->update = &update; + card->update = &update; soc_dapm_mux_update_power(widget->dapm, kcontrol, mux, e); - widget->dapm->update = NULL; + card->update = NULL; } mutex_unlock(&card->dapm_mutex); @@ -2928,11 +2928,11 @@ int snd_soc_dapm_put_value_enum_double(struct snd_kcontrol *kcontrol, update.reg = e->reg; update.mask = mask; update.val = val; - widget->dapm->update = &update; + card->update = &update; soc_dapm_mux_update_power(widget->dapm, kcontrol, mux, e); - widget->dapm->update = NULL; + card->update = NULL; } mutex_unlock(&card->dapm_mutex); -- 1.8.0

2 15

[alsa-devel] [PATCH 0/4] ALSA: Implement core jack support for kcontrol
by Felipe F. Tonello 01 Aug '13

01 Aug '13

From: "Felipe F. Tonello" <eu(a)felipetonello.com> This patch series enable KControl support for core Jack and update current codecs. This will will enable moderns user-space daemons, such as PulseAudio(>=2.0), to have jack detection support via newer ALSA KControl interface. Patch 1: Actually implementation using KControl. Patch 2: It also ensures HDA drivers to use properly this new ALSA Jack implementation. Patches 3-4: This patch makes sure that all users of ALSA Jack uses this new standard way to report detections to user-space. Felipe F. Tonello (4): ALSA: Added jack detection kcontrol support ALSA: HDA: Updating jack implementation according new ALSA Jacks ALSA: SoC: Updating jack implementation according new ALSA Jacks ALSA: oxygen: Updating jack implementation according new ALSA Jacks include/sound/jack.h | 6 ++++-- include/sound/soc.h | 2 +- sound/core/Kconfig | 1 + sound/core/ctljack.c | 3 ++- sound/core/jack.c | 29 +++++++++++++++++++++++++++-- sound/pci/hda/Kconfig | 8 -------- sound/pci/hda/hda_codec.h | 2 -- sound/pci/hda/hda_jack.c | 38 +++++++++++++++++--------------------- sound/pci/hda/hda_jack.h | 4 +--- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/soc/fsl/wm1133-ev1.c | 4 ++-- sound/soc/mid-x86/mfld_machine.c | 6 +++--- sound/soc/omap/ams-delta.c | 2 +- sound/soc/omap/omap-abe-twl6040.c | 4 ++-- sound/soc/omap/omap-twl4030.c | 4 ++-- sound/soc/omap/rx51.c | 6 +++--- sound/soc/pxa/hx4700.c | 4 ++-- sound/soc/pxa/palm27x.c | 4 ++-- sound/soc/pxa/ttc-dkb.c | 8 ++++---- sound/soc/pxa/z2.c | 4 ++-- sound/soc/samsung/goni_wm8994.c | 4 ++-- sound/soc/samsung/h1940_uda1380.c | 4 ++-- sound/soc/samsung/littlemill.c | 10 +++++----- sound/soc/samsung/lowland.c | 6 +++--- sound/soc/samsung/rx1950_uda1380.c | 4 ++-- sound/soc/samsung/smartq_wm8987.c | 4 ++-- sound/soc/samsung/speyside.c | 6 +++--- sound/soc/samsung/tobermory.c | 4 ++-- sound/soc/soc-jack.c | 4 ++-- sound/soc/tegra/tegra_alc5632.c | 4 ++-- sound/soc/tegra/tegra_rt5640.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 8 ++++---- 32 files changed, 107 insertions(+), 94 deletions(-) -- 1.8.1.4

6 30