Mark Brown
ddfb43f388
Merge tag 'v3.6-rc6' into for-3.7
...
Linux 3.6-rc6 has all our bug fixes.
Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c
2012-09-22 11:26:27 -04:00
Fabio Estevam
57d9a477f9
ASoC: Revert "ASoC: mc13783: Provide codec->control_data"
...
Since commit 98d3088e5
(SoC: core: Fix check before defaulting to regmap)
, it is not necessary to provide codec->control_data anymore.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-11 11:26:02 +08:00
Gaëtan Carlier
6d97c09c64
ASoC: imx-mc13783: use defines instead of numerical address of register
...
This uses already defined name of registers and makes code more readable.
Signed-off-by: Gaëtan Carlier <gcembed@gmail.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 18:47:19 +08:00
Fabio Estevam
37f45cc54c
ASoC: mc13783: Remove mono support
...
Playing a mono track on a mc13783 codec results in incorrect playback rate.
Remove mono support so that a mono track can be played correctly.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com >
Tested-by: Gaëtan Carlier <gcembed@gmail.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 08:17:12 +08:00
Fabio Estevam
e13ab2aac7
ASoC: mc13783: Provide codec->control_data
...
If codec->control_data is not provided, the following crash happens:
Unable to handle kernel NULL pointer dereference at virtual address 00000078
pgd = 80004000
[00000078] *pgd=00000000
Internal error: Oops: 5 [#1 ] SMP ARM
Modules linked in:
CPU: 0 Tainted: G W (3.5.0-next-20120725+ #1263 )
PC is at regmap_read+0x18/0x64
LR is at hw_read+0x50/0x98
pc : [<802bcd90>] lr : [<803cad18>] psr: 60000013
...
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-07-26 21:35:19 +01:00
Philippe Rétornaz
b77458da95
ASoC: mc13783 codec cleanups
...
Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-05-18 16:42:21 +01:00
Philippe Rétornaz
8b908b8660
ASoC: Add mc13783 codec
...
Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-05-18 16:42:20 +01:00