Mark Brown
b24a63d5ef
Merge remote-tracking branch 'asoc/topic/tlv320aic3x' into asoc-next
2013-11-08 10:43:39 +00:00
Mark Brown
32b7fdfefa
Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next
2013-11-08 10:43:39 +00:00
Mark Brown
abdf150ade
Merge remote-tracking branch 'asoc/topic/tlv320aic26' into asoc-next
2013-11-08 10:43:38 +00:00
Mark Brown
e029530075
Merge remote-tracking branch 'asoc/topic/tlv320aic23' into asoc-next
2013-11-08 10:43:38 +00:00
Mark Brown
d4af6be4f8
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
2013-11-08 10:43:37 +00:00
Mark Brown
be529a5b7f
Merge remote-tracking branch 'asoc/topic/tas5086' into asoc-next
2013-11-08 10:43:37 +00:00
Mark Brown
6c61bbf0e8
Merge remote-tracking branch 'asoc/topic/spear' into asoc-next
2013-11-08 10:43:36 +00:00
Mark Brown
bd6d35a370
Merge remote-tracking branch 'asoc/topic/sn95031' into asoc-next
2013-11-08 10:43:36 +00:00
Mark Brown
8bffb007a5
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
2013-11-08 10:43:35 +00:00
Mark Brown
6a2972b363
Merge remote-tracking branch 'asoc/topic/si476x' into asoc-next
2013-11-08 10:43:35 +00:00
Mark Brown
87373ad1f3
Merge remote-tracking branch 'asoc/topic/samsung' into asoc-next
2013-11-08 10:43:35 +00:00
Mark Brown
457eb9016b
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
2013-11-08 10:43:34 +00:00
Mark Brown
9686e4b2a8
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
2013-11-08 10:43:34 +00:00
Mark Brown
469cb9286e
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
2013-11-08 10:43:33 +00:00
Mark Brown
df8aabe442
Merge remote-tracking branch 'asoc/topic/pcm1792a' into asoc-next
2013-11-08 10:43:33 +00:00
Mark Brown
97df0a0538
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
2013-11-08 10:43:32 +00:00
Mark Brown
5ac452772f
Merge remote-tracking branch 'asoc/topic/mxs' into asoc-next
2013-11-08 10:43:32 +00:00
Mark Brown
672922e975
Merge remote-tracking branch 'asoc/topic/ml26124' into asoc-next
2013-11-08 10:43:31 +00:00
Mark Brown
efdf09add9
Merge remote-tracking branch 'asoc/topic/mc13783' into asoc-next
2013-11-08 10:43:31 +00:00
Mark Brown
c462b1d8bb
Merge remote-tracking branch 'asoc/topic/max9850' into asoc-next
2013-11-08 10:43:31 +00:00
Mark Brown
b8a77af201
Merge remote-tracking branch 'asoc/topic/max98095' into asoc-next
2013-11-08 10:43:30 +00:00
Mark Brown
5f343663a2
Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next
2013-11-08 10:43:30 +00:00
Mark Brown
ca2b2252fc
Merge remote-tracking branch 'asoc/topic/kirkwood' into asoc-next
2013-11-08 10:43:29 +00:00
Mark Brown
ec7118e391
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
2013-11-08 10:43:29 +00:00
Mark Brown
3352b80075
Merge remote-tracking branch 'asoc/topic/ep93xx' into asoc-next
2013-11-08 10:43:28 +00:00
Mark Brown
99a0ea2d5b
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
2013-11-08 10:43:27 +00:00
Mark Brown
ac97d4e00a
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
2013-11-08 10:43:27 +00:00
Mark Brown
1d697db0ab
Merge remote-tracking branch 'asoc/topic/cs42l73' into asoc-next
2013-11-08 10:43:26 +00:00
Mark Brown
2029ef2500
Merge remote-tracking branch 'asoc/topic/cs42l52' into asoc-next
2013-11-08 10:43:26 +00:00
Mark Brown
491f06b160
Merge remote-tracking branch 'asoc/topic/cs4271' into asoc-next
2013-11-08 10:43:25 +00:00
Mark Brown
477ce17dec
Merge remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
2013-11-08 10:43:25 +00:00
Mark Brown
c6016bdeab
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
2013-11-08 10:43:25 +00:00
Mark Brown
d20b09f0c5
Merge remote-tracking branch 'asoc/topic/component' into asoc-next
2013-11-08 10:43:24 +00:00
Mark Brown
2fc175c4a3
Merge remote-tracking branch 'asoc/topic/bclk' into asoc-next
2013-11-08 10:43:24 +00:00
Mark Brown
aff79f8282
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
2013-11-08 10:43:23 +00:00
Mark Brown
642cba7528
Merge remote-tracking branch 'asoc/topic/arizona' into asoc-next
2013-11-08 10:43:23 +00:00
Mark Brown
74858f23ca
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
2013-11-08 10:43:22 +00:00
Mark Brown
5176dfcd47
Merge remote-tracking branch 'asoc/topic/ak4104' into asoc-next
2013-11-08 10:43:22 +00:00
Mark Brown
47973c6eb8
Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next
2013-11-08 10:43:21 +00:00
Mark Brown
c241b6c786
Merge remote-tracking branch 'asoc/topic/adav80x' into asoc-next
2013-11-08 10:43:21 +00:00
Mark Brown
8c691c1ba6
Merge remote-tracking branch 'asoc/topic/adau1373' into asoc-next
2013-11-08 10:43:20 +00:00
Mark Brown
57ada4c5d6
Merge remote-tracking branch 'asoc/topic/ab8500' into asoc-next
2013-11-08 10:43:20 +00:00
Mark Brown
3d0be4a5c7
Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
2013-11-08 10:43:20 +00:00
Mark Brown
3fec948ed8
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
2013-11-08 10:43:19 +00:00
Mark Brown
5196e6ffc2
Merge remote-tracking branch 'asoc/fix/dma' into asoc-linus
2013-11-08 10:43:18 +00:00
Mark Brown
5365990776
Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus
2013-11-08 10:43:18 +00:00
Dan Carpenter
ea8e5e5918
ASoC: fsl: imx-wm8962: remove an unneeded check
...
"data->codec_clk" can't be an ERR_PTR here so I have removed the
superflous check.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-08 10:22:07 +00:00
Fabio Estevam
10227a9487
ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
...
Commit 68f9672b
(ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation)
introduced the following build warning:
sound/soc/fsl/imx-pcm-fiq.c:53:26: warning: unused variable 'runtime' [-Wunused-variable]
Remove the unused 'runtime' variable.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Oskar Schirmer <oskar@scara.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-08 10:21:05 +00:00
Lee Jones
a894bd7fb5
ASoC: generic-dmaengine-pcm: Clear slave_config memory
...
We currently assume that the DMA Slave Config will be fully populated
by the platform, however some DMA Engines make decisions based on zero
(default) flags such as DMA_SLAVE_BUSWIDTH_UNDEFINED and as this is a
static declaration we need to memset it to clear the data area.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-07 11:35:30 +00:00
Kuninori Morimoto
a2b4f8a473
ASoC: rcar: remove un-needed select from Kconfig
...
config RCAR_CLK_ADG is not exist
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
2013-11-06 10:54:29 +00:00