27 May, 2011
1 commit
-
Run the data through cpu_to_be16() so it's at least clear what we're up to.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
26 May, 2011
5 commits
-
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 -
For cards that have two or more DAIs, snd_soc_resume's loop over all
DAIs ends up calling schedule_work(deferred_resume_work) once per DAI.
Since this is the same work item each time, the 2nd and subsequent
calls return 0 (work item already queued), and trigger the dev_err
message below stating that a work item may have been lost.Solve this by adjusting the loop to simply calculate whether to run the
resume work immediately or defer it, and then call schedule work (or not)
one time based on that.Note: This has not been tested in mainline, but only in chromeos-2.6.38;
mainline doesn't support suspend/resume on Tegra, nor does the mainline
Tegra ASoC driver contain multiple DAIs. It has been compile-checked in
mainline.Signed-off-by: Stephen Warren
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The comment does not reflect reality anymore since the multi-component
monster patch landed. Things are matched by names now, and not by
exporting and referencing a struct. Fix it to avoid confusion.Signed-off-by: Daniel Mack
Acked-by: Liam Girdwood
Acked-by: Timur Tabi
Signed-off-by: Mark Brown
25 May, 2011
7 commits
-
In the previous commit 'ASoC: davinci-pcm: convert to BATCH mode', the phase
offset of 2 was mentioned in the commit message but not well commented in the
source.Add descriptive comments of the phase offset with and without ping-pong
buffers enabled.Signed-off-by: Ben Gardiner
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The davinci-pcm driver's snd_pcm_ops pointer function currently calls into
the edma controller driver to read the current positions of the edma channels
to determine pos to return to the ALSA framework. In particular,
davinci_pcm_pointer() calls edma_get_position() and the latter has a comment
indicating that "Its channel should not be active when this is called" whereas
the channel is surely active when snd_pcm_ops.pointer is called.The operation of davinci-pcm in capture and playback appears to follow close
the other pcm drivers who export SNDRV_PCM_INFO_BATCH except that davinci-pcm
does not report it's positions from pointer() using the last transferred
chunk. Instead it peeks directly into the edma controller to determine the
current position as discussed above.Convert the davinci-pcm driver to BATCH mode: count the periods elapsed in the
prtd->period member and use its value to report the 'pos' to the alsa
framework in the davinci_pcm_pointer function.There is a phase offset of 2 periods between the position used by dma setup
and the position reported in the pointer function. Either +2 in the dma
setup or -2 in the pointer function (with wrapping, both) accounts for this
offset -- I opted for the latter since it makes the first-time setup clearer.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Extract functions that modify the prtd->period member in preparation for
conversion to BATCH mode playback.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The release of the dma channels was being performed in prepare and there was a
edma_resume call for the asp-channel only being executed on START, RESUME and
PAUSE_RELEASE.The mcasp on da850evm with ping-pong buffers enabled was exhibiting an audible
glitch on every playback after the first. It was determined through trial and
error that the following two changes fix this problem:1) Move the edma_start calls from prepare to trigger and 2) reverse the order
of starting the asp and ram channels.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Based on the registration of davinci-mcasp.1 in the davinci-evm platform
setup for da830 and dm6467, davinci-pcm can handle more than the currently
reported maximum channels of 2.Increase the maximum channels to 384 to match the maximum reported by
davinci-mcasp.1.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Based on the data_type test in ping_pong_dma_setup, davinci-pcm is capable of
handling data of width up to and including 32bits."
if ((data_type == 0) || (data_type > 4)) {
printk(KERN_ERR "%s: data_type=%i\n", __func__, data_type);
return -EINVAL;
}
"Update the .format member of the snd_pcm_hardware instances it registers to
reflect this capability.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The setup of the pong channel uses EDMA_CHAN_SLOT instead of & 0x3f as the
setup of the ping channel does.Make the setup of ping and pong symmetric. There is no functional change
introduced by this patch.Signed-off-by: Ben Gardiner
Reviewed-by: Steven Faludi
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
24 May, 2011
10 commits
-
This patch is preparation of cleanup suspend/resume patch.
Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Current FSI driver was using saved_xxx variable for suspend/resume.
OTOH, the start and stop of power/clock are controlled by
fsi_hw_startup/fsi_hw_shutdown in current FSI driver.
The all necessary registers value are set by fsi_hw_startup.So, if fsi_hw_shutdown is called when "suspend" is generated,
and fsi_hw_startup is called at "resume",
the saved_xxx are not needed.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
FSIA/B ports is enabled by default when power-on,
and current FSI is supporting RuntimePM.
In addition, current fsi_module_init/kill doesn't care
simultaneous playback/recorde.
This mean FSI port control is not needed.
This patch remove fsi_module_init/killSigned-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
fsi_stream_push/pop might be called in same time.
This patch protect it.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
pm_runtime_get/put_sync were used to access FSI register in fsi_dai_set_fmt
which is called when ALSA probe.
But this register value will disappear after pm_runtime_put_sync
if platform is supporting RuntimePM.
To solve this issue, this patch adds new variable for format,
and remove pm_runtime_get/put_sync from fsi_dai_set_fmt.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Some variables on this driver were a unclear naming,
and were different unit (byte, frame, sample).
And some functions had wrong name
(ex. it returned "sample width" but name was "fsi_get_frame_width").
This patch tidy-up this issue, and the minimum unit become "sample".
Special thanks to Takashi YOSHII.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Using fsi_irq_enable/disable in fsi_port_start/stop is very natural.
This patch is preparation of cleanup suspend/resume patch.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Current FSI driver is using set_rate call back function which is for
master mode.
By this patch, it is used from fsi_set_master_clk.
This patch is preparation of cleanup suspend/resume patch.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
It is possible to create buff_len and period_len
from substream->runtime.
This patch is preparation of tidyup unclear variable naming patch.Signed-off-by: Kuninori Morimoto
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Make it clear what we're doing.
Signed-off-by: Mark Brown
Acked-by: Liam Girdwood
20 May, 2011
2 commits
-
Whenever we are doing a read or a write through the rbtree code, we'll
cache a pointer to the rbnode. To avoid looking up the register
everytime we do a read or a write, we first check if it can be found in
the cached register block, otherwise we traverse the rbtree and finally
cache the rbnode for future use.Signed-off-by: Dimitris Papastamos
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
This patch prepares the ground for the actual rbtree optimization patch
which will save a pointer to the last accessed rbnode that was used
in either the read() or write() functions.Each rbnode manages a variable length block of registers. There can be no
two nodes with overlapping blocks. Each block has a base register and a
currently top register, all the other registers, if any, lie in between these
two and in ascending order.The reasoning behind the construction of this rbtree is simple. In the
snd_soc_rbtree_cache_init() function, we iterate over the register defaults
provided by the driver. For each register value that is non-zero we
insert it in the rbtree. In order to determine in which rbnode we need
to add the register, we first look if there is another register already
added that is adjacent to the one we are about to add. If that is the case
we append it in that rbnode block, otherwise we create a new rbnode
with a single register in its block and add it to the tree.In the next patch, where a cached rbnode is used by both the write() and the
read() functions, we also check if the register we are about to add is in the
cached rbnode (the least recently accessed one) and if so we append it in that
rbnode block.Signed-off-by: Dimitris Papastamos
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
10 May, 2011
4 commits
-
Increase the range of the Digital Capture Volume control to be 120 steps.
Each step is 0.75dB, and the range starts at -72dB, giving a max setting
of 18dB, which matches the latest datasheet, to the precision of the step
size.Signed-off-by: Stephen Warren
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
…ie/sound-2.6 into topic/asoc
-
…soc-2.6 into topic/asoc
09 May, 2011
6 commits
-
Also fix the maximum value for the capture volume control.
Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Model the power supply for the digital core as a DAPM_SUPPLY widget. This allows
to cleanup the code a bit.Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The SSM2603 is mostly register compatible with the SSM2602 and can be supported
by the current driver without any changes.Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
The SSM2604 is basically a lightweight variant of the SSM2602 with a compatible
register layout. Thus we can easily support both devices by the same driver,
by providing a slightly set of controls, widgets and routes.Compared to the SSM2602 the SSM2604 has no microphone input and no headphone
output.Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
It is not required to have the codec powered at this stage and DAPM will power
the ADC and DAC down again after probe has run anyway.
Thus we avoid some unnecessary writes by this change.Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown -
Some of the values in the default register cache did not represent the codecs
state after reset. This patch fixes it.Signed-off-by: Lars-Peter Clausen
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
08 May, 2011
5 commits
-
Define POWER_OFF_ON_STANDBY cause trobles when trying to get some
sound from codec because code for bias setup was not compiled
(define wasn't defined). This define was removed in commit:
cc3202f5 but again introduced by commit: f0fba2ad1 which then
completely break codec functionality so remove it again.Signed-off-by: Marek Belisko
Acked-by: Liam Girdwood
Signed-off-by: Mark Brown
Cc: stable@kernel.org -
Those are leftovers from a pre-multicomponent era.
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
There are currently two controls which allow selecting the capture source, one
as a normal control, the other as part of a DAPM_MUX widget.
Remove the normal control.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown -
Drop unused field from the coeff struct, precalculate the srate register at
compile-time and cleanup up the naming.Signed-off-by: Lars-Peter Clausen
Signed-off-by: Mark Brown
