Takashi Iwai
5d037f9064
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
...
ASoC: Updates for 3.6
A bigger set of updates than I'm entirely comfortable with - things
backed up a bit due to travel. As ever the majority of these are small,
focused updates for specific drivers though there are a couple of core
changes. There's been good exposure in -next.
The AT91 patch fixes a build break.
2012-09-15 08:24:42 +02:00
Bo Shen
985b11fa80
ASoC: wm8904: correct the index
...
Signed-off-by: Bo Shen <voice.shen@atmel.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-14 18:02:38 +01:00
Lars-Peter Clausen
7f22fd9c03
ASoC: ad1836: Convert to direct regmap usage.
...
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-13 18:08:21 +08:00
Lars-Peter Clausen
040242ccfc
ASoC: ad193x: Use managed regmap init
...
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-13 18:08:21 +08:00
Mark Brown
6b315958d3
ASoC: arizona: Clarify logging for FLL lock status interrupt
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 22:01:37 +08:00
Mark Brown
3ef8ac0d7b
ASoC: wm8737: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:38 +08:00
Mark Brown
4f69bb31b8
ASoC: wm8737: Move regulator acquisition to device registration
...
This is better style as we acquire resources we will need before we go into
the ASoC card probe.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:37 +08:00
Mark Brown
d16383ef2a
ASoC: wm8728: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:37 +08:00
Mark Brown
5aa5fa9fdb
ASoC: wm8711: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:19 +08:00
Mark Brown
18273b05de
ASoC: wm8580: Move regulator acquisition to I2C probe
...
Better style as we get all the resources we need prior to starting the
ASoC level probe.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:18 +08:00
Mark Brown
b689d9f996
ASoC: wm8580: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:16 +08:00
Mark Brown
e643049d30
ASoC: wm8510: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 14:09:05 +08:00
Mark Brown
046d4f02e8
ASoC: wm8991: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:50 +08:00
Mark Brown
587cbbb36e
ASoC: wm8990: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:49 +08:00
Mark Brown
65fdd9bffa
ASoC: wm8737: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:48 +08:00
Mark Brown
1a9585b0f7
ASoC: wm8728: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:47 +08:00
Mark Brown
e908ef40e4
ASoC: wm8711: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:45 +08:00
Mark Brown
398c02f6c2
ASoC: wm8580: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:44 +08:00
Mark Brown
3217b0f5b6
ASoC: wm8510: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-12 09:36:43 +08:00
Mark Brown
7e94ca4752
ASoC: wm8900: Fix typo of name to wm9700
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-11 11:26:05 +08:00
Mark Brown
499926246e
ASoC: wm8900: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-11 11:26:05 +08:00
Mark Brown
6a58870df8
ASoC: wm8900: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-11 11:26:04 +08:00
Fabio Estevam
dbad34eac2
Revert "ASoC: AC97 doesn't use regmap by default"
...
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:03 +08:00
Fabio Estevam
4ac7903f1d
ASoC: Revert "ASoC: ab8500: Inform SoC Core that we have our own I/O arrangements"
...
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
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
Mark Brown
1ca6517566
ASoC: cs4270: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Timur Tabi <timur@freescale.com >
2012-09-11 08:16:15 +08:00
Mark Brown
b61d6d4032
ASoC: cs4270: Move regulator acquisition to I2C probe()
...
This is better style since it has us obtaining all resources before we
try the ASoC probe. This change also fixes a potential issue where we
don't enable the regulators before trying to confirm the device ID which
could cause a failure during probe in some system configurations.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Timur Tabi <timur@freescale.com >
2012-09-11 08:16:11 +08:00
Mark Brown
19ace0e97a
ASoC: cs4270: Conver to data based control init
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Timur Tabi <timur@freescale.com >
2012-09-11 08:16:03 +08:00
Mark Brown
0ebe36c6c4
ASoC: wm8960: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 19:31:08 +08:00
Bo Shen
a044b75779
ASoC: wm8904: remove redundant code
...
The core_intercon is added two times, remove the redundant one
Signed-off-by: Bo Shen <voice.shen@atmel.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 18:07:20 +08:00
Mark Brown
fe98c0cf40
ASoC: wm8741: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 18:04:42 +08:00
Mark Brown
d9780550a3
ASoC: wm8741: Move regulator acquisition to I2C/SPI probe()
...
Better style as we acquire resources before trying the ASoC card probe.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 18:04:40 +08:00
Mark Brown
29fdf4fbbe
ASoC: sta32x: Convert to regmap
...
Long term all drivers should be using regmap directly. This is more
idiomatic and moves us towards the removal of the ASoC level cache
code.
The initialiasation of reserved register bits in probe() is slightly odd
as the defaults being written don't appear to match the silicon defaults
but the new code should have the same effect as the old code.
The watchdog code will now unconditionally do a mute and unmute when
resyncing but since we only sync when we are very sure there is something
to sync this should have no impact.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Johannes Stezenbach <js@sig21.net >
2012-09-10 17:26:10 +08:00
Mark Brown
aff041af94
ASoC: sta32x: Move regulator acquisition to I2C probe
...
This is better style as it ensures we don't try to do the ASoC probe
without required resources. Also convert to devm_ while we're at it,
saving a bit of code, and fix a leak of enable on error.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Johannes Stezenbach <js@sig21.net >
2012-09-10 17:26:00 +08:00
Mark Brown
59ac2149ae
ASoC: wm8523: Move device ID verification and reset to I2C probe
...
Ensure that we have confirmed that we've got the device in place before
we register with ASoC.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 17:25:47 +08:00
Mark Brown
b9288f49dc
ASoC: wm8523: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 17:25:46 +08:00
Mark Brown
719b0c593c
ASoC: wm8523: Move regulator acquisition to I2C probe()
...
This is better style since we acquire all needed resources before we try
to do the ASoC card probe.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 17:25:44 +08:00
Mark Brown
7d014db8ba
ASoC: wm8523: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 17:25:41 +08:00
Mark Brown
2ee01ac63b
ASoC: wm8983: Convert to direct regmap API usage
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 16:00:09 +08:00
Mark Brown
d6e2dc150b
ASoC: wm8983: Convert to devm_kzalloc()
...
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-10 16:00:02 +08:00
Mark Brown
822b4b8d63
ASoC: dapm: Add flags to regulator supplies
...
This will be used to enable additional control of the regulators.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
Acked-by: Liam Girdwood <lrg@ti.com >
2012-09-08 08:47:28 +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
Heather Lomond
4758be37c0
ASoC: arizona: Fix typo in 44.1kHz rates
...
Signed-off-by: Heather Lomond <hlomond@opensource.wolfsonmicro.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 06:58:44 +08:00
Emil Goode
5d86e25c70
ASoC: wm0010: Fix warning, use format %zu for type size_t
...
Fix warning by using format specifier %zu for type size_t
Sparse warning:
sound/soc/codecs/wm0010.c:411:2: warning:
format ‘%d’ expects argument of type ‘int’,
but argument 4 has type ‘size_t’ [-Wformat]
Signed-off-by: Emil Goode <emilgoode@gmail.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 06:22:56 +08:00
Dan Carpenter
4f3ad7956d
ASoC: wm0010: unlock on error path
...
We're holding the wm0010->lock mutex when we goto err_core.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 06:20:14 +08:00
Fengguang Wu
58d4683286
ASoC: wm0010: Add missing IRQF_ONESHOT
...
FYI, there are new coccinelle warnings show up in
tree: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-3.7
head: e3523e0186
commit: e3523e0186 [95/95] ASoC: wm0010: Add initial wm0010 DSP driver
All coccinelle warnings:
+ sound/soc/codecs/wm0010.c:850:7-27: ERROR: Threaded IRQ with no primary handler requested without IRQF_ONESHOT
--
+ sound/soc/codecs/wm0010.c:660:1-7: preceding lock on line 359
vim +850 sound/soc/codecs/wm0010.c
847 trigger = IRQF_TRIGGER_FALLING;
848 trigger |= IRQF_ONESHOT;
849
> 850 ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger,
851 "wm0010", wm0010);
852 if (ret)
853 dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
Please consider folding the attached diff :-)
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-09-06 06:20:02 +08:00
Mark Brown
75d8f2931a
Merge branch 'asoc-omap' into for-3.7
2012-09-05 20:05:11 +08:00
Hebbar, Gururaja
c24fdc886f
ASoC: tlv320aic3x: Add device tree bindings
...
Device tree support for tlv320aic3x CODEC driver.
Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-08-27 10:25:58 -07:00
Sachin Kamat
2a9a9c876f
ASoC: ad1836: Use module_spi_driver
...
module_spi_driver makes the code simpler by eliminating
module_init and module_exit calls.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2012-08-27 09:55:28 -07:00