Mark Brown
3cabd442d7
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
2013-10-24 11:24:15 +01:00
Mark Brown
2b48f86b5b
Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next
2013-10-24 11:24:15 +01:00
Mark Brown
a5f0ac4a0b
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
2013-10-24 11:24:14 +01:00
Mark Brown
7524be376d
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
2013-10-24 11:24:14 +01:00
Mark Brown
abdd182e93
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
2013-10-24 11:24:13 +01:00
Mark Brown
c5833ddc4a
Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next
2013-10-24 11:24:13 +01:00
Mark Brown
ccc6d1922e
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
2013-10-24 11:24:12 +01:00
Mark Brown
f6b967ab1b
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
2013-10-24 11:24:12 +01:00
Mark Brown
1f7f8e0462
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
2013-10-24 11:24:12 +01:00
Mark Brown
a6f849f752
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
2013-10-24 11:24:11 +01:00
Mark Brown
5b2ad46d6e
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
2013-10-24 11:24:11 +01:00
Mark Brown
c0840b2728
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
2013-10-24 11:24:10 +01:00
Mark Brown
8018abf63d
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
2013-10-24 11:24:10 +01:00
Mark Brown
440f5e8996
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
2013-10-24 11:24:09 +01:00
Mark Brown
10abe843d5
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
2013-10-24 11:24:09 +01:00
Mark Brown
07797e9bb6
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
2013-10-24 11:24:08 +01:00
Mark Brown
ed87aabf60
Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next
2013-10-24 11:24:08 +01:00
Mark Brown
4131770d54
Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next
2013-10-24 11:24:07 +01:00
Mark Brown
1a4ca437e4
Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next
2013-10-24 11:24:07 +01:00
Mark Brown
2e71ff5e8a
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
2013-10-24 11:24:06 +01:00
Mark Brown
8ff9f38bda
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
2013-10-24 11:24:06 +01:00
Mark Brown
54128df2ba
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
2013-10-24 11:24:06 +01:00
Mark Brown
9f7a949fb9
Merge remote-tracking branch 'asoc/topic/doc' into asoc-next
2013-10-24 11:24:05 +01:00
Mark Brown
70e0db2f74
Merge remote-tracking branch 'asoc/topic/dma' into asoc-next
2013-10-24 11:24:05 +01:00
Mark Brown
48ce3ec16a
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
2013-10-24 11:24:04 +01:00
Mark Brown
cf44fba089
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
2013-10-24 11:24:04 +01:00
Mark Brown
0705690110
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
2013-10-24 11:24:03 +01:00
Mark Brown
85eb5dce82
Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next
2013-10-24 11:24:03 +01:00
Mark Brown
05be686a40
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
f8736ad2ee
Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
d6ee232c7f
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
2013-10-24 11:24:02 +01:00
Mark Brown
6180561670
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
2013-10-24 11:24:01 +01:00
Mark Brown
d1c59c8712
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next
2013-10-24 11:24:01 +01:00
Mark Brown
80ca31869f
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
2013-10-24 11:24:00 +01:00
Mark Brown
c4c2361aef
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
2013-10-24 11:24:00 +01:00
Mark Brown
805c605562
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
2013-10-24 11:23:59 +01:00
Mark Brown
bb80a5d4cd
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
2013-10-24 11:23:59 +01:00
Mark Brown
e447360474
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
2013-10-24 11:23:58 +01:00
Mark Brown
9c5ff908aa
Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next
2013-10-24 11:23:58 +01:00
Mark Brown
de3bb2ded6
Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next
2013-10-24 11:23:57 +01:00
Mark Brown
cbf125e211
Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
2013-10-24 11:23:57 +01:00
Mark Brown
b85e95781c
Merge remote-tracking branch 'asoc/fix/tlv320aic3x' into asoc-linus
2013-10-24 11:23:56 +01:00
Mark Brown
ebc0b38625
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
2013-10-24 11:23:56 +01:00
Mark Brown
3bd36a147f
Merge remote-tracking branch 'asoc/fix/pcm1792a' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
dfbbe16f14
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
92359d6d65
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
2013-10-24 11:23:55 +01:00
Mark Brown
686b377152
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
2013-10-24 11:23:54 +01:00
Nicolin Chen
1abe729f78
ASoC: fsl: Add missing pm to current machine drivers
...
Add missing pm to current machine drivers so that all of them would
correctly do suspend/resume.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-10-24 11:22:44 +01:00
Mark Brown
90130d2e8f
ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
...
When using the legacy filter function channel requests we currently pass
the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
be helpful for actual filtering. Since there's already a field in the
structure called filter_data clearly intended for use here convert the
driver to use that.
All existing users of plain filter functions have been converted to use
an explicit compat function to override this behaviour except i.MX which
is working around this issue in its filter function and is updated to
just use filter_data directly here.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24 11:03:19 +01:00
Mark Brown
ea73b7ddf1
ASoC: dmaengine: Support custom channel names
...
Some devices have more than just simple TX and RX DMA channels, for example
modern Samsung I2S IPs support a secondary transmit DMA stream which is
mixed into the primary stream during playback. Allow such devices to
specify the names of the channels to be requested in their dma_data.
Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
2013-10-24 09:52:14 +01:00
