path: root/sound/soc/ep93xx
AgeCommit message (Collapse)Author
2012-04-05dmaengine/dma_slave: introduce inline wrappersAlexandre Bounine
Add inline wrappers for device_prep_slave_sg() and device_prep_dma_cyclic() interfaces to hide new parameter from current users of affected interfaces. Convert current users to use new wrappers instead of direct calls. Suggested by Russell King []. Signed-off-by: Alexandre Bounine <> Signed-off-by: Vinod Koul <> cherry-picked from mainline commit 16052827d98fbc13c31ebad560af4bd53e2b4dd5 Change-Id: I929a49556539621a0546829e88b3caa498c94be2 Signed-off-by: Laxman Dewangan <> Reviewed-on: http://git-master/r/94463
2011-08-22sound/soc/ep93xx/ep93xx-i2s.c: add missing kfreeJulia Lawall
Introduce a new label that includes kfree and jump to that one. A simplified version of the semantic match that finds this problem is as follows: ( // <smpl> @@ identifier x; expression E1!=0,E2,E3,E4; statement S; iterator I; @@ ( if (...) { ... when != kfree(x) when != x = E3 when != E3 = x * return ...; } ... when != x = E2 when != I(...,x,...) S if (...) { ... when != x = E4 kfree(x); ... return ...; } ) // </smpl> Signed-off-by: Julia Lawall <> Acked-by: Alexander Sverdlin <> Reviewed-by: H Hartley Sweeten <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-07-25Merge branch 'for-linus' of ↵Linus Torvalds
git:// * 'for-linus' of git:// (43 commits) fs: Merge split strings treewide: fix potentially dangerous trailing ';' in #defined values/expressions uwb: Fix misspelling of neighbourhood in comment net, netfilter: Remove redundant goto in ebt_ulog_packet trivial: don't touch files that are removed in the staging tree lib/vsprintf: replace link to Draft by final RFC number doc: Kconfig: `to be' -> `be' doc: Kconfig: Typo: square -> squared doc: Konfig: Documentation/power/{pm => apm-acpi}.txt drivers/net: static should be at beginning of declaration drivers/media: static should be at beginning of declaration drivers/i2c: static should be at beginning of declaration XTENSA: static should be at beginning of declaration SH: static should be at beginning of declaration MIPS: static should be at beginning of declaration ARM: static should be at beginning of declaration rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check Update my e-mail address PCIe ASPM: forcedly -> forcibly gma500: push through device driver tree ... Fix up trivial conflicts: - arch/arm/mach-ep93xx/dma-m2p.c (deleted) - drivers/gpio/gpio-ep93xx.c (renamed and context nearby) - drivers/net/r8169.c (just context changes)
2011-07-23Merge branch 'for-linus' of ↵Linus Torvalds
git:// * 'for-linus' of git:// (297 commits) ALSA: asihpi - Replace with snd_ctl_boolean_mono_info() ALSA: asihpi - HPI version 4.08 ALSA: asihpi - Add volume mute controls ALSA: asihpi - Control name updates ALSA: asihpi - Use size_t for sizeof result ALSA: asihpi - Explicitly include mutex.h ALSA: asihpi - Add new node and message defines ALSA: asihpi - Make local function static ALSA: asihpi - Fix minor typos and spelling ALSA: asihpi - Remove unused structures, macros and functions ALSA: asihpi - Remove spurious adapter index check ALSA: asihpi - Revise snd_pcm_debug_name, get rid of DEBUG_NAME macro ALSA: asihpi - DSP code loader API now independent of OS ALSA: asihpi - Remove controlex structs and associated special data transfer code ALSA: asihpi - Increase request and response buffer sizes ALSA: asihpi - Give more meaningful name to hpi request message type ALSA: usb-audio - Add quirk for Roland / BOSS BR-800 ALSA: hda - Remove a superfluous argument of via_auto_init_output() ALSA: hda - Fix indep-HP path (de-)activation for VT1708* codecs ALSA: hda - Add documentation for codec-specific mixer controls ...
2011-06-16Change Ryan Mallon's email address across the kernelRyan Mallon
I no longer work at Bluewater Systems. Update my email address accordingly. I have deleted my email address from C files rather than change it. This was suggested by several people, since the commit from my new email address will cause scripts/ to function properly. I have not added the .mailmap entry as suggested by Joe because I think it is no longer necessary if I touch all the files which had my name in them. Signed-off-by: Ryan Mallon <> Cc: Andre Renaud <> Cc: H Hartley Sweeten <> Cc: Russell King <> Cc: Nicolas Ferre <> Cc: Andrew Victor <> Cc: David Woodhouse <> Cc: Anton Vorontsov <> Cc: Paul Mundt <> Cc: Liam Girdwood <> Cc: Mark Brown <> Cc: Alan Cox <> Cc: Joe Perches <> Cc: Jesper Juhl <> Cc: Andrew Morton <> Cc: Cc: Reviewed-by: Jesper Juhl <> Signed-off-by: Jiri Kosina <>
2011-06-08ASoC: ep93xx: convert to use the DMA engine APIMika Westerberg
Now that we have the EP93xx DMA engine driver in place, we convert the ASoC drivers (I2S, AC97 and PCM) to take advantage of this new API. There are no functional changes. Signed-off-by: Mika Westerberg <> Acked-by: H Hartley Sweeten <> Acked-by: Liam Girdwood <> Acked-by: Mark Brown <> Acked-by: Vinod Koul <> Signed-off-by: Grant Likely <>
2011-06-07ASoC: core - Optimise and refactor pcm_new() to pass only rtdLiam Girdwood
Currently pcm_new() passes in 3 arguments :- card, pcm and DAI. Refactor this to only pass in 1 argument (i.e. the rtd) since struct rtd contains card, pcm and DAI along with other members too that are useful too. Signed-off-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-03-09ASoC: Enable 192kHz sample rate for EP93xx.Alexander Sverdlin
Enable 192kHz sample rate for EP93xx. Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-03-09ASoC: Improve EP93xx I2S clocks management.Alexander Sverdlin
Improve EP93xx I2S clocks management. Some freqs values are set not exact as they requested for MCLK and original code was not able to find divisors for SCLK and LRCLK. This code just picks up nearest value from 3 possible variants. This patch makes 44100 and 192000 rates working and fixes capture function (by selecting SCLK/LRCLK=64 where possible). All other rates should work as before. Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-03-09ASoC: EDB93xx: Manage I2S rates according to datasheet for CS4271 CODEC.Alexander Sverdlin
Manage I2S rates according to datasheet for CS4271 CODEC in EDB93xx machine driver. Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-03-07ASoC: Remove warnings in ep93xx-i2s.cAlexander Sverdlin
Remove warnings in ep93xx-i2s.c Signed-off-by: Alexander Sverdlin <> Acked-by: Ryan Mallon <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-02-04ASoC: ep93xx-ac97: remove extra empty lineMika Westerberg
Signed-off-by: Mika Westerberg <> Signed-off-by: Mark Brown <>
2011-01-24ASoC: EDB93xx machine sound driver with CS4271Alexander Sverdlin
Added support for EDB93xx sound with CS4271 CODEC. Features: - Playback, Capture - Sample rates from 8kHz to 96kHz tested Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2011-01-17ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S codeAlexander Sverdlin
Changelog: 1. I2S module of EP93xx should be feed by 32bit DMA transfers. This is hardware limitation and that's the way original Cirrus's driver worked. This will fix distorted sound playback and make capture actually work in present ep93xx drivers. I've found, that author of code, on which modern ep93xx-i2s.c and ep93xx-pcm.c are based, had faced this problem also in 2007: Now SoC code uses his developments, but not overcomes the hardware issues. Some details from EP93xx users guide: Both I2S transmitter and receiver have similar 16x32bit FIFO, where they store 8 samples for both left and right channels. The FIFO is always 32bit wide and should be properly aligned if you use samples of other width. Transmitter and receiver have configuration registers for selection of I2S word length (16, 24, 32). They are I2STXWrdLen and I2SRXWrdLen. Yes, EP93xx DMA can do byte, word and quad-word transfers. The width for transfers to and from peripherals is selected by particular module configuration. Lucky AC97 module has such configuration: AC97RXCRx registers, bit CM (Compact mode enable) switches between 16 and 32 bit samples. AC97TXCRx registers have the same bits for transmitters. ep93xx-ac97.c enables this compact mode and so has all the rights to use S16_LE format. No one has found such a configuration in I2S module until now in any Cirrus manuals. I2S module always feeds it's 32bit wide FIFO with 32bit samples consecutively for left and right channels. You cannot use 32-bit DMA transfers to transfer two 16-bit samples. So we can use two formats for AC97, but should remove all but S32_LE for I2S. Always using 32 bit chunks is not a problem for I2S, the codec I use uses less bits too (24), it's permitted by I2S standard. In proposed patch formats list shortened to just S32_LE, this makes all the DMA transactions right, while ALSA will do all sample format translation for us. 2. Incorrect setting of LRCLK (2 times slower) in original ep93xx-i2s.c masks the first problem. DMA takes two 16 bit samples instead of one, overall sound speed seems to be normal, but you get actually 4000 sampling rate instead of requested 8000 and therefore some noise... This is also the reason why the capture function not worked at all in this driver... If we take a look into I2S specification, we will figure that LRCLK MUST be equal to sample rate, if we are talking about stereo (in mono too, but it's not our case at all). In proposed patch SCLK and LRCLK rates are corrected, assuming we always send 32 bits * 2 channels to codec. Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-12-09ASoC: EP93xx: sampling rate range extendedAlexander Sverdlin
Changes to both I2S and PCM code: - Rates list extended up to 96kHz, it's tested on EDB9302 and works for both capture and playback. Signed-off-by: Alexander Sverdlin <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-11-25Merge branch 'for-2.6.37' into for-2.6.38Mark Brown
2010-11-25ASoC: simone: fix resource leak in simone_init error pathAxel Lin
Fix the error path to properly free allocated resources. Signed-off-by: Axel Lin <> Acked-by: Mika Westerberg <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-11-22ASoC: Do not include soc-dapm.hJarkko Nikula
There is no need to include soc-dapm.h since soc.h includes it. Signed-off-by: Jarkko Nikula <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-11-06ASoC: Decouple DAPM from CODECsLiam Girdwood
Decoupling Dynamic Audio Power Management (DAPM) from codec devices is required when developing ASoC further. Such as for other ASoC components to have DAPM widgets or when extending DAPM to handle cross-device paths. This patch decouples DAPM related variables from struct snd_soc_codec and moves them to new struct snd_soc_dapm_context that is used to encapsulate DAPM context of a device. ASoC core and API of DAPM functions are modified to use DAPM context instead of codec. This patch does not change current functionality and a large part of changes come because of structure and internal API changes. Core implementation is from Liam Girdwood <> with some minor core changes, codecs and machine driver conversions from Jarkko Nikula <>. Signed-off-by: Liam Girdwood <> Signed-off-by: Jarkko Nikula <> Cc: Nicolas Ferre <> Cc: Manuel Lauss <> Cc: Mike Frysinger <> Cc: Cliff Cai <> Cc: Kevin Hilman <> Cc: Ryan Mallon <> Cc: Timur Tabi <> Cc: Sascha Hauer <> Cc: Lars-Peter Clausen <> Cc: Arnaud Patard (Rtp) <> Cc: Wan ZongShun <> Cc: Eric Miao <> Cc: Jassi Brar <> Cc: Daniel Gloeckner <> Cc: Kuninori Morimoto <> Signed-off-by: Mark Brown <>
2010-10-15ASoC: ep93xx: add Simplemachines Sim.One AC97 audio supportMika Westerberg
Add AC97 audio support for Simplemachines Sim.One board. Signed-off-by: Mika Westerberg <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-10-15ASoC: add ep93xx AC97 audio driverMika Westerberg
Add support for AC97 controllers found in Cirrus Logic EP93xx family SoCs. Signed-off-by: Mika Westerberg <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-08-12ASoC: multi-component - ASoC Multi-Component SupportLiam Girdwood
This patch extends the ASoC API to allow sound cards to have more than one CODEC and more than one platform DMA controller. This is achieved by dividing some current ASoC structures that contain both driver data and device data into structures that only either contain device data or driver data. i.e. struct snd_soc_codec ---> struct snd_soc_codec (device data) +-> struct snd_soc_codec_driver (driver data) struct snd_soc_platform ---> struct snd_soc_platform (device data) +-> struct snd_soc_platform_driver (driver data) struct snd_soc_dai ---> struct snd_soc_dai (device data) +-> struct snd_soc_dai_driver (driver data) struct snd_soc_device ---> deleted This now allows ASoC to be more tightly aligned with the Linux driver model and also means that every ASoC codec, platform and (platform) DAI is a kernel device. ASoC component private data is now stored as device private data. The ASoC sound card struct snd_soc_card has also been updated to store lists of it's components rather than a pointer to a codec and platform. The PCM runtime struct soc_pcm_runtime now has pointers to all its components. This patch adds DAPM support for ASoC multi-component and removes struct snd_soc_socdev from DAPM core. All DAPM calls are now made on a card, codec or runtime PCM level basis rather than using snd_soc_socdev. Other notable multi-component changes:- * Stream operations now de-reference less structures. * close_delayed work() now runs on a DAI basis rather than looping all DAIs in a card. * PM suspend()/resume() operations can now handle N CODECs and Platforms per sound card. * Added soc_bind_dai_link() to bind the component devices to the sound card. * Added soc_dai_link_probe() and soc_dai_link_remove() to probe and remove DAI link components. * sysfs entries can now be registered per component per card. * snd_soc_new_pcms() functionailty rolled into dai_link_probe(). * snd_soc_register_codec() now does all the codec list and mutex init. This patch changes the probe() and remove() of the CODEC drivers as follows:- o Make CODEC driver a platform driver o Moved all struct snd_soc_codec list, mutex, etc initialiasation to core. o Removed all static codec pointers (drivers now support > 1 codec dev) o snd_soc_register_pcms() now done by core. o snd_soc_register_dai() folded into snd_soc_register_codec(). CS4270 portions: Acked-by: Timur Tabi <> Some TLV320aic23 and Cirrus platform fixes. Signed-off-by: Ryan Mallon <> TI CODEC and OMAP fixes Signed-off-by: Peter Ujfalusi <> Signed-off-by: Janusz Krzysztofik <> Signed-off-by: Jarkko Nikula <> Samsung platform and misc fixes :- Signed-off-by: Chanwoo Choi <> Signed-off-by: Joonyoung Shim <> Signed-off-by: Kyungmin Park <> Reviewed-by: Jassi Brar <> Signed-off-by: Seungwhan Youn <> MPC8610 and PPC fixes. Signed-off-by: Timur Tabi <> i.MX fixes and some core fixes. Signed-off-by: Sascha Hauer <> J4740 platform fixes:- Signed-off-by: Lars-Peter Clausen <> CC: Tony Lindgren <> CC: Nicolas Ferre <> CC: Kevin Hilman <> CC: Sascha Hauer <> CC: Atsushi Nemoto <> CC: Kuninori Morimoto <> CC: Daniel Gloeckner <> CC: Manuel Lauss <> CC: Mike Frysinger <> CC: Arnaud Patard <> CC: Wan ZongShun <> Acked-by: Mark Brown <> Signed-off-by: Liam Girdwood <>
2010-06-09ASoC: EP93xx: Add Snapper CL15 i2s audio supportRyan Mallon
Add support for i2s audio on Bluewater Systems Snapper CL15 module Signed-off-by: Ryan Mallon <> Acked-by: H Hartley Sweeten <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>
2010-06-07ASoC: ep93xx i2s audio driverRyan Mallon
Add ep93xx i2s audio driver Signed-off-by: Ryan Mallon <> Acked-by: Liam Girdwood <> Signed-off-by: Mark Brown <>