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

Re: [alsa-devel] [PATCH v6 00/18] MFD/ASoC/Input: TWL4030/TWL60X0 changes
by Péter Ujfalusi 30 Jun '11

30 Jun '11

Hi Samuel, On Thursday 30 June 2011 10:04:43 Samuel Ortiz wrote: > I will do that very soon, no worries. Thank you very much, I'm going to have another series on top of this one coming, and want to make sure that I'm in the right track. Thanks, Péter

1 0

[alsa-devel] SB16 build error.
by Ralf Baechle 30 Jun '11

30 Jun '11

Found on a MIPS build but certain other architectures will have the same issue: CC sound/isa/sb/sb16_csp.o sound/isa/sb/sb16_csp.c: In function ‘snd_sb_csp_ioctl’: sound/isa/sb/sb16_csp.c:228: error: case label does not reduce to an integer constant make[1]: *** [sound/isa/sb/sb16_csp.o] Error 1 make: *** [sound/isa/sb/sb16_csp.o] Error 2 This error message is caused by the _IOC_TYPECHECK() error check triggering due to excessive ioctl size on Alpha, PowerPC, MIPS and SPARC which define _IOC_SIZEBITS as 13. On all other architectures define it as 14 so struct snd_sb_csp_microcode with it's little over 12kB will just about fit into the 16kB limit. Ralf

1 0

[alsa-devel] model needed for Clevo P150HM (Realtek ALC892)
by Julian Sikorski 30 Jun '11

30 Jun '11

Hi, I am coming here from pulseaudio-general mailing list [1]. I recently got myself a Clevo P150HM laptop. It has 2.1 speakers, a built-in microphone and the following connectors: - headphone out - microphone in; can be switched to center/lfe out - spdif out; can be switched to rear speaker out - line in; can be switched to side speaker out Alsa does not seem to reflect that the device is capable of 5.1 and 7.1 sound, and there are two configs showing up in pavucontrol (analog output and analog headphones) which seem to be the same. I have uploaded the output of alsa-info.sh [2]. Please let me know if more information is needed. Regards, Julian [1] http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/10096 [2] http://www.alsa-project.org/db/?f=7c91e874f4272387c2c51e448337567202c0edfe

2 29

[alsa-devel] [PATCH v6 00/18] MFD/ASoC/Input: TWL4030/TWL60X0 changes
by Peter Ujfalusi 30 Jun '11

30 Jun '11

Hello, Changes since v5: - Use alloc_workqueue in the twl6040-vibra driver (comment from Tejun Heo) - Allow user to change the headset power mode, but if the change is not allowed by the use case the change is not written to the HW (comment from Mark Brown) Mark: I have added your acks for the patches, except for patch 15, where you requested a change. Intro message from the v5 series: The series will do five major things, and they are in one series, because they pretty much depending on each other, so it is easier to handle them together. 1. Move the common pmic related configurations out from the board files. New twl-common.c/h file has been created for this purpose. OMAP3 board files received two patches (pdata, and regualtor changes), OMAP4 board files has been changed with one patch. 2. Rename the twl4030-codec MFD driver to twl4030-audio Since the ASoC multicomponent introduction (2.6.37) the twl4030-codec MFD dirver had been using twl4030-audio to register (twl4030-codec is the ASoC codec driver). The documentation refers to this part of twl as audio block, so it is better to rename the driver as well to avoid confusion. 3. Introduction of MFD driver for twl6040. The TWL6040 audio IC has codec and vibra functionality. Convert the existing ASoC codec driver to use the new MFD driver's interface. 4. Vibrator driver for TWL6040 (Input/ForceFeedback driver) The driver itself, and support for the vibrators in SDP4430 board. 5. Updates for twl6040 ASoC codec driver HS ramp configuration, new ABE dais, updated sample rate constraints, SDP4430 configuration. Regards, Peter --- Axel Castaneda Gonzalez (1): ASoC: twl6040: Configure ramp step based on platform Liam Girdwood (3): ASoC: twl6040: add all ABE DAIs ASoC: twl6040: Support other sample rates in constraints. ASoC: twl6040: set default constraints. Misael Lopez Cruz (5): mfd: twl6040: Add initial support ASoC: twl6040: Convert into TWL6040 MFD child input: Add initial support for TWL6040 vibrator ASoC: twl6040: Remove pll and headset mode dependency OMAP4: SDP4430: Add twl6040 codec platform support Peter Ujfalusi (9): OMAP: New twl-common for common TWL configuration OMAP4: Move common twl6030 configuration to twl-common OMAP3: Move common twl configuration to twl-common OMAP3: Move common regulator configuration to twl-common MFD: twl4030-codec: Rename internals from codec to audio MFD: twl4030-codec -> twl4030-audio: Rename the driver MFD: twl4030-audio: Rename platform data MFD: twl6040: Change platform data for soc codec driver OMAP4: SDP4430: Add twl6040 vibrator platform support arch/arm/mach-omap2/Makefile | 2 +- arch/arm/mach-omap2/board-3430sdp.c | 89 +--- arch/arm/mach-omap2/board-4430sdp.c | 187 ++---- arch/arm/mach-omap2/board-cm-t35.c | 48 +-- arch/arm/mach-omap2/board-devkit8000.c | 37 +-- arch/arm/mach-omap2/board-igep0020.c | 44 +-- arch/arm/mach-omap2/board-ldp.c | 15 +- arch/arm/mach-omap2/board-omap3beagle.c | 60 +-- arch/arm/mach-omap2/board-omap3evm.c | 67 +-- arch/arm/mach-omap2/board-omap3pandora.c | 59 +-- arch/arm/mach-omap2/board-omap3stalker.c | 70 +-- arch/arm/mach-omap2/board-omap3touchbook.c | 57 +-- arch/arm/mach-omap2/board-omap4panda.c | 149 +----- arch/arm/mach-omap2/board-overo.c | 59 +-- arch/arm/mach-omap2/board-rm680.c | 8 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 44 +-- arch/arm/mach-omap2/board-zoom-peripherals.c | 88 +--- arch/arm/mach-omap2/common-board-devices.c | 21 - arch/arm/mach-omap2/common-board-devices.h | 26 +- arch/arm/mach-omap2/twl-common.c | 304 ++++++++++ arch/arm/mach-omap2/twl-common.h | 59 ++ arch/arm/plat-omap/include/plat/irqs.h | 12 +- drivers/input/misc/Kconfig | 13 +- drivers/input/misc/Makefile | 1 + drivers/input/misc/twl4030-vibra.c | 12 +- drivers/input/misc/twl6040-vibra.c | 416 +++++++++++++ drivers/mfd/Kconfig | 8 +- drivers/mfd/Makefile | 3 +- drivers/mfd/twl-core.c | 13 +- drivers/mfd/twl4030-audio.c | 277 +++++++++ drivers/mfd/twl4030-codec.c | 277 --------- drivers/mfd/twl6040-core.c | 601 +++++++++++++++++++ drivers/mfd/twl6040-irq.c | 205 +++++++ include/linux/i2c/twl.h | 25 +- .../linux/mfd/{twl4030-codec.h => twl4030-audio.h} | 16 +- include/linux/mfd/twl6040.h | 261 ++++++++ sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/twl4030.c | 22 +- sound/soc/codecs/twl6040.c | 628 ++++++++------------ sound/soc/codecs/twl6040.h | 118 ---- sound/soc/omap/sdp3430.c | 2 +- sound/soc/omap/sdp4430.c | 2 + sound/soc/omap/zoom2.c | 2 +- 43 files changed, 2635 insertions(+), 1775 deletions(-) create mode 100644 arch/arm/mach-omap2/twl-common.c create mode 100644 arch/arm/mach-omap2/twl-common.h create mode 100644 drivers/input/misc/twl6040-vibra.c create mode 100644 drivers/mfd/twl4030-audio.c delete mode 100644 drivers/mfd/twl4030-codec.c create mode 100644 drivers/mfd/twl6040-core.c create mode 100644 drivers/mfd/twl6040-irq.c rename include/linux/mfd/{twl4030-codec.h => twl4030-audio.h} (96%) create mode 100644 include/linux/mfd/twl6040.h -- 1.7.5.3

4 29

Re: [alsa-devel] Bug#631963: linux-image-3.0.0-rc4-686-pae: no sound out the rear plugs
by Takashi Iwai 30 Jun '11

30 Jun '11

At Wed, 29 Jun 2011 20:45:02 +0200, Toni Mueller wrote: > > Hi, > > On Wed, 29.06.2011 at 07:21:33 +0200, Takashi Iwai <tiwai(a)suse.de> wrote: > > I'd definitely need alsa-info.sh outputs on both working and > > non-working kernels, i.e. on 2.6.38 and 3.0-rc4. > > this first post is for the non-working kernel. The other kernel's > information will follow tomorrow. I guess this must be the new feature, "Auto-Mute Mode". When this is enabled, the line-outs are muted automatically when the headphone jack is plugged. In your case, turn this mixer enum off. Takashi

1 0

[alsa-devel] SBx00 Azalia ALC663 Working but MIC goes away
by Diego Jacobi 30 Jun '11

30 Jun '11

I already sended this mail to this list ... many times .. but it gets bounced or wait for moderation. I find this annoying. I am attaching the files compressed now. I tested the solution mentioned by Takashi. I have installed alsa-driver-kmp-default and restarted, but i found the same behavior so, i didnt make more alsa-info files. However, i dont know what is "the right repository", i choosed "multimedia:audio:KMP/openSUSE_11.4" and also tested "multimedia:audio:KMP/openSUSE_11.4_Update" which provided the same file. The file is installed in linux-i1zx:/home/diego # modinfo snd-hda-intel | grep filename filename: /lib/modules/2.6.37.6-0.5-default/kernel/sound/pci/hda/snd-hda-intel.ko I have also tested model=m51va which also didnt helped. I dont think that the model, or model-autodetection is the solution for this. I mean, the problems gets solved after restarting alsa. So alsa does handles the MIC. I noted that in /etc/modprobe.d i have 2 sound.conf files. One is 50-sound.conf and the other is 50-sound.conf.YaST2save I dont know what is the second one for. If i use yast to edit the configuration, which i did, it edits the 50-sound.conf And also, all other files are numbered 50. What would happen if i change the sound to 51 to make the sound load after everything else? Could it break something ? like Yast ? ---------- Forwarded message ---------- From: Diego Jacobi <jacobidiego(a)gmail.com> Date: 2011/6/26 Subject: SBx00 Azalia ALC663 Working but MIC goes away To: alsa-devel(a)alsa-project.org Cc: Takashi Iwai <tiwai(a)suse.de> Hi people. I am having this problem for a long time ago, and i couldn't find the same on google, or a solution for it. I also don't know the right way to write the question to google, because almost all are about problems that i don't have. OpenSUSE 11.4 installed about 2 Months ago. ASUS laptop n51tp Athlon X2 ATI Mobility™ Radeon® HD 4650 Audio System: Built-in Azalia compliant audio chip, with 3D effect & full duplex Built-in speaker and microphone Support Audio Jack Detect for Vista Basic Logo Support Audio CODEC criteria for Vista Premium Logo AUDIO WORKS but with a problem listed below. ABSTRACT: - MIC never works after booting. It needs an alsa restart and gets broke sometimes.. DETAILED: If i start the laptop with no external headsets or speaker connected in front panel. Audio goes through internal speakers. When i connect an external speaker or headsets (like to talk with skype), they don't work. And MIC doesn't works. This is undesired behavior and the windows driver doesn't work that way. Internal goes mute when i connect an external. Causes trouble when speaking with skype, as everyone can heard. I have to reset alsa with "rcalsasound restart" with headsets plugged in. IF i start the laptop with the headsets plugged in. The internal speakers will not work at all. Always in mute. But the external will work. Also the MIC wont work. I have to reset alsa with "rcalsasound restart" with headsets plugged in. If i do some work with the laptop using different multimedia sources, it may broke. Most of the time i get called by skype and the MIC is surprise surprise, not working. Then i have to close all programs, restart alsa and open skype again to be able to talk. Thats the main reason to post here. TESTS RESULTS: I have runned alsa-info.sh with a different set of tests. So i write the cases for each one, and the filename of the attached. ---------------------------- Boot without anything connected to Front panel. Open Banshee and play. Internal speakers works. Plug headsets. They don't work. ===> alsa-info.txt.noheadsets Open Skype & do test call. MIC doesn't work. "rcalsasound restart" while headsets are plugged Internal AND headsets are working fine. Open Skype & do test call. MIC works. Second call works best. ===> alsa-info.txt.workingright ---------------------------- Boot with headsets plugged. Open Banshee and play. Headsets works. Unplug headsets. Internal Speakers doesn't work. Open Skype & do test call. MIC doesn't works. ===> alsa-info.txt.headsetsnomic "rcalsasound restart" while headsets are plugged Restart Skype & do test call. First call, noise recorded. Second call, MIC works. Unplug headsets. Internal Speakers works. ===> alsa-info.txt.workingright2 ---------------------------- With the "working right" condition. Do normal tasks. Open emesene & Skype. Open Opera. (always leaved opened) Open some pages with Firefox (hotmail & other flashintensiv sites) Went to take a shower & Came back Internal speakers don't work anymore. Headsets works MIC doesn't works. ===> alsa-info.txt.onlyheadsetsnomic rcalsasound restart Internal speakers works. Headsets works Skype requires to be restarted, banshee doesn't. First call, noise recorded. Second call, MIC works. ===> alsa-info.txt.workingright3 In the gnome's Audio-preferences dialog, the input tab, the level-bars : - show as ghosts when it doesn't work. - shows green changing, when it does works. - shows as ghosts if no program is using the mic and changes to green if i start the recorder. Restarting alsa requires closing Opera, Firefox, Skype, Emesene, Banshee, etc. to work or some of them will broke the MIC again. It also requires root privileges. A broken headset also causes this behavior when i plug it, and then MIC stops working until a reset. By a broken headset i mean a very low quality crappy MIC Noganet, which worked fine about 1 week, and then it started to only function by placing the cable on special positions and not moving it. Don't buy Noganet! MY GUESS about the problems: as almost electronic engineer. The MIC may seem an initialization problem, as it never happened on windows, but i don't have it anymore installed, since long now. The driver requires to detect check for high impedance at the front panel and mute the internal ones, and/or provide a way to mute them separately. I wonder why i cant see my headsets as a separate entry of the mixers. A short-circuit problem may be happening in my front panel, and under some circumstances, like moving the cables, it causes some chipset failure over the MIC controller. The driver is not handling this error and it stays crashed until a reset. However, it doesn't explains why seeing a video in flashplayer in opera may cause this too. I will appreciate any help, and thanks to everyone reading this not-short post. Cheers. Diego Below: Data about my system. ============================================================ ============================================================ ============================================================ Only "Master" and "Capture" are shown on alsa-mixer. Both full. But the problem here is not the volume. diego@linux-i1zx:~> skype --version Skype 2.2.0.25 Copyright (c) 2004-2011, Skype Limited linux-i1zx:/home/diego # cat /proc/asound/version Advanced Linux Sound Architecture Driver Version 1.0.23. linux-i1zx:/home/diego # cat /proc/asound/cards 0 [SB ]: HDA-Intel - HDA ATI SB HDA ATI SB at 0xfacf4000 irq 16 1 [HDMI ]: HDA-Intel - HDA ATI HDMI HDA ATI HDMI at 0xfadec000 irq 42 linux-i1zx:/home/diego # cat /proc/asound/devices 2: : timer 3: [ 0- 1]: digital audio playback 4: [ 0- 0]: digital audio playback 5: [ 0- 0]: digital audio capture 6: [ 0- 0]: hardware dependent 7: [ 0] : control 8: [ 1- 3]: digital audio playback 9: [ 1- 0]: hardware dependent 10: [ 1] : control 11: : sequencer linux-i1zx:/home/diego # cat /proc/asound/oss/devices 0: [0- 0]: mixer 3: [0- 0]: digital audio 4: [0- 0]: digital audio 12: [0- 1]: digital audio 16: [1- 0]: mixer linux-i1zx:/home/diego # cat /proc/asound/timers G0: system timer : 4000.000us (10000000 ticks) P0-0-0: PCM playback 0-0-0 : SLAVE P0-0-1: PCM capture 0-0-1 : SLAVE P0-1-0: PCM playback 0-1-0 : SLAVE P1-3-0: PCM playback 1-3-0 : SLAVE linux-i1zx:/home/diego # cat /proc/asound/pcm 00-00: ALC663 Analog : ALC663 Analog : playback 1 : capture 1 00-01: ALC663 Digital : ALC663 Digital : playback 1 01-03: HDMI 0 : HDMI 0 : playback 1 linux-i1zx:/home/diego # cat /etc/modprobe.d/50-sound.conf options snd slots=snd-hda-intel,snd-hda-intel # 5Dex.PIu7BLVZl12:SBx00 Azalia (Intel HDA) alias snd-card-0 snd-hda-intel # NXNs.yqXoVEq89wB:R700 Audio Device [Radeon HD 4000 Series] alias snd-card-1 snd-hda-intel linux-i1zx:/home/diego # lspci 00:00.0 Host bridge: Advanced Micro Devices [AMD] RS780 Host Bridge 00:02.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (ext gfx port 0) 00:05.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 1) 00:06.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 2) 00:07.0 PCI bridge: Advanced Micro Devices [AMD] RS780 PCI to PCI bridge (PCIE port 3) 00:11.0 SATA controller: ATI Technologies Inc SB700/SB800 SATA Controller [AHCI mode] 00:12.0 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI0 Controller 00:12.1 USB Controller: ATI Technologies Inc SB700 USB OHCI1 Controller 00:12.2 USB Controller: ATI Technologies Inc SB700/SB800 USB EHCI Controller 00:13.0 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI0 Controller 00:13.1 USB Controller: ATI Technologies Inc SB700 USB OHCI1 Controller 00:13.2 USB Controller: ATI Technologies Inc SB700/SB800 USB EHCI Controller 00:14.0 SMBus: ATI Technologies Inc SBx00 SMBus Controller (rev 3a) 00:14.2 Audio device: ATI Technologies Inc SBx00 Azalia (Intel HDA) 00:14.3 ISA bridge: ATI Technologies Inc SB700/SB800 LPC host controller 00:14.4 PCI bridge: ATI Technologies Inc SBx00 PCI to PCI Bridge 00:14.5 USB Controller: ATI Technologies Inc SB700/SB800 USB OHCI2 Controller 00:18.0 Host bridge: Advanced Micro Devices [AMD] Family 11h Processor HyperTransport Configuration (rev 40) 00:18.1 Host bridge: Advanced Micro Devices [AMD] Family 11h Processor Address Map 00:18.2 Host bridge: Advanced Micro Devices [AMD] Family 11h Processor DRAM Controller 00:18.3 Host bridge: Advanced Micro Devices [AMD] Family 11h Processor Miscellaneous Control 00:18.4 Host bridge: Advanced Micro Devices [AMD] Family 11h Processor Link Control 01:00.0 VGA compatible controller: ATI Technologies Inc M96 [Mobility Radeon HD 4650] 01:00.1 Audio device: ATI Technologies Inc RV710/730 02:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168B PCI Express Gigabit Ethernet controller (rev 02) 03:00.0 Network controller: Atheros Communications Inc. AR928X Wireless Network Adapter (PCI-Express) (rev 01) 06:01.0 FireWire (IEEE 1394): Ricoh Co Ltd R5C832 IEEE 1394 Controller (rev 05) 06:01.1 SD Host controller: Ricoh Co Ltd R5C822 SD/SDIO/MMC/MS/MSPro Host Adapter (rev 22) 06:01.2 System peripheral: Ricoh Co Ltd R5C592 Memory Stick Bus Host Adapter (rev 12) 06:01.3 System peripheral: Ricoh Co Ltd xD-Picture Card Controller (rev 12) linux-i1zx:/home/diego # dmesg | grep sound [ 9.759600] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input11 [23782.924422] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input13 [23897.439740] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input14 [23924.488713] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input15 [23999.613391] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input16 [25937.965371] input: HDA ATI SB Mic as /devices/pci0000:00/0000:00:14.2/sound/card0/input17 linux-i1zx:/home/diego # dmesg | grep hda [ 50.625207] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. [23786.414301] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. [23900.659802] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. [23928.322973] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. [24003.419618] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. [25940.535502] hda-intel: IRQ timing workaround is activated for card #1. Suggest a bigger bdl_pos_adj. linux-i1zx:/home/diego # lsmod | grep snd snd_pcm_oss 47887 0 snd_mixer_oss 16849 1 snd_pcm_oss snd_seq 57361 0 snd_seq_device 6646 1 snd_seq snd_hda_codec_hdmi 24875 1 snd_hda_codec_realtek 274207 1 snd_hda_intel 24912 2 snd_hda_codec 95606 3 snd_hda_codec_hdmi,snd_hda_codec_realtek,snd_hda_intel snd_hwdep 6038 1 snd_hda_codec snd_pcm 87993 4 snd_pcm_oss,snd_hda_codec_hdmi,snd_hda_intel,snd_hda_codec snd_timer 21844 2 snd_seq,snd_pcm snd 66158 15 snd_pcm_oss,snd_mixer_oss,snd_seq,snd_seq_device,snd_hda_codec_hdmi,snd_hda_codec_realtek,snd_hda_intel,snd_hda_codec,snd_hwdep,snd_pcm,snd_timer soundcore 6854 1 snd snd_page_alloc 7897 2 snd_hda_intel,snd_pcm

2 2

[alsa-devel] [PATCH 4/5] ASoC: atmel_ssc_dai/atmel-pcm: adapt to dmaengine usage
by Nicolas Ferre 30 Jun '11

30 Jun '11

Change xfer_size name to apply to PDC and DMA aswell. Specify overrun bit in interrupt mask. Add dmaengine specific routines and replace PDC ones in pcm_ops if appropriate. Uses cyclic DMA API for queuing samples. Signed-off-by: Nicolas Ferre <nicolas.ferre(a)atmel.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- sound/soc/atmel/atmel-pcm.c | 382 +++++++++++++++++++++++++++++++++++--- sound/soc/atmel/atmel-pcm.h | 4 +- sound/soc/atmel/atmel_ssc_dai.c | 33 ++-- 3 files changed, 373 insertions(+), 46 deletions(-) diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c index 51dde4e..fee6696 100644 --- a/sound/soc/atmel/atmel-pcm.c +++ b/sound/soc/atmel/atmel-pcm.c @@ -37,6 +37,7 @@ #include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/atmel_pdc.h> +#include <linux/dmaengine.h> #include <linux/atmel-ssc.h> #include <sound/core.h> @@ -44,6 +45,8 @@ #include <sound/pcm_params.h> #include <sound/soc.h> +#include <mach/at_hdmac.h> + #include "atmel-pcm.h" @@ -53,7 +56,7 @@ /* TODO: These values were taken from the AT91 platform driver, check * them against real values for AT32 */ -static const struct snd_pcm_hardware atmel_pcm_hardware = { +static const struct snd_pcm_hardware atmel_pcm_pdc_hardware = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_INTERLEAVED | @@ -66,6 +69,22 @@ static const struct snd_pcm_hardware atmel_pcm_hardware = { .buffer_bytes_max = 32 * 1024, }; +static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { + .info = SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_RESUME | + SNDRV_PCM_INFO_PAUSE, + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .period_bytes_min = 256, /* not too low to absorb DMA programming overhead */ + .period_bytes_max = 2 * 0xffff, /* if 2 bytes format */ + .periods_min = 8, + .periods_max = 1024, /* no limit */ + .buffer_bytes_max = 64 * 1024, /* 64KiB */ +}; + +static const struct snd_pcm_hardware *atmel_pcm_hardware; + /*--------------------------------------------------------------------------*\ * Data types @@ -77,12 +96,19 @@ struct atmel_runtime_data { size_t period_size; dma_addr_t period_ptr; /* physical address of next period */ + int periods; /* period index of period_ptr */ /* PDC register save */ u32 pdc_xpr_save; u32 pdc_xcr_save; u32 pdc_xnpr_save; u32 pdc_xncr_save; + + /* dmaengine data */ + struct at_dma_slave atslave; + struct dma_async_tx_descriptor *desc; + dma_cookie_t cookie; + struct dma_chan *dma_chan; }; @@ -94,7 +120,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, { struct snd_pcm_substream *substream = pcm->streams[stream].substream; struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = atmel_pcm_hardware.buffer_bytes_max; + size_t size = atmel_pcm_hardware->buffer_bytes_max; buf->dev.type = SNDRV_DMA_TYPE_DEV; buf->dev.dev = pcm->card->dev; @@ -116,7 +142,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, /*--------------------------------------------------------------------------*\ * ISR \*--------------------------------------------------------------------------*/ -static void atmel_pcm_dma_irq(u32 ssc_sr, +static void atmel_pcm_pdc_irq(u32 ssc_sr, struct snd_pcm_substream *substream) { struct atmel_runtime_data *prtd = substream->runtime->private_data; @@ -142,7 +168,7 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, ssc_writex(params->ssc->regs, params->pdc->xpr, prtd->period_ptr); ssc_writex(params->ssc->regs, params->pdc->xcr, - prtd->period_size / params->pdc_xfer_size); + prtd->period_size / params->data_xfer_size); ssc_writex(params->ssc->regs, ATMEL_PDC_PTCR, params->mask->pdc_enable); } @@ -156,12 +182,163 @@ static void atmel_pcm_dma_irq(u32 ssc_sr, ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->period_ptr); ssc_writex(params->ssc->regs, params->pdc->xncr, - prtd->period_size / params->pdc_xfer_size); + prtd->period_size / params->data_xfer_size); } snd_pcm_period_elapsed(substream); } +/** + * atmel_pcm_dma_irq: SSC interrupt handler for DMAENGINE enabled SSC + * + * We use DMAENGINE to send/receive data to/from SSC so this ISR is only to + * check if any overrun occured. + */ +static void atmel_pcm_dma_irq(u32 ssc_sr, + struct snd_pcm_substream *substream) +{ + struct atmel_runtime_data *prtd = substream->runtime->private_data; + struct atmel_pcm_dma_params *params = prtd->params; + + if (ssc_sr & params->mask->ssc_error) { + if (snd_pcm_running(substream)) + pr_warning("atmel-pcm: buffer %s on %s" + " (SSC_SR=%#x)\n", + substream->stream == SNDRV_PCM_STREAM_PLAYBACK + ? "underrun" : "overrun", + params->name, ssc_sr); + + /* stop RX and capture stream: will be enabled again at restart */ + ssc_writex(params->ssc->regs, SSC_CR, params->mask->ssc_disable); + snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); + + /* now drain RHR and read status to remove xrun condition */ + ssc_readx(params->ssc->regs, SSC_RHR); + ssc_readx(params->ssc->regs, SSC_SR); + } +} + +/*--------------------------------------------------------------------------*\ + * DMAENGINE operations +\*--------------------------------------------------------------------------*/ +static bool filter(struct dma_chan *chan, void *slave) +{ + struct at_dma_slave *sl = slave; + + if (sl->dma_dev == chan->device->dev) { + chan->private = sl; + return true; + } else { + return false; + } +} + +static int atmel_pcm_dma_alloc(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct atmel_runtime_data *prtd = runtime->private_data; + struct ssc_device *ssc = prtd->params->ssc; + struct at_dma_slave *sdata = NULL; + + if (ssc->pdev) + sdata = ssc->pdev->dev.platform_data; + + if (sdata && sdata->dma_dev) { + dma_cap_mask_t mask; + + /* setup DMA addresses */ + sdata->rx_reg = (dma_addr_t)ssc->phybase + SSC_RHR; + sdata->tx_reg = (dma_addr_t)ssc->phybase + SSC_THR; + + /* Try to grab a DMA channel */ + dma_cap_zero(mask); + dma_cap_set(DMA_CYCLIC, mask); + prtd->dma_chan = dma_request_channel(mask, filter, sdata); + } + if (!prtd->dma_chan) { + pr_err("atmel-pcm: " + "DMA channel not available, unable to use SSC-audio\n"); + return -EBUSY; + } + + return 0; +} + +static void audio_dma_irq(void *data) +{ + struct snd_pcm_substream *substream = (struct snd_pcm_substream *)data; + struct snd_pcm_runtime *runtime = substream->runtime; + struct atmel_runtime_data *prtd = runtime->private_data; + + prtd->period_ptr += prtd->period_size; + if (prtd->period_ptr >= prtd->dma_buffer_end) + prtd->period_ptr = prtd->dma_buffer; + + snd_pcm_period_elapsed(substream); +} + +static void atmel_pcm_dma_slave_config(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct atmel_runtime_data *prtd = runtime->private_data; + struct dma_chan *chan = prtd->dma_chan; + struct dma_slave_config slave_config; + enum dma_slave_buswidth buswidth; + + switch (prtd->params->data_xfer_size) { + case 1: + buswidth = DMA_SLAVE_BUSWIDTH_1_BYTE; + break; + case 2: + buswidth = DMA_SLAVE_BUSWIDTH_2_BYTES; + break; + case 4: + buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES; + break; + default: + return; + } + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + slave_config.direction = DMA_TO_DEVICE; + slave_config.dst_addr_width = buswidth; + } else { + slave_config.direction = DMA_FROM_DEVICE; + slave_config.src_addr_width = buswidth; + } + + dmaengine_slave_config(chan, &slave_config); +} + +static int atmel_pcm_dma_prep(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct atmel_runtime_data *prtd = runtime->private_data; + struct dma_chan *chan = prtd->dma_chan; + + if (prtd->desc) + /* already been there: redo the prep job */ + dmaengine_terminate_all(chan); + + /* setup dma configuration */ + atmel_pcm_dma_slave_config(substream); + + prtd->desc = chan->device->device_prep_dma_cyclic(chan, prtd->dma_buffer, + prtd->period_size * prtd->periods, + prtd->period_size, + substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? + DMA_TO_DEVICE : DMA_FROM_DEVICE); + if (!prtd->desc) { + dev_err(&chan->dev->device, "cannot prepare slave dma\n"); + return -EINVAL; + } + + prtd->desc->callback = audio_dma_irq; + prtd->desc->callback_param = substream; + + return 0; +} /*--------------------------------------------------------------------------*\ * PCM operations @@ -172,6 +349,7 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_runtime *runtime = substream->runtime; struct atmel_runtime_data *prtd = runtime->private_data; struct snd_soc_pcm_runtime *rtd = substream->private_data; + int ret; /* this may get called several times by oss emulation * with different params */ @@ -180,15 +358,35 @@ static int atmel_pcm_hw_params(struct snd_pcm_substream *substream, runtime->dma_bytes = params_buffer_bytes(params); prtd->params = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); - prtd->params->dma_intr_handler = atmel_pcm_dma_irq; prtd->dma_buffer = runtime->dma_addr; prtd->dma_buffer_end = runtime->dma_addr + runtime->dma_bytes; prtd->period_size = params_period_bytes(params); + prtd->periods = params_periods(params); + + if (ssc_use_dmaengine()) { + if (prtd->dma_chan == NULL) { + ret = atmel_pcm_dma_alloc(substream, params); + if (ret) + return ret; + } + ret = atmel_pcm_dma_prep(substream); + if (ret) { + dma_release_channel(prtd->dma_chan); + prtd->dma_chan = NULL; + return ret; + } + + prtd->params->dma_intr_handler = atmel_pcm_dma_irq; + } else { + prtd->params->dma_intr_handler = atmel_pcm_pdc_irq; + } pr_debug("atmel-pcm: " - "hw_params: DMA for %s initialized " + "hw_params: %s%s for %s initialized " "(dma_bytes=%u, period_size=%u)\n", + prtd->dma_chan ? "DMA " : "PDC", + prtd->dma_chan ? dma_chan_name(prtd->dma_chan): "", prtd->params->name, runtime->dma_bytes, prtd->period_size); @@ -201,15 +399,30 @@ static int atmel_pcm_hw_free(struct snd_pcm_substream *substream) struct atmel_pcm_dma_params *params = prtd->params; if (params != NULL) { - ssc_writex(params->ssc->regs, SSC_PDC_PTCR, - params->mask->pdc_disable); + if (ssc_use_dmaengine()) { + struct dma_chan *chan = prtd->dma_chan; + + if (chan) { + dmaengine_terminate_all(chan); + prtd->cookie = 0; + prtd->desc = NULL; + dma_release_channel(chan); + prtd->dma_chan = NULL; + } + } else { + ssc_writex(params->ssc->regs, SSC_PDC_PTCR, + params->mask->pdc_disable); + } prtd->params->dma_intr_handler = NULL; } return 0; } -static int atmel_pcm_prepare(struct snd_pcm_substream *substream) +/*--------------------------------------------------------------------------*\ + * PCM callbacks using PDC +\*--------------------------------------------------------------------------*/ +static int atmel_pcm_pdc_prepare(struct snd_pcm_substream *substream) { struct atmel_runtime_data *prtd = substream->runtime->private_data; struct atmel_pcm_dma_params *params = prtd->params; @@ -221,7 +434,7 @@ static int atmel_pcm_prepare(struct snd_pcm_substream *substream) return 0; } -static int atmel_pcm_trigger(struct snd_pcm_substream *substream, +static int atmel_pcm_pdc_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *rtd = substream->runtime; @@ -240,13 +453,13 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream, ssc_writex(params->ssc->regs, params->pdc->xpr, prtd->period_ptr); ssc_writex(params->ssc->regs, params->pdc->xcr, - prtd->period_size / params->pdc_xfer_size); + prtd->period_size / params->data_xfer_size); prtd->period_ptr += prtd->period_size; ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->period_ptr); ssc_writex(params->ssc->regs, params->pdc->xncr, - prtd->period_size / params->pdc_xfer_size); + prtd->period_size / params->data_xfer_size); pr_debug("atmel-pcm: trigger: " "period_ptr=%lx, xpr=%u, " @@ -264,7 +477,7 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream, pr_debug("sr=%u imr=%u\n", ssc_readx(params->ssc->regs, SSC_SR), - ssc_readx(params->ssc->regs, SSC_IER)); + ssc_readx(params->ssc->regs, SSC_IMR)); break; /* SNDRV_PCM_TRIGGER_START */ case SNDRV_PCM_TRIGGER_STOP: @@ -287,7 +500,7 @@ static int atmel_pcm_trigger(struct snd_pcm_substream *substream, return ret; } -static snd_pcm_uframes_t atmel_pcm_pointer( +static snd_pcm_uframes_t atmel_pcm_pdc_pointer( struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -305,13 +518,107 @@ static snd_pcm_uframes_t atmel_pcm_pointer( return x; } +/*--------------------------------------------------------------------------*\ + * PCM callbacks using DMAENGINE +\*--------------------------------------------------------------------------*/ +static int atmel_pcm_dma_prepare(struct snd_pcm_substream *substream) +{ + struct atmel_runtime_data *prtd = substream->runtime->private_data; + struct atmel_pcm_dma_params *params = prtd->params; + + ssc_writex(params->ssc->regs, SSC_IDR, params->mask->ssc_error); + return 0; +} + +static int atmel_pcm_dma_trigger(struct snd_pcm_substream *substream, + int cmd) +{ + struct snd_pcm_runtime *rtd = substream->runtime; + struct atmel_runtime_data *prtd = rtd->private_data; + struct atmel_pcm_dma_params *params = prtd->params; + dma_cookie_t cookie; + int ret = 0; + + pr_debug("atmel-pcm: trigger %d: buffer_size = %ld," + " dma_area = %p, dma_bytes = %u\n", + cmd, rtd->buffer_size, rtd->dma_area, rtd->dma_bytes); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + + if (prtd->cookie < DMA_MIN_COOKIE) { + cookie = dmaengine_submit(prtd->desc); + if (dma_submit_error(cookie)) { + ret = -EINVAL; + break; + } + prtd->cookie = cookie; + prtd->period_ptr = prtd->dma_buffer; + } + + + pr_debug("atmel-pcm: trigger: start sr=0x%08x imr=0x%08u\n", + ssc_readx(params->ssc->regs, SSC_SR), + ssc_readx(params->ssc->regs, SSC_IMR)); + + /* fallback */ + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + case SNDRV_PCM_TRIGGER_RESUME: + dmaengine_resume(prtd->dma_chan); + + /* It not already done or comming from xrun state */ + ssc_readx(params->ssc->regs, SSC_SR); + ssc_writex(params->ssc->regs, SSC_IER, params->mask->ssc_error); + ssc_writex(params->ssc->regs, SSC_CR, params->mask->ssc_enable); + + break; + case SNDRV_PCM_TRIGGER_STOP: + pr_debug("atmel-pcm: trigger: stop cmd = %d\n", cmd); + + ssc_writex(params->ssc->regs, SSC_IDR, params->mask->ssc_error); + + /* fallback */ + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + case SNDRV_PCM_TRIGGER_SUSPEND: + dmaengine_pause(prtd->dma_chan); + break; + default: + ret = -EINVAL; + } + + return ret; +} + +static snd_pcm_uframes_t atmel_pcm_dma_pointer( + struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct atmel_runtime_data *prtd = runtime->private_data; + snd_pcm_uframes_t x; + + dev_vdbg(substream->pcm->card->dev, "%s: 0x%08x %ld\n", + __func__, prtd->period_ptr, + bytes_to_frames(runtime, prtd->period_ptr - prtd->dma_buffer)); + + x = bytes_to_frames(runtime, prtd->period_ptr - prtd->dma_buffer); + + if (x >= runtime->buffer_size) + x = 0; + + return x; +} + + +/*--------------------------------------------------------------------------*\ + * PCM open/close/mmap +\*--------------------------------------------------------------------------*/ static int atmel_pcm_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; struct atmel_runtime_data *prtd; int ret = 0; - snd_soc_set_runtime_hwparams(substream, &atmel_pcm_hardware); + snd_soc_set_runtime_hwparams(substream, atmel_pcm_hardware); /* ensure that buffer size is a multiple of period size */ ret = snd_pcm_hw_constraint_integer(runtime, @@ -352,9 +659,9 @@ static struct snd_pcm_ops atmel_pcm_ops = { .ioctl = snd_pcm_lib_ioctl, .hw_params = atmel_pcm_hw_params, .hw_free = atmel_pcm_hw_free, - .prepare = atmel_pcm_prepare, - .trigger = atmel_pcm_trigger, - .pointer = atmel_pcm_pointer, + .prepare = atmel_pcm_pdc_prepare, + .trigger = atmel_pcm_pdc_trigger, + .pointer = atmel_pcm_pdc_pointer, .mmap = atmel_pcm_mmap, }; @@ -426,14 +733,16 @@ static int atmel_pcm_suspend(struct snd_soc_dai *dai) prtd = runtime->private_data; params = prtd->params; - /* disable the PDC and save the PDC registers */ + if (!ssc_use_dmaengine()) { + /* disable the PDC and save the PDC registers */ - ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable); + ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_disable); - prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr); - prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr); - prtd->pdc_xnpr_save = ssc_readx(params->ssc->regs, params->pdc->xnpr); - prtd->pdc_xncr_save = ssc_readx(params->ssc->regs, params->pdc->xncr); + prtd->pdc_xpr_save = ssc_readx(params->ssc->regs, params->pdc->xpr); + prtd->pdc_xcr_save = ssc_readx(params->ssc->regs, params->pdc->xcr); + prtd->pdc_xnpr_save = ssc_readx(params->ssc->regs, params->pdc->xnpr); + prtd->pdc_xncr_save = ssc_readx(params->ssc->regs, params->pdc->xncr); + } return 0; } @@ -450,13 +759,15 @@ static int atmel_pcm_resume(struct snd_soc_dai *dai) prtd = runtime->private_data; params = prtd->params; - /* restore the PDC registers and enable the PDC */ - ssc_writex(params->ssc->regs, params->pdc->xpr, prtd->pdc_xpr_save); - ssc_writex(params->ssc->regs, params->pdc->xcr, prtd->pdc_xcr_save); - ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save); - ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save); + if (!ssc_use_dmaengine()) { + /* restore the PDC registers and enable the PDC */ + ssc_writex(params->ssc->regs, params->pdc->xpr, prtd->pdc_xpr_save); + ssc_writex(params->ssc->regs, params->pdc->xcr, prtd->pdc_xcr_save); + ssc_writex(params->ssc->regs, params->pdc->xnpr, prtd->pdc_xnpr_save); + ssc_writex(params->ssc->regs, params->pdc->xncr, prtd->pdc_xncr_save); - ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable); + ssc_writel(params->ssc->regs, PDC_PTCR, params->mask->pdc_enable); + } return 0; } #else @@ -495,6 +806,15 @@ static struct platform_driver atmel_pcm_driver = { static int __init snd_atmel_pcm_init(void) { + if (ssc_use_dmaengine()) { + atmel_pcm_ops.prepare = atmel_pcm_dma_prepare; + atmel_pcm_ops.trigger = atmel_pcm_dma_trigger; + atmel_pcm_ops.pointer = atmel_pcm_dma_pointer; + + atmel_pcm_hardware = &atmel_pcm_dma_hardware; + } else { + atmel_pcm_hardware = &atmel_pcm_pdc_hardware; + } return platform_driver_register(&atmel_pcm_driver); } module_init(snd_atmel_pcm_init); diff --git a/sound/soc/atmel/atmel-pcm.h b/sound/soc/atmel/atmel-pcm.h index 5e0a95e..b007376 100644 --- a/sound/soc/atmel/atmel-pcm.h +++ b/sound/soc/atmel/atmel-pcm.h @@ -50,6 +50,7 @@ struct atmel_pdc_regs { struct atmel_ssc_mask { u32 ssc_enable; /* SSC recv/trans enable */ u32 ssc_disable; /* SSC recv/trans disable */ + u32 ssc_error; /* SSC error conditions */ u32 ssc_endx; /* SSC ENDTX or ENDRX */ u32 ssc_endbuf; /* SSC TXBUFE or RXBUFF */ u32 pdc_enable; /* PDC recv/trans enable */ @@ -66,7 +67,8 @@ struct atmel_ssc_mask { */ struct atmel_pcm_dma_params { char *name; /* stream identifier */ - int pdc_xfer_size; /* PDC counter increment in bytes */ + int data_xfer_size; /* PDC counter increment in bytes, + DMA data transfer size in bytes */ struct ssc_device *ssc; /* SSC device for stream */ struct atmel_pdc_regs *pdc; /* PDC receive or transmit registers */ struct atmel_ssc_mask *mask; /* SSC & PDC status bits */ diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index a7a7bbc..9412fc3 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -48,7 +48,8 @@ #include "atmel_ssc_dai.h" -#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) +#if defined(CONFIG_ARCH_AT91SAM9260) || defined(CONFIG_ARCH_AT91SAM9G20) \ + || defined(CONFIG_ARCH_AT91SAM9X5) #define NUM_SSC_DEVICES 1 #else #define NUM_SSC_DEVICES 3 @@ -86,6 +87,7 @@ static struct atmel_ssc_mask ssc_tx_mask = { static struct atmel_ssc_mask ssc_rx_mask = { .ssc_enable = SSC_BIT(CR_RXEN), .ssc_disable = SSC_BIT(CR_RXDIS), + .ssc_error = SSC_BIT(SR_OVRUN), .ssc_endx = SSC_BIT(SR_ENDRX), .ssc_endbuf = SSC_BIT(SR_RXBUFF), .pdc_enable = ATMEL_PDC_RXTEN, @@ -183,7 +185,8 @@ static irqreturn_t atmel_ssc_interrupt(int irq, void *dev_id) if ((dma_params != NULL) && (dma_params->dma_intr_handler != NULL)) { ssc_substream_mask = (dma_params->mask->ssc_endx | - dma_params->mask->ssc_endbuf); + dma_params->mask->ssc_endbuf | + dma_params->mask->ssc_error); if (ssc_sr & ssc_substream_mask) { dma_params->dma_intr_handler(ssc_sr, dma_params-> @@ -376,19 +379,19 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, switch (params_format(params)) { case SNDRV_PCM_FORMAT_S8: bits = 8; - dma_params->pdc_xfer_size = 1; + dma_params->data_xfer_size = 1; break; case SNDRV_PCM_FORMAT_S16_LE: bits = 16; - dma_params->pdc_xfer_size = 2; + dma_params->data_xfer_size = 2; break; case SNDRV_PCM_FORMAT_S24_LE: bits = 24; - dma_params->pdc_xfer_size = 4; + dma_params->data_xfer_size = 4; break; case SNDRV_PCM_FORMAT_S32_LE: bits = 32; - dma_params->pdc_xfer_size = 4; + dma_params->data_xfer_size = 4; break; default: printk(KERN_WARNING "atmel_ssc_dai: unsupported PCM format"); @@ -561,15 +564,17 @@ static int atmel_ssc_hw_params(struct snd_pcm_substream *substream, /* Reset the SSC and its PDC registers */ ssc_writel(ssc_p->ssc->regs, CR, SSC_BIT(CR_SWRST)); - ssc_writel(ssc_p->ssc->regs, PDC_RPR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_RCR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_RNPR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_RNCR, 0); + if (!ssc_use_dmaengine()) { + ssc_writel(ssc_p->ssc->regs, PDC_RPR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_RCR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_RNPR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_RNCR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_TPR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_TCR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_TNPR, 0); - ssc_writel(ssc_p->ssc->regs, PDC_TNCR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_TPR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_TCR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_TNPR, 0); + ssc_writel(ssc_p->ssc->regs, PDC_TNCR, 0); + } ret = request_irq(ssc_p->ssc->irq, atmel_ssc_interrupt, 0, ssc_p->name, ssc_p); -- 1.7.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel(a)lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

3 2

[alsa-devel] asoc: how to enable micbias and codec power when headset inserted
by Babu, Ramesh 29 Jun '11

29 Jun '11

Hi I have question on handling mic bias and codec bias when headset is inserted. When headset is inserted, the mic bias and codec bias should be ON, in order to get the button press interrupts from the headset. Do I need to have dapm path to achieve this? Reference to existing code would be nice ! Regards Ramesh

2 1

[alsa-devel] [PATCH] ASoC: Fix Blackfin I2S _pointer() implementation return in bounds values
by Mark Brown 29 Jun '11

29 Jun '11

The Blackfin DMA controller can report one frame beyond the end of the buffer in the wraparound case but ALSA requires that the pointer always be in the buffer. Do the wraparound to handle this. A similar bug is likely to apply to the other Blackfin PCM drivers but the code is less obvious to inspection and I don't have a user to test. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/blackfin/bf5xx-i2s-pcm.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-i2s-pcm.c b/sound/soc/blackfin/bf5xx-i2s-pcm.c index 4a805a8..819d3bd 100644 --- a/sound/soc/blackfin/bf5xx-i2s-pcm.c +++ b/sound/soc/blackfin/bf5xx-i2s-pcm.c @@ -138,11 +138,21 @@ static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream) pr_debug("%s enter\n", __func__); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { diff = sport_curr_offset_tx(sport); - frames = bytes_to_frames(substream->runtime, diff); } else { diff = sport_curr_offset_rx(sport); - frames = bytes_to_frames(substream->runtime, diff); } + + /* + * TX at least can report one frame beyond the end of the + * buffer if we hit the wraparound case - clamp to within the + * buffer as the ALSA APIs require. + */ + if (diff == snd_pcm_lib_buffer_bytes(substream)) + diff = 0; + } + + frames = bytes_to_frames(substream->runtime, diff); + return frames; } -- 1.7.5.4

3 3

[alsa-devel] [PATCH] ASoC: Correct left/right swap in wm_hubs DC offset correction
by Mark Brown 29 Jun '11

29 Jun '11

It was consistently wrong for everything except WM8993 so should be no functional change. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_hubs.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 4ebc131..2d6c88b 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -133,9 +133,9 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) break; case 1: reg = snd_soc_read(codec, WM8993_DC_SERVO_3); - reg_l = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) + reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) >> WM8993_DCS_DAC_WR_VAL_1_SHIFT; - reg_r = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; + reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; break; default: WARN(1, "Unknown DCS readback method\n"); @@ -149,13 +149,13 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) dev_dbg(codec->dev, "Applying %d code DC servo correction\n", hubs->dcs_codes); - /* HPOUT1L */ - offset = reg_l; + /* HPOUT1R */ + offset = reg_r; offset += hubs->dcs_codes; dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; - /* HPOUT1R */ - offset = reg_r; + /* HPOUT1L */ + offset = reg_l; offset += hubs->dcs_codes; dcs_cfg |= (u8)offset; @@ -167,8 +167,8 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) WM8993_DCS_TRIG_DAC_WR_0 | WM8993_DCS_TRIG_DAC_WR_1); } else { - dcs_cfg = reg_l << WM8993_DCS_DAC_WR_VAL_1_SHIFT; - dcs_cfg |= reg_r; + dcs_cfg = reg_r << WM8993_DCS_DAC_WR_VAL_1_SHIFT; + dcs_cfg |= reg_l; } /* Save the callibrated offset if we're in class W mode and -- 1.7.5.4

2 1