10 Jun, 2011
1 commit
-
Signed-off-by: Uwe Kleine-König
Acked-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
08 Jun, 2011
1 commit
-
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
07 Jun, 2011
1 commit
-
The card callback will get called for each DAPM context in the card so it
can be useful for it to know which device is currently undergoing a
transition.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
06 Jun, 2011
1 commit
03 Jun, 2011
1 commit
-
We should only call ssc_free() when ssc_request() succeeds or bad
things will happen.Signed-off-by: Joachim Eastwood
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
30 May, 2011
1 commit
26 May, 2011
4 commits
-
at91sam9g20 is providing master clock to wm8731: not using a crystal but an
external MCLK. We can avoid conflict and save power using WM8731_SYSCLK_MCLK as
we do not need oscillator to be powered.Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
We do not have to free a resource that is not allocated yet.
Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
19 Apr, 2011
1 commit
-
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
31 Mar, 2011
1 commit
-
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi
30 Mar, 2011
1 commit
-
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
25 Jan, 2011
1 commit
-
The id part of an I2C device name is created with the "%d-%04x" format string.
So for example for an I2C device which is connected to the adapter with the id 0
and has its address set to 0x1a the id part of the devices name would be
"0-001a".Currently some sound board drivers have the id part the codec_name field of
their dai_link structures set as if it had been created by a "%d-0x%x" format
string. For example "0-0x1a" instead of "0-001a".As a result there is no match between the codec device and the dai_link and no
sound card is instantiated.This patch fixes it.
Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
Cc: stable@kernel.org
25 Nov, 2010
3 commits
-
Fix the error path to properly free allocated resources.
Signed-off-by: Axel Lin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Signed-off-by: Axel Lin
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
23 Nov, 2010
2 commits
-
After clk_get() mclk is checked second time instead of pllb check.
In patch v1 Jarkko Nikula noticed that PTR_ERR() is also has wrong argument.Signed-off-by: Vasiliy Kulikov
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
22 Nov, 2010
1 commit
-
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
12 Nov, 2010
1 commit
11 Nov, 2010
1 commit
-
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC
audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing
clk_set_parent and clk_set_rate when building without
AT91_PROGRAMMABLE_CLOCKS.Signed-off-by: Ryan Mallon
Acked-by: Geoffrey Wossum
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
06 Nov, 2010
1 commit
-
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
18 Aug, 2010
3 commits
-
Since the SSC is already being registered as a device under arch and
the DMA and SSC hardware are pretty much the same provide a simplified
device registration function for the Atmel SSC which will add the
ASoC-specific devices within the ASoC code, parenting the SSC device
off the actual SSC device. Also use it in the sam9g20-ek driver.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
A couple of typos in the multi-component conversion.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood -
Instead of unconditionally enabling the crystal oscillator on the WM8731
only enable it when explicitly selected via set_sysclk(), allowing machine
drivers to specify that they drive a clock into MCLK alone. This avoids
any conflicts between the oscillator and the external MCLK source and saves
power for systems which do not need the oscillator.This should also deliver a small power saving on systems using the crystal
since the oscillator will only be enabled when the ADC or DAC is active.Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
12 Aug, 2010
1 commit
-
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 TabiSome TLV320aic23 and Cirrus platform fixes.
Signed-off-by: Ryan MallonTI CODEC and OMAP fixes
Signed-off-by: Peter Ujfalusi
Signed-off-by: Janusz Krzysztofik
Signed-off-by: Jarkko NikulaSamsung 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 YounMPC8610 and PPC fixes.
Signed-off-by: Timur Tabii.MX fixes and some core fixes.
Signed-off-by: Sascha HauerJ4740 platform fixes:-
Signed-off-by: Lars-Peter ClausenCC: 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 ZongShunAcked-by: Mark Brown
Signed-off-by: Liam Girdwood
07 Jun, 2010
1 commit
-
Remove break after return, it is not needed.
Signed-off-by: Wan ZongShun
Signed-off-by: Nicolas Ferre
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
04 Jun, 2010
1 commit
-
The variable 'periods' of structure 'atmel_runtime_data'
seems no use in whole atmel alsa driver,so I make a patch
to remove the unnecessary variable.Signed-off-by: Wan ZongShun
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
20 Mar, 2010
1 commit
-
This fixes a memory corruption when ASoC devices are used in
full-duplex mode. Specifically for pxa-ssp code, where this pointer
is dynamically allocated for each direction and destroyed upon each
stream start.All other platforms are fixed blindly, I couldn't even compile-test
them. Sorry for any breakage I may have caused.Reported-by: Sven Neumann
Reported-by: Michael Hirsch
Signed-off-by: Daniel Mack
Acked-by: Peter Ujfalusi
Acked-by: Jarkko Nikula
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
22 Feb, 2010
2 commits
-
Currently only the atmel driver make use of snd_soc_dai.runtime field.
If the dais are to be shared among two or more dai_links, the field
must be got rid of.
So, in atmel driver reach the substream via dai_link->pcm so as to
not depend of snd_soc_dai.runtime field.Signed-off-by: Jassi Brar
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Passing pointer to relevant dai_link provides easier reach to the
ASoC tree in suspend/resume of snd_soc_platform. It also provides
direct access to the dai at the other end of the dai_link.Signed-off-by: Jassi Brar
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
09 Oct, 2009
1 commit
-
The modified revision of at91sam9g20 Evaluation Kit rev. C and onwards share
with previous ones its audio connexion to Wolfson wm8731. Modify the SoC file
to extend the machine ID checking.Signed-off-by: Nicolas Ferre
Signed-off-by: Mark Brown
06 Oct, 2009
1 commit
15 Sep, 2009
1 commit
-
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits)
[ARM] Update mach-types
ARM: 5636/1: Move vendor enum to AMBA include
ARM: Fix pfn_valid() for sparse memory
[ARM] orion5x: Add LaCie NAS 2Big Network support
[ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume
ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
ARM: 5689/1: Update default config of HP Jornada 700-series machines
ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem
ARM: 5688/1: ks8695_serial: disable_irq() lockup
ARM: 5687/1: fix an oops with highmem
ARM: 5684/1: Add nuc960 platform to w90x900
ARM: 5683/1: Add nuc950 platform to w90x900
ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
MMC: MMCI: convert realview MMC to use gpiolib
ARM: 5685/1: Make MMCI driver compile without gpiolib
ARM: implement highpte
ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
...Fix up trivial conflict in arch/arm/kernel/signal.c.
It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS:
Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
06 Sep, 2009
1 commit
-
More and more devices feature PLLs and FLLs with the ability to select
between multiple input clocks. In order to better support these devices
a new argument, source, has been added to the set_pll() configuration
API. Using set_clkdiv() is often difficult due to the need to stop the
PLL/FLL before any reconfiguration can be done.Signed-off-by: Mark Brown
10 Jul, 2009
1 commit
-
The WM8731 driver has been updated to allow registration via normal
device model methods rather than from within the ASoC driver probe
so update the AT91SAM9G20-EK to make use of this.Signed-off-by: Mark Brown
Acked-by: Andrew Victor
Signed-off-by: Russell King
09 Jul, 2009
3 commits
-
The system clock is currently fixed by the driver and this avoids
the need for us to handle errors with enabling and disabling MCLK
(which was incorrect previously so this fixes bugs in error
handling).Signed-off-by: Mark Brown
-
As shipped the board does not have inputs but it is relatively
straightforward to modify the board to hook them up so support
is provided in the driver. When these modifications have not
been made enabling the microphone stage can cause problems.Add an ifdef to disable this by default. Don't put it into
Kconfig since users will have to get their soldering irons
out to change things.Signed-off-by: Mark Brown
-
This simplifies the driver by removing the need to manually
configure dividers within the CPU and improve audio performance
by ensuring that the optimal phase relationships between the
clocks in the system are maintained.Note that currently this means that for playback to work the
Output Mixer HiFi switch must be enabled since otherwise CODEC
will not generate the DAC clock.Signed-off-by: Mark Brown